From d056beb0ef6c736807c1ef2efe50a257c6bbe9ec Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 3 Aug 2021 15:55:32 +0530 Subject: [PATCH 001/143] feat: show title links in Link Fields --- cypress/integration/control_link.js | 41 +++++- frappe/boot.py | 7 + frappe/core/doctype/doctype/doctype.json | 9 +- .../customize_form/customize_form.json | 9 +- .../doctype/customize_form/customize_form.py | 3 +- frappe/database/mariadb/framework_mariadb.sql | 1 + .../database/postgres/framework_postgres.sql | 1 + frappe/desk/form/load.py | 54 ++++++- frappe/desk/search.py | 47 ++++++- frappe/public/js/controls.bundle.js | 1 + frappe/public/js/frappe/form/controls/link.js | 133 +++++++++++++++--- .../frappe/form/controls/table_multiselect.js | 7 +- frappe/public/js/frappe/form/formatters.js | 13 +- frappe/public/js/frappe/form/save.js | 51 ++++--- frappe/public/js/frappe/link_title.js | 34 +++++ frappe/public/js/frappe/request.js | 5 + frappe/public/js/frappe/ui/filters/filter.js | 12 +- frappe/www/printview.py | 33 +++++ 18 files changed, 402 insertions(+), 59 deletions(-) create mode 100644 frappe/public/js/frappe/link_title.js diff --git a/cypress/integration/control_link.js b/cypress/integration/control_link.js index 8f9257e9c4..e691150925 100644 --- a/cypress/integration/control_link.js +++ b/cypress/integration/control_link.js @@ -65,16 +65,49 @@ context('Control Link', () => { cy.intercept('POST', '/api/method/frappe.desk.search.search_link').as('search_link'); cy.get('@todos').then(todos => { - cy.get('.frappe-control[data-fieldname=link] input').as('input'); - cy.get('@input').focus(); + cy.get('.frappe-control[data-fieldname=link] input').focus().as('input'); + cy.wait('@search_link'); + cy.get('@input').type(todos[0]); cy.wait('@search_link'); - cy.get('@input').type(todos[0]).blur(); + cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible'); + cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); cy.wait('@validate_link'); cy.get('@input').focus(); cy.get('.frappe-control[data-fieldname=link] .link-btn') .should('be.visible') .click(); - cy.location('pathname').should('eq', `/app/todo/${todos[0]}`); + cy.location('hash').should('eq', `#Form/ToDo/${todos[0]}`); + }); + }); + + it('show title field in link', () => { + get_dialog_with_link().as('dialog'); + + cy.server(); + cy.insert_doc("Property Setter", { + property: "show_title_field_in_link", + doc_type: "ToDo", + value: 1, + doctype_or_field: "DocType" + }, true); + cy.route('POST', '/api/method/frappe.desk.search.search_link').as('search_link'); + + cy.get('.frappe-control[data-fieldname=link] input').focus().as('input'); + cy.wait('@search_link'); + cy.get('@input').type('todo for link'); + cy.wait('@search_link'); + cy.get('.frappe-control[data-fieldname=link] ul').should('be.visible'); + cy.get('.frappe-control[data-fieldname=link] input').type('{enter}', { delay: 100 }); + cy.get('.frappe-control[data-fieldname=link] input').blur(); + cy.get('@dialog').then(dialog => { + cy.get('@todos').then(todos => { + let field = dialog.get_field('link'); + let value = field.get_value(); + let label = field.get_label_value(); + + expect(value).to.eq(todos[0]); + expect(label).to.eq('this is a test todo for link'); + }); }); }); }); diff --git a/frappe/boot.py b/frappe/boot.py index 0589e32ac8..8f02b67934 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -87,6 +87,7 @@ def get_bootinfo(): bootinfo.additional_filters_config = get_additional_filters_from_hooks() bootinfo.desk_settings = get_desk_settings() bootinfo.app_logo_url = get_app_logo() + bootinfo.doctypes_with_show_link_field_title = doctypes_with_show_link_field_title() return bootinfo @@ -324,3 +325,9 @@ def get_desk_settings(): def get_notification_settings(): return frappe.get_cached_doc('Notification Settings', frappe.session.user) + +def doctypes_with_show_link_field_title(): + dts = frappe.get_all("DocType", {"show_title_field_in_link": 1}) + custom_dts = frappe.get_all("Property Setter", {"field_name": "show_title_field_in_link", "value": 1}) + + return [d.name for d in dts + custom_dts if d] \ No newline at end of file diff --git a/frappe/core/doctype/doctype/doctype.json b/frappe/core/doctype/doctype/doctype.json index 6a427f71e1..3024fb32a2 100644 --- a/frappe/core/doctype/doctype/doctype.json +++ b/frappe/core/doctype/doctype/doctype.json @@ -45,6 +45,7 @@ "allow_auto_repeat", "view_settings", "title_field", + "show_title_field_in_link", "search_fields", "default_print_format", "sort_field", @@ -554,6 +555,12 @@ "fieldname": "website_search_field", "fieldtype": "Data", "label": "Website Search Field" + }, + { + "default": "0", + "fieldname": "show_title_field_in_link", + "fieldtype": "Check", + "label": "Show Title in Link and Table MultiSelect Field" } ], "icon": "fa fa-bolt", @@ -635,7 +642,7 @@ "link_fieldname": "reference_doctype" } ], - "modified": "2021-06-17 23:31:44.974199", + "modified": "2021-08-03 13:41:50.319555", "modified_by": "Administrator", "module": "Core", "name": "DocType", diff --git a/frappe/custom/doctype/customize_form/customize_form.json b/frappe/custom/doctype/customize_form/customize_form.json index c2940a92e3..cdcac1582a 100644 --- a/frappe/custom/doctype/customize_form/customize_form.json +++ b/frappe/custom/doctype/customize_form/customize_form.json @@ -27,6 +27,7 @@ "autoname", "view_settings_section", "title_field", + "show_title_field_in_link", "image_field", "default_print_format", "column_break_29", @@ -280,6 +281,12 @@ "fieldname": "autoname", "fieldtype": "Data", "label": "Auto Name" + }, + { + "default": "0", + "fieldname": "show_title_field_in_link", + "fieldtype": "Check", + "label": "Show Title in Link and Table MultiSelect Field" } ], "hide_toolbar": 1, @@ -288,7 +295,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2021-06-21 19:01:06.920663", + "modified": "2021-08-03 13:43:27.938781", "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 8de194fb00..1866f4d368 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -495,7 +495,8 @@ doctype_properties = { 'email_append_to': 'Check', 'subject_field': 'Data', 'sender_field': 'Data', - 'autoname': 'Data' + 'autoname': 'Data', + 'show_title_field_in_link': 'Check' } docfield_properties = { diff --git a/frappe/database/mariadb/framework_mariadb.sql b/frappe/database/mariadb/framework_mariadb.sql index f8841e9417..a74ece8478 100644 --- a/frappe/database/mariadb/framework_mariadb.sql +++ b/frappe/database/mariadb/framework_mariadb.sql @@ -224,6 +224,7 @@ CREATE TABLE `tabDocType` ( `email_append_to` int(1) NOT NULL DEFAULT 0, `subject_field` varchar(255) DEFAULT NULL, `sender_field` varchar(255) DEFAULT NULL, + `show_title_field_in_link` int(1) NOT NULL DEFAULT 0, PRIMARY KEY (`name`), KEY `parent` (`parent`) ) ENGINE=InnoDB ROW_FORMAT=COMPRESSED CHARACTER SET=utf8mb4 COLLATE=utf8mb4_unicode_ci; diff --git a/frappe/database/postgres/framework_postgres.sql b/frappe/database/postgres/framework_postgres.sql index a4e94aa326..f65a832bc6 100644 --- a/frappe/database/postgres/framework_postgres.sql +++ b/frappe/database/postgres/framework_postgres.sql @@ -229,6 +229,7 @@ CREATE TABLE "tabDocType" ( "email_append_to" smallint NOT NULL DEFAULT 0, "subject_field" varchar(255) DEFAULT NULL, "sender_field" varchar(255) DEFAULT NULL, + "show_title_field_in_link" smallint NOT NULL DEFAULT 0, PRIMARY KEY ("name") ) ; diff --git a/frappe/desk/form/load.py b/frappe/desk/form/load.py index a62bfd01d0..994a50f938 100644 --- a/frappe/desk/form/load.py +++ b/frappe/desk/form/load.py @@ -48,7 +48,7 @@ def getdoc(doctype, name, user=None): raise doc.add_seen() - + set_link_titles(doc) frappe.response.docs.append(doc) @frappe.whitelist(allow_guest=True) @@ -310,3 +310,55 @@ def get_additional_timeline_content(doctype, docname): contents.extend(frappe.get_attr(method)(doctype, docname) or []) return contents + +def set_link_titles(doc): + meta = frappe.get_meta(doc.doctype) + link_titles = {} + link_titles.update(get_title_values_for_link_and_dynamic_link_fields(meta, doc)) + link_titles.update(get_title_values_for_table_and_multiselect_fields(meta, doc)) + + send_link_titles(link_titles) + +def get_title_values_for_link_and_dynamic_link_fields(meta, doc, link_fields=None): + link_titles = {} + + if not link_fields: + link_fields = meta.get_link_fields() + meta.get_dynamic_link_fields() + + for field in link_fields: + if not doc.get(field.fieldname): + continue + + doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) + + meta = frappe.get_meta(doctype) + if not meta or not (meta.title_field and meta.show_title_field_in_link): + continue + + link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) + link_titles.update({doctype + "::" + doc.get(field.fieldname): link_title}) + + return link_titles + +def get_title_values_for_table_and_multiselect_fields(meta, doc, table_fields=None): + link_titles = {} + + if not table_fields: + table_fields = meta.get_table_fields() + + for field in table_fields: + if not doc.get(field.fieldname): + continue + + _meta = frappe.get_meta(field.options) + for value in doc.get(field.fieldname): + link_titles.update(get_title_values_for_link_and_dynamic_link_fields(_meta, value)) + + return link_titles + +def send_link_titles(link_titles): + """Append link titles dict in `frappe.local.response`.""" + if "_link_titles" not in frappe.local.response: + frappe.local.response["_link_titles"] = {} + + frappe.local.response["_link_titles"].update(link_titles) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index f9b65fc98e..a64d6efec4 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -49,8 +49,11 @@ def sanitize_searchfield(searchfield): # this is called by the Link Field @frappe.whitelist() def search_link(doctype, txt, query=None, filters=None, page_length=20, searchfield=None, reference_doctype=None, ignore_user_permissions=False): - search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) - frappe.response['results'] = build_for_autosuggest(frappe.response["values"]) + search_widget(doctype, txt.strip(), query, searchfield=searchfield, page_length=page_length, filters=filters, + reference_doctype=reference_doctype, ignore_user_permissions=ignore_user_permissions) + + frappe.response["results"] = build_for_autosuggest(frappe.response["values"], doctype=doctype, + is_query=True if query else False) del frappe.response["values"] # this is called by the search box @@ -138,6 +141,11 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, fields = list(set(fields + json.loads(filter_fields))) formatted_fields = ['`tab%s`.`%s`' % (meta.name, f.strip()) for f in fields] + title_field_query = get_title_field_query(meta) + + # Insert title field query after name + formatted_fields.insert(1, title_field_query) + # find relevance as location of search term from the beginning of string `name`. used for sorting results. formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format( _txt=frappe.db.escape((txt or "").replace("%", "").replace("@", "")), doctype=doctype)) @@ -205,10 +213,32 @@ def get_std_fields_list(meta, key): return sflist -def build_for_autosuggest(res): +def get_title_field_query(meta): + title_field = meta.title_field if meta.title_field else None + show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None + field = "NULL as `label`" + + if title_field and show_title_field_in_link: + field = "`tab{0}`.{1} as `label`".format(meta.name, title_field) + + return field + +def build_for_autosuggest(res, doctype, is_query): results = [] for r in res: - out = {"value": r[0], "description": ", ".join(unique(cstr(d) for d in r if d)[1:])} + r = list(r) + if is_query or doctype in (frappe.get_hooks().standard_queries or {}): + out = { + "value": r[0], + "description": ", ".join(unique(cstr(d) for d in r[1:] if d)) + } + else: + out = { + "value": r[0], + "label": r[1], + "description": ", ".join(unique(cstr(d) for d in r[2:] if d)) + } + results.append(out) return results @@ -271,3 +301,12 @@ def get_user_groups(): return frappe.get_all('User Group', fields=['name as id', 'name as value'], update={ 'is_group': True }) + +@frappe.whitelist() +def get_link_title(doctype, docname): + meta = frappe.get_meta(doctype) + + if meta.title_field and meta.show_title_field_in_link: + return frappe.get_cached_value(doctype, docname, meta.title_field) + + return docname \ No newline at end of file diff --git a/frappe/public/js/controls.bundle.js b/frappe/public/js/controls.bundle.js index 30b5d43905..b08cbb336d 100644 --- a/frappe/public/js/controls.bundle.js +++ b/frappe/public/js/controls.bundle.js @@ -16,3 +16,4 @@ import "air-datepicker/dist/js/i18n/datepicker.sk.js"; import "air-datepicker/dist/js/i18n/datepicker.zh.js"; import "./frappe/ui/capture.js"; import "./frappe/form/controls/control.js"; +import "./frappe/link_title.js"; diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index 83f3f8dd70..82481d5303 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -29,12 +29,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat setTimeout(function() { if(me.$input.val() && me.get_options()) { let doctype = me.get_options(); - let name = me.$input.val(); + let name = me.get_input_value(); me.$link.toggle(true); me.$link_open.attr('href', frappe.utils.get_form_link(doctype, name)); } if(!me.$input.val()) { + me.reset_value(); + me.reset_fetch_values(me.df, me.docname); me.$input.val("").trigger("input"); } }, 500); @@ -69,6 +71,76 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.$input_area.find(".link-btn").remove(); } } + set_formatted_input(value) { + super.set_formatted_input(); + if (!value) return; + let doctype = this.get_options(); + this.set_data_value(frappe.get_link_title(doctype, value) || value, value); + } + set_data_value(link_display, value) { + if (!this.$input) { + return; + } + + this.$input.val(__(link_display)); + this.data_value = value; + } + parse_validate_and_set_in_model(value, label, e) { + if (this.parse) value = this.parse(value, label); + if (label) { + this.label = label; + frappe.add_link_title(this.doctype, value, label); + } + + return this.validate_and_set_in_model(value, e); + } + validate_and_set_in_model(value, e) { + var me = this; + if (this.inside_change_event) { + return Promise.resolve(); + } + this.inside_change_event = true; + var set = function(value) { + me.inside_change_event = false; + return frappe.run_serially([ + () => me.set_model_value(value), + () => { + me.set_mandatory && me.set_mandatory(value); + + if (me.df.change || me.df.onchange) { + // onchange event specified in df + frappe.set_link_title(me); + return (me.df.change || me.df.onchange).apply(me, [e]); + } + } + ]); + }; + + value = this.validate(value); + if (value && value.then) { + // got a promise + return value.then((value) => set(value)); + } else { + // all clear + return set(value); + } + } + get_input_value() { + return (this.$input && this.data_value && this.$input.val()) ? this.data_value : ""; + } + get_label_value() { + return this.$input ? this.$input.val() : ""; + } + set_input_label(label) { + this.$input && this.$input.val(__(label)); + } + reset_value() { + if (!this.$input) { + return; + } + this.$input.val(""); + this.data_value = null; + } open_advanced_search() { var doctype = this.get_options(); if(!doctype) return; @@ -98,7 +170,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat } // partially entered name field - frappe.route_options.name_field = this.get_value(); + frappe.route_options.name_field = this.get_label_value(); // reference to calling link frappe._from_link = this; @@ -120,6 +192,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat maxItems: 99, autoFirst: true, list: [], + replace: function (suggestion) { + // Override Awesomeplete replace function as it is used to set the input value + // https://github.com/LeaVerou/awesomplete/issues/17104#issuecomment-359185403 + this.input.value = suggestion.label || suggestion.value; + }, data: function (item) { return { label: item.label || item.value, @@ -236,9 +313,11 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat me.selected = false; return; } - var value = me.get_input_value(); - if(value!==me.last_value) { - me.parse_validate_and_set_in_model(value); + let value = me.get_input_value(); + let label = me.get_label_value(); + + if (value !== me.last_value || me.label !== label) { + me.parse_validate_and_set_in_model(value, label); } }); @@ -258,14 +337,15 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat // prevent selection on tab var TABKEY = 9; - if(e.keyCode === TABKEY) { + if (e.keyCode === TABKEY) { e.preventDefault(); me.awesomplete.close(); return false; } - if(item.action) { + if (item.action) { item.value = ""; + item.label = ""; item.action.apply(me); } @@ -277,13 +357,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat frappe.boot.user.last_selected_values[me.df.options] = item.value; } - me.parse_validate_and_set_in_model(item.value); + me.parse_validate_and_set_in_model(item.value, item.label); }); this.$input.on("awesomplete-selectcomplete", function(e) { - var o = e.originalEvent; - if(o.text.value.indexOf("__link_option") !== -1) { - me.$input.val(""); + let o = e.originalEvent; + if (o.text.value.indexOf("__link_option") !== -1) { + me.reset_value(); + me.reset_fetch_values(me.df, me.docname); } }); } @@ -452,10 +533,13 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.docname, value); } validate_link_and_fetch(df, doctype, docname, value) { - if(value) { + let me = this; + + if (value) { return new Promise((resolve) => { - var fetch = ''; - if(this.frm && this.frm.fetch_dict[df.fieldname]) { + let fetch = ''; + + if (this.frm && this.frm.fetch_dict[df.fieldname]) { fetch = this.frm.fetch_dict[df.fieldname].columns.join(', '); } // if default and no fetch, no need to validate @@ -465,10 +549,14 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat this.fetch_and_validate_link(resolve, df, doctype, docname, value, fetch); }); + } else { + me.reset_value(); + me.reset_fetch_values(df, docname); } } - fetch_and_validate_link(resolve, df, doctype, docname, value, fetch) { + let me = this; + frappe.call({ method: 'frappe.desk.form.utils.validate_link', type: "GET", @@ -485,18 +573,27 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat } resolve(r.valid_value); } else { + me.reset_value(); + me.reset_fetch_values(df, docname); resolve(""); } } }); } - set_fetch_values(df, docname, fetch_values) { - var fl = this.frm.fetch_dict[df.fieldname].fields; - for(var i=0; i < fl.length; i++) { + let fl = this.frm.fetch_dict[df.fieldname].fields; + + for (var i=0; i < fl.length; i++) { frappe.model.set_value(df.parent, docname, fl[i], fetch_values[i], df.fieldtype); } } + reset_fetch_values(df, docname) { + let fields = this.frm && this.frm.fetch_dict && this.frm.fetch_dict[df.fieldname] ? this.frm.fetch_dict[df.fieldname].fields : []; + + fields.forEach(field => { + frappe.model.set_value(df.parent, docname, field, null, df.fieldtype); + }); + } }; if (Awesomplete) { diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index 15dfd9649e..f74e0837ff 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -62,6 +62,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f [link_field.fieldname]: value }); } + frappe.add_link_title(link_field.options, value, label); } this._rows_list = this.rows.map(row => row[link_field.fieldname]); return this.rows; @@ -126,10 +127,12 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f this.$input_area.prepend(html); } get_pill_html(value) { - const encoded_value = encodeURIComponent(value); + const link_field = this.get_link_field(); + const encoded_value = encodeURIComponent(value.name); + const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name; return ` `; diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index b9a838688d..c4f042533d 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -106,12 +106,14 @@ frappe.form.formatters = { Link: function(value, docfield, options, doc) { var doctype = docfield._options || docfield.options; var original_value = value; + let link_title = frappe.get_link_title(doctype, value); + if(value && value.match && value.match(/^['"].*['"]$/)) { value.replace(/^.(.*).$/, "$1"); } if(options && (options.for_print || options.only_value)) { - return value; + return link_title || value; } if(frappe.form.link_formatters[doctype]) { @@ -135,13 +137,14 @@ frappe.form.formatters = { return ` - ${__(options && options.label || value)}`; + data-name="${original_value}" + data-value="${original_value}"> + ${__(options && options.label || link_title || value)}`; } else { - return value; + return link_title || value; } } else { - return value; + return link_title || value; } }, Date: function(value) { diff --git a/frappe/public/js/frappe/form/save.js b/frappe/public/js/frappe/form/save.js index 65d84e2202..612e449a7e 100644 --- a/frappe/public/js/frappe/form/save.js +++ b/frappe/public/js/frappe/form/save.js @@ -249,31 +249,40 @@ frappe.ui.form.update_calling_link = (newdoc) => { }; if (is_valid_doctype()) { - // set value - if (doc && doc.parentfield) { - //update values for child table - $.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) { - if (field.doc && field.doc.name === frappe._from_link.docname) { - frappe._from_link.set_value(newdoc.name); + frappe.model.with_doctype(newdoc.doctype, () => { + let meta = frappe.get_meta(newdoc.doctype); + // set value + if (doc && doc.parentfield) { + //update values for child table + $.each(frappe._from_link.frm.fields_dict[doc.parentfield].grid.grid_rows, function (index, field) { + if (field.doc && field.doc.name === frappe._from_link.docname) { + if (meta.title_field && meta.show_title_field_in_link) { + frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]); + } + frappe._from_link.set_value(newdoc.name); + } + }); + } else { + if (meta.title_field && meta.show_title_field_in_link) { + frappe.add_link_title(newdoc.doctype, newdoc.name, newdoc[meta.title_field]); } - }); - } else { - frappe._from_link.set_value(newdoc.name); - } + frappe._from_link.set_value(newdoc.name); + } - // refresh field - frappe._from_link.refresh(); + // refresh field + frappe._from_link.refresh(); - // if from form, switch - if (frappe._from_link.frm) { - frappe.set_route("Form", - frappe._from_link.frm.doctype, frappe._from_link.frm.docname) - .then(() => { - frappe.utils.scroll_to(frappe._from_link_scrollY); - }); - } + // if from form, switch + if (frappe._from_link.frm) { + frappe.set_route("Form", + frappe._from_link.frm.doctype, frappe._from_link.frm.docname) + .then(() => { + frappe.utils.scroll_to(frappe._from_link_scrollY); + }); + } - frappe._from_link = null; + frappe._from_link = null; + }); } } diff --git a/frappe/public/js/frappe/link_title.js b/frappe/public/js/frappe/link_title.js new file mode 100644 index 0000000000..82bc6c149c --- /dev/null +++ b/frappe/public/js/frappe/link_title.js @@ -0,0 +1,34 @@ +// for link titles +frappe._link_titles = {}; + +frappe.get_link_title = function(doctype, name) { + if (!doctype || !name) { + return; + } + + return frappe._link_titles[doctype + "::" + name]; +}; + +frappe.add_link_title = function (doctype, name, value) { + if (!doctype || !name) { + return; + } + + frappe._link_titles[doctype + "::" + name] = value; +}; + +frappe.set_link_title = function(f) { + let doctype = f.get_options(); + let docname = f.get_input_value(); + + if ((!in_list(frappe.boot.doctypes_with_show_link_field_title, doctype)) || (!doctype || !docname) || + (frappe.get_link_title(doctype, docname))) { + return; + } + + frappe.xcall("frappe.desk.search.get_link_title", {"doctype": doctype, "docname": docname}).then((r) => { + if (r && docname !== r) { + f.set_input_label(r); + } + }); +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/request.js b/frappe/public/js/frappe/request.js index 12fa9c8e21..9f09b288b6 100644 --- a/frappe/public/js/frappe/request.js +++ b/frappe/public/js/frappe/request.js @@ -241,6 +241,11 @@ frappe.request.call = function(opts) { $.extend(frappe._messages, data.__messages); } + // sync link titles + if (data._link_titles) { + $.extend(frappe._link_titles, data._link_titles); + } + // callbacks var status_code_handler = statusCode[xhr.statusCode().status]; if (status_code_handler) { diff --git a/frappe/public/js/frappe/ui/filters/filter.js b/frappe/public/js/frappe/ui/filters/filter.js index b2b2b623e2..d8bc760668 100644 --- a/frappe/public/js/frappe/ui/filters/filter.js +++ b/frappe/public/js/frappe/ui/filters/filter.js @@ -313,6 +313,10 @@ frappe.ui.Filter = class { return this.utils.get_selected_value(this.field, this.get_condition()); } + get_selected_label() { + return this.utils.get_selected_label(this.field); + } + get_condition() { return this.filter_edit_area.find('.condition').val(); } @@ -360,7 +364,7 @@ frappe.ui.Filter = class { get_filter_button_text() { let value = this.utils.get_formatted_value( this.field, - this.get_selected_value() + this.get_selected_label() || this.get_selected_value() ); return `${__(this.field.df.label)} ${__(this.get_condition())} ${__( value @@ -448,6 +452,12 @@ frappe.ui.filter_utils = { return val; }, + get_selected_label(field) { + if (in_list(["Link", "Dynamic Link"], field.df.fieldtype)) { + return field.get_label_value(); + } + }, + get_default_condition(df) { if (df.fieldtype == 'Data') { return 'like'; diff --git a/frappe/www/printview.py b/frappe/www/printview.py index cdf47790eb..268a01eafb 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -170,6 +170,38 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None, return html +def set_link_titles(doc): + # Replaces name with title of link field doctype + + meta = frappe.get_meta(doc.doctype) + set_title_values_for_link_and_dynamic_link_fields(meta, doc) + set_title_values_for_table_and_multiselect_fields(meta, doc) + +def set_title_values_for_link_and_dynamic_link_fields(meta, doc): + for field in meta.get_link_fields() + meta.get_dynamic_link_fields(): + if not doc.get(field.fieldname): + continue + + # If link field, then get doctype from options + # If dynamic link field, then get doctype from dependent field + doctype = field.options if field.fieldtype == "Link" else doc.get(field.options) + + meta = frappe.get_meta(doctype) + if not meta or not (meta.title_field and meta.show_title_field_in_link): + continue + + link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) + setattr(doc, field.fieldname, link_title) + +def set_title_values_for_table_and_multiselect_fields(meta, doc): + for field in meta.get_table_fields(): + if not doc.get(field.fieldname): + continue + + _meta = frappe.get_meta(field.options) + for value in doc.get(field.fieldname): + set_title_values_for_link_and_dynamic_link_fields(_meta, value) + def convert_markdown(doc, meta): '''Convert text field values to markdown if necessary''' for field in meta.fields: @@ -191,6 +223,7 @@ def get_html_and_style(doc, name=None, print_format=None, meta=None, doc = frappe.get_doc(json.loads(doc)) print_format = get_print_format_doc(print_format, meta=meta or frappe.get_meta(doc.doctype)) + set_link_titles(doc) try: html = get_rendered_template(doc, name=name, print_format=print_format, meta=meta, From bee72ee6ff3ad906a5ac83f5e4ba67d4cc153b34 Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 3 Aug 2021 17:15:29 +0530 Subject: [PATCH 002/143] fix: Null query error --- frappe/desk/search.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index a64d6efec4..6d259e3a3d 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -144,7 +144,8 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, title_field_query = get_title_field_query(meta) # Insert title field query after name - formatted_fields.insert(1, title_field_query) + if title_field_query: + formatted_fields.insert(1, title_field_query) # find relevance as location of search term from the beginning of string `name`. used for sorting results. formatted_fields.append("""locate({_txt}, `tab{doctype}`.`name`) as `_relevance`""".format( @@ -216,7 +217,7 @@ def get_std_fields_list(meta, key): def get_title_field_query(meta): title_field = meta.title_field if meta.title_field else None show_title_field_in_link = meta.show_title_field_in_link if meta.show_title_field_in_link else None - field = "NULL as `label`" + field = None if title_field and show_title_field_in_link: field = "`tab{0}`.{1} as `label`".format(meta.name, title_field) @@ -224,10 +225,13 @@ def get_title_field_query(meta): return field def build_for_autosuggest(res, doctype, is_query): + meta = frappe.get_meta(doctype) + title_field = get_title_field_query(meta) + _from = 2 if title_field else 1 results = [] for r in res: r = list(r) - if is_query or doctype in (frappe.get_hooks().standard_queries or {}): + if not (meta.title_field and meta.show_title_field_in_link) or doctype in (frappe.get_hooks().standard_queries or {}): out = { "value": r[0], "description": ", ".join(unique(cstr(d) for d in r[1:] if d)) @@ -235,8 +239,8 @@ def build_for_autosuggest(res, doctype, is_query): else: out = { "value": r[0], - "label": r[1], - "description": ", ".join(unique(cstr(d) for d in r[2:] if d)) + "label": r[1] if title_field else None, + "description": ", ".join(unique(cstr(d) for d in r[_from:] if d)) } results.append(out) From 1b3d202eb6e5a10d51500f82b0eabfd7f395260e Mon Sep 17 00:00:00 2001 From: hrwx Date: Fri, 6 Aug 2021 11:31:08 +0530 Subject: [PATCH 003/143] fix: do not modify doc for print formats --- frappe/utils/formatters.py | 15 +++++++++++++++ frappe/www/printview.py | 18 ++++++++++++++---- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 9efccc15f0..2ef3ab4fce 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -95,4 +95,19 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): elif df.get("fieldtype") == "Text Editor": return "
{}
".format(value) + elif df.get("fieldtype") in ["Link", "Dynamic Link"]: + if not doc or not doc.get("__link_titles") or not df.options: + return value + + doctype = df.options + if df.get("fieldtype") == "Dynamic Link": + if not df.parent: + return value + + meta = frappe.get_meta(df.parent) + _field = meta.get_field(df.options) + doctype = _field.options + + return doc.__link_titles.get("{0}::{1}".format(doctype, value), value) + return value diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 268a01eafb..77fbd0b8e4 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -171,13 +171,20 @@ def get_rendered_template(doc, name=None, print_format=None, meta=None, return html def set_link_titles(doc): - # Replaces name with title of link field doctype + # Adds name with title of link field doctype to __link_titles + if not doc.get("__link_titles"): + setattr(doc, "__link_titles", {}) meta = frappe.get_meta(doc.doctype) set_title_values_for_link_and_dynamic_link_fields(meta, doc) set_title_values_for_table_and_multiselect_fields(meta, doc) -def set_title_values_for_link_and_dynamic_link_fields(meta, doc): +def set_title_values_for_link_and_dynamic_link_fields(meta, doc, parent_doc=None): + if parent_doc and not parent_doc.get("__link_titles"): + setattr(parent_doc, "__link_titles", {}) + elif doc and not doc.get("__link_titles"): + setattr(doc, "__link_titles", {}) + for field in meta.get_link_fields() + meta.get_dynamic_link_fields(): if not doc.get(field.fieldname): continue @@ -191,7 +198,10 @@ def set_title_values_for_link_and_dynamic_link_fields(meta, doc): continue link_title = frappe.get_cached_value(doctype, doc.get(field.fieldname), meta.title_field) - setattr(doc, field.fieldname, link_title) + if parent_doc: + parent_doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title + elif doc: + doc.__link_titles["{0}::{1}".format(doctype, doc.get(field.fieldname))] = link_title def set_title_values_for_table_and_multiselect_fields(meta, doc): for field in meta.get_table_fields(): @@ -200,7 +210,7 @@ def set_title_values_for_table_and_multiselect_fields(meta, doc): _meta = frappe.get_meta(field.options) for value in doc.get(field.fieldname): - set_title_values_for_link_and_dynamic_link_fields(_meta, value) + set_title_values_for_link_and_dynamic_link_fields(_meta, value, doc) def convert_markdown(doc, meta): '''Convert text field values to markdown if necessary''' From 0adff72877bac3b9ce400454e65bd9bb9f965d1a Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 15 Dec 2021 20:03:56 +0530 Subject: [PATCH 004/143] fix: link title for link fields --- frappe/public/js/frappe/form/controls/link.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index a3c876fae2..a884399360 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -89,7 +89,7 @@ frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlDat if (this.parse) value = this.parse(value, label); if (label) { this.label = label; - frappe.add_link_title(this.doctype, value, label); + frappe.add_link_title(this.df.options, value, label); } return this.validate_and_set_in_model(value, e); From d83bcc83542c32a759d1c4df1c067f83f15f548b Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 15 Dec 2021 20:14:43 +0530 Subject: [PATCH 005/143] fix: title in table multiselect pills --- frappe/public/js/frappe/form/controls/table_multiselect.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/table_multiselect.js b/frappe/public/js/frappe/form/controls/table_multiselect.js index f74e0837ff..6e26a15249 100644 --- a/frappe/public/js/frappe/form/controls/table_multiselect.js +++ b/frappe/public/js/frappe/form/controls/table_multiselect.js @@ -49,7 +49,7 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f setup_buttons() { this.$input_area.find('.link-btn').remove(); } - parse(value) { + parse(value, label) { const link_field = this.get_link_field(); if (value) { @@ -128,8 +128,8 @@ frappe.ui.form.ControlTableMultiSelect = class ControlTableMultiSelect extends f } get_pill_html(value) { const link_field = this.get_link_field(); - const encoded_value = encodeURIComponent(value.name); - const pill_name = frappe.get_link_title(link_field.options, value[link_field.fieldname]) || value.name; + const encoded_value = encodeURIComponent(value); + const pill_name = frappe.get_link_title(link_field.options, value) || value; return ` `; } + get_label(value) { + const item = this._data?.find(d => d.value === value); + return item ? item.label || item.value : null; + } + get_awesomplete_settings() { const settings = super.get_awesomplete_settings(); From 8a264d05cacf8501dab393f009aa899190e5f7d2 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 13:02:20 +0530 Subject: [PATCH 111/143] fix: remove `ignore_in_getter`; cleaner implementation --- frappe/model/base_document.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index f6b7d05079..d55ed6cbd2 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -73,8 +73,7 @@ def get_controller(doctype): return site_controllers[doctype] class BaseDocument(object): - ignore_in_getter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns") - ignore_in_setter = ("doctype",) + ignore_in_setter = ("doctype", "_meta", "meta", "_table_fields", "_valid_columns") def __init__(self, d): if d.get("doctype"): @@ -148,10 +147,11 @@ class BaseDocument(object): else: value = self.__dict__.get(key, default) - if value is None and key not in self.ignore_in_getter \ - and key in (d.fieldname for d in self.meta.get_table_fields()): - self.set(key, []) - value = self.__dict__.get(key) + if value is None and key in ( + d.fieldname for d in self.meta.get_table_fields() + ): + value = [] + self.set(key, value) return value else: From 7ce9f1eaa1acd8c9d7ef618c06dc91182e8e5d93 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Tue, 15 Feb 2022 13:06:55 +0530 Subject: [PATCH 112/143] fix: limit without filter --- frappe/model/base_document.py | 3 +++ frappe/tests/test_document.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index ea4264212b..a386313dc2 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -149,6 +149,9 @@ class BaseDocument(object): self.set(key, []) value = self.__dict__.get(key) + if limit and isinstance(value, (list, tuple)) and len(value) > limit: + value = value[:limit] + return value else: return self.__dict__ diff --git a/frappe/tests/test_document.py b/frappe/tests/test_document.py index a0c44c5c72..71af7e996f 100644 --- a/frappe/tests/test_document.py +++ b/frappe/tests/test_document.py @@ -264,7 +264,10 @@ class TestDocument(unittest.TestCase): def test_limit_for_get(self): doc = frappe.get_doc("DocType", "DocType") - # assuming DocType has more that 3 Data fields + # assuming DocType has more than 3 Data fields + self.assertEquals(len(doc.get("fields", limit=3)), 3) + + # limit with filters self.assertEquals(len(doc.get("fields", filters={"fieldtype": "Data"}, limit=3)), 3) def test_virtual_fields(self): From 81f4e2b00910ee47e8abb6e7b7534e51d2064baa Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 13:47:20 +0530 Subject: [PATCH 113/143] test: UI test for list/report view paging --- cypress/integration/report_view.js | 56 +++++++++++++++++++++++------- frappe/tests/ui_test_helpers.py | 6 ++++ 2 files changed, 49 insertions(+), 13 deletions(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 0253e8fd43..5a0b13a3a0 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -11,30 +11,60 @@ context('Report View', () => { 'title': 'Doc 1', 'description': 'Random Text', 'enabled': 0, - // submit document - 'docstatus': 1 - }, true).as('doc'); + 'docstatus': 1 // submit document + }, true); + return cy.window().its('frappe').then(frappe => { + return frappe.call("frappe.tests.ui_test_helpers.create_multiple_contact_records"); + }); }); + it('Field with enabled allow_on_submit should be editable.', () => { cy.intercept('POST', 'api/method/frappe.client.set_value').as('value-update'); cy.visit(`/app/List/${doctype_name}/Report`); + // check status column added from docstatus cy.get('.dt-row-0 > .dt-cell--col-3').should('contain', 'Submitted'); let cell = cy.get('.dt-row-0 > .dt-cell--col-4'); + // select the cell cell.dblclick(); cell.get('.dt-cell__edit--col-4').findByRole('checkbox').check({ force: true }); + cy.wait('@value-update'); - cy.get('@doc').then(doc => { - cy.call('frappe.client.get_value', { - doctype: doc.doctype, - filters: { - name: doc.name, - }, - fieldname: 'enabled' - }).then(r => { - expect(r.message.enabled).to.equals(1); - }); + + cy.call('frappe.client.get_value', { + doctype: doctype_name, + filters: { + title: 'Doc 1', + }, + fieldname: 'enabled' + }).then(r => { + expect(r.message.enabled).to.equals(1); }); }); + + it('test load more with count selection buttons', () => { + cy.visit('/app/contact/view/report'); + + cy.clear_filters(); + cy.get('.list-paging-area .list-count').should('contain.text', '20 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '40 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '60 of'); + + cy.get('.list-paging-area .btn-group .btn-paging[data-value="100"]').click(); + + cy.get('.list-paging-area .list-count').should('contain.text', '100 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '200 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + + cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click(); + + cy.get('.list-paging-area .list-count').should('contain.text', '500 of'); + cy.get('.list-paging-area .btn-more').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '1000 of'); + }); }); \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index b299df522c..079dcc64ef 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -134,6 +134,12 @@ def create_contact_records(): insert_contact('Test Form Contact 2', '54321') insert_contact('Test Form Contact 3', '12345') +@frappe.whitelist() +def create_multiple_contact_records(): + if frappe.db.get_all('Contact', {'first_name': 'Multiple Contact 1'}): + return + for index in range(1001): + insert_contact('Multiple Contact {}'.format(index+1), '12345{}'.format(index+1)) def insert_contact(first_name, phone_number): doc = frappe.get_doc({ From 18ba5fcd49d53f9af6d883721fde45a10e243fd1 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 14:10:55 +0530 Subject: [PATCH 114/143] perf: reduce one query in `get_controller` --- frappe/model/base_document.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 18b9212e1d..eb08a9b0ae 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -33,13 +33,12 @@ def get_controller(doctype): module_name, custom = frappe.db.get_value( "DocType", doctype, ("module", "custom"), cache=True - ) or ["Core", False] + ) or ("Core", False) if custom: - if frappe.db.field_exists("DocType", "is_tree"): - is_tree = frappe.db.get_value("DocType", doctype, "is_tree", cache=True) - else: - is_tree = False + is_tree = frappe.db.get_value( + "DocType", doctype, "is_tree", ignore=True, cache=True + ) _class = NestedSet if is_tree else Document else: class_overrides = frappe.get_hooks('override_doctype_class') From 1a20f376f3b5259e66e3d0b4ab58664371722e8e Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 15 Feb 2022 13:06:30 +0530 Subject: [PATCH 115/143] perf: reduce loop in `doc.update` --- frappe/model/base_document.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index a0f692f630..c8a6ead0ec 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -106,13 +106,9 @@ class BaseDocument(object): }) """ - # QUESTION: why do we need the 1st for loop? - # we're essentially setting the values in d, in the 2nd for loop (?) - - # first set default field values of base document - for key in default_fields: - if key in d: - self.set(key, d[key]) + # set name first, as it is used a reference in child document + if "name" in d: + self.name = d["name"] for key, value in d.items(): self.set(key, value) @@ -189,6 +185,7 @@ class BaseDocument(object): if isinstance(value, (dict, BaseDocument)): if not self.__dict__.get(key): self.__dict__[key] = [] + value = self._init_child(value, key) self.__dict__[key].append(value) @@ -225,6 +222,7 @@ class BaseDocument(object): def _init_child(self, value, key): if not self.doctype: return value + if not isinstance(value, BaseDocument): if "doctype" not in value or value['doctype'] is None: value["doctype"] = self.get_table_field_doctype(key) From 8ba50a8b142dcc036ef2f86aa3d641df656e2c21 Mon Sep 17 00:00:00 2001 From: Summayya Hashmani <58825865+sumaiya2908@users.noreply.github.com> Date: Tue, 15 Feb 2022 19:30:08 +0530 Subject: [PATCH 116/143] feat: add button in dashboard list redirecting to dashboard view. (#15695) Co-authored-by: Summayya Co-authored-by: Shariq Ansari <30859809+shariquerik@users.noreply.github.com> --- frappe/desk/doctype/dashboard/dashboard_list.js | 16 ++++++++++++++++ frappe/public/icons/timeless/symbol-defs.svg | 7 +++++++ 2 files changed, 23 insertions(+) create mode 100644 frappe/desk/doctype/dashboard/dashboard_list.js diff --git a/frappe/desk/doctype/dashboard/dashboard_list.js b/frappe/desk/doctype/dashboard/dashboard_list.js new file mode 100644 index 0000000000..d60a324048 --- /dev/null +++ b/frappe/desk/doctype/dashboard/dashboard_list.js @@ -0,0 +1,16 @@ +frappe.listview_settings['Dashboard'] = { + button: { + show(doc) { + return doc.name; + }, + get_label() { + return frappe.utils.icon("dashboard-list", "sm"); + }, + get_description(doc) { + return __('View {0}', [`${doc.name}`]); + }, + action(doc) { + frappe.set_route('dashboard-view', doc.name); + } + }, +}; \ No newline at end of file diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index f2977e3016..bf4e02a7af 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -814,6 +814,13 @@ + + + + + + + From af7dc6b774846fcf4e473854b37104a4efa75f6e Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 20:24:03 +0530 Subject: [PATCH 117/143] fix: after load more on refresh gets duplicate data --- frappe/public/js/frappe/list/base_list.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/base_list.js b/frappe/public/js/frappe/list/base_list.js index ed27bdb29e..d09a1c7043 100644 --- a/frappe/public/js/frappe/list/base_list.js +++ b/frappe/public/js/frappe/list/base_list.js @@ -391,9 +391,10 @@ frappe.views.BaseList = class BaseList { $this.addClass("btn-info"); this.start = 0; - this.page_length = $this.data().value; + this.page_length = this.selected_page_count = $this.data().value; } else if ($this.is(".btn-more")) { this.start = this.start + this.page_length; + this.page_length = this.selected_page_count || 20; } this.refresh(); }); @@ -474,6 +475,7 @@ frappe.views.BaseList = class BaseList { this.render(); this.after_render(); this.freeze(false); + this.reset_defaults(); if (this.settings.refresh) { this.settings.refresh(this); } @@ -500,6 +502,11 @@ frappe.views.BaseList = class BaseList { this.data = this.data.uniqBy((d) => d.name); } + reset_defaults() { + this.page_length = this.page_length + this.start; + this.start = 0; + } + freeze() { // show a freeze message while data is loading } From f41a05cfd9a3cefdae8ec5137d34c06aae3000c1 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Tue, 15 Feb 2022 20:35:53 +0530 Subject: [PATCH 118/143] test: UI test to check if refresh work after load more --- cypress/integration/report_view.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cypress/integration/report_view.js b/cypress/integration/report_view.js index 5a0b13a3a0..4bc5784a53 100644 --- a/cypress/integration/report_view.js +++ b/cypress/integration/report_view.js @@ -46,7 +46,6 @@ context('Report View', () => { it('test load more with count selection buttons', () => { cy.visit('/app/contact/view/report'); - cy.clear_filters(); cy.get('.list-paging-area .list-count').should('contain.text', '20 of'); cy.get('.list-paging-area .btn-more').click(); cy.get('.list-paging-area .list-count').should('contain.text', '40 of'); @@ -61,6 +60,10 @@ context('Report View', () => { cy.get('.list-paging-area .btn-more').click(); cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + // check if refresh works after load more + cy.get('.page-head .standard-actions [data-original-title="Refresh"]').click(); + cy.get('.list-paging-area .list-count').should('contain.text', '300 of'); + cy.get('.list-paging-area .btn-group .btn-paging[data-value="500"]').click(); cy.get('.list-paging-area .list-count').should('contain.text', '500 of'); From 1a912aa787c53bb8226f4588afdb148566d776f3 Mon Sep 17 00:00:00 2001 From: hrwx Date: Tue, 15 Feb 2022 14:58:24 +0000 Subject: [PATCH 119/143] fix: merge groups for doctype links --- frappe/model/meta.py | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/frappe/model/meta.py b/frappe/model/meta.py index 372392f689..1b437aaf62 100644 --- a/frappe/model/meta.py +++ b/frappe/model/meta.py @@ -14,16 +14,28 @@ Example: ''' +import json +import os from datetime import datetime + import click -import frappe, json, os -from frappe.utils import cstr, cint, cast -from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields, child_table_fields -from frappe.model.document import Document + +import frappe +from frappe import _ +from frappe.model import ( + child_table_fields, + data_fieldtypes, + default_fields, + no_value_fields, + optional_fields, + table_fields, +) from frappe.model.base_document import BaseDocument -from frappe.modules import load_doctype_module +from frappe.model.document import Document from frappe.model.workflow import get_workflow_name -from frappe import _ +from frappe.modules import load_doctype_module +from frappe.utils import cast, cint, cstr + def get_meta(doctype, cached=True): if cached: @@ -546,7 +558,7 @@ class Meta(Document): # For internal links parent doctype will be the key doctype = link.parent_doctype or link.link_doctype # group found - if link.group and group.label == link.group: + if link.group and _(group.label) == _(link.group): if doctype not in group.get('items'): group.get('items').append(doctype) link.added = True From 8bae45823c6fb21517315a267678cbdaed0d3687 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 05:29:12 +0100 Subject: [PATCH 120/143] fix: Update Translations (#15878) --- frappe/translations/de.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 17151a14eb..9cf27bd60f 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -736,6 +736,7 @@ Content Hash,Inhalts-Hash, Content web page.,Inhalt der Webseite., Conversation Tones,Konversationstöne, Copyright,Copyright, +Copy to Clipboard,In die Zwischenablage, Core,Kern, Core DocTypes cannot be customized.,Core DocTypes können nicht angepasst werden., Could not connect to outgoing email server,Konnte keine Verbindung zum Postausgangsserver herstellen, @@ -959,6 +960,7 @@ Edit {0},Bearbeiten {0}, Editable Grid,Editierbares Raster, Editing Row,Zeile bearbeiten, Eg. smsgateway.com/api/send_sms.cgi,z. B. smsgateway.com/api/send_sms.cgi, +Email,E-Mail, Email Account Name,E-Mail-Konten-Name, Email Account added multiple times,E-Mail-Konto wurde mehrmals hinzugefügt, Email Addresses,E-Mail-Adressen, From 6cbede451da63d223bf484d5b32c373dd221cff7 Mon Sep 17 00:00:00 2001 From: smehata <53169014+smehata@users.noreply.github.com> Date: Wed, 16 Feb 2022 10:12:35 +0530 Subject: [PATCH 121/143] fix(Permission Manager): Update client-side permission data (#15945) On updating access from Permission Manager. Permissions are not updated till we do a hard refresh. ![Screenshot from 2022-02-11 12-32-52](https://user-images.githubusercontent.com/53169014/153550692-dc530eec-f44e-497d-9aca-8c10f1819cb0.png) --- frappe/core/page/permission_manager/permission_manager.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/core/page/permission_manager/permission_manager.js b/frappe/core/page/permission_manager/permission_manager.js index 6b427fdebf..cb218b2eae 100644 --- a/frappe/core/page/permission_manager/permission_manager.js +++ b/frappe/core/page/permission_manager/permission_manager.js @@ -347,6 +347,7 @@ frappe.PermissionEngine = class PermissionEngine { } add_check_events() { + let me = this; this.body.on("click", ".show-user-permissions", () => { frappe.route_options = { allow: this.get_doctype() || "" }; frappe.set_route('List', 'User Permission'); @@ -373,7 +374,7 @@ frappe.PermissionEngine = class PermissionEngine { // exception: reverse chk.prop("checked", !chk.prop("checked")); } else { - this.get_perm(args.role)[args.ptype] = args.value; + me.get_perm(args.role)[args.ptype] = args.value; } } }); From 581c5f52e66629669531d92044d84c4acacf9464 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:49:57 +0100 Subject: [PATCH 122/143] fix: added missing translations for View Types (#15873) added missing translations for View Types > no-docs --- frappe/translations/de.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 9cf27bd60f..3af45b024e 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1487,7 +1487,8 @@ Linked with {0},Verknüpft mit {0}, Links,Verknüpfungen, List,Listenansicht, List Filter,Listenfilter, -List View Setting,List View Setting, +List View,Listenansicht, +List View Setting,Einstellungen zu Listenansicht, List a document type,Einen Dokumenttyp auflisten, "List as [{""label"": _(""Jobs""), ""route"":""jobs""}]","Liste als [{ ""label"": _ ( ""Jobs""), ""route"": ""jobs""}]", List of backups available for download,Datensicherungen herunterladen, From 8b41f7a7e7a00b54f615de902d2de1c5bff1acf9 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:51:04 +0100 Subject: [PATCH 123/143] fix(translation): Update translation for web_template (#15956) --- frappe/translations/de.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 3af45b024e..5bec4dd4da 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1455,6 +1455,7 @@ Last User,Letzter Benutzer, Last Week,Letzte Woche, Last Year,Vergangenes Jahr, Last synced {0},Zuletzt synchronisiert {0}, +Learn more,Mehr erfahren, Leave a Comment,Hinterlasse einen Kommentar, Leave blank to repeat always,"Freilassen, um immer zu wiederholen", Leave this conversation,Benachrichtigungen abbestellen, From 6d0abc77a88fcf02d49568272b880bf29dc64074 Mon Sep 17 00:00:00 2001 From: Wolfram Schmidt Date: Wed, 16 Feb 2022 06:52:07 +0100 Subject: [PATCH 124/143] fix(translation): Update translations for website module (#15955) --- frappe/translations/de.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/translations/de.csv b/frappe/translations/de.csv index 5bec4dd4da..25a33370dc 100644 --- a/frappe/translations/de.csv +++ b/frappe/translations/de.csv @@ -1226,8 +1226,8 @@ Headers,Headers, Heading,Überschrift, Hello {0},Hallo {0}, Hello!,Hallo!, -Help Articles,Artikel-Hilfe, -Help Category,Kategorie-Hilfe, +Help Articles,Hilfeartikel, +Help Category,Hilfekategorie, Help on Search,Hilfe zur Suche, "Help: To link to another record in the system, use ""#Form/Note/[Note Name]"" as the Link URL. (don't use ""http://"")","Hilfe: Um eine Verknüpfung mit einem anderen Datensatz im System zu erstellen, bitte ""#Formular/Anmerkung/[Anmerkungsname]"" als Verknüpfungs-URL verwenden (kein ""http://""!).", Helvetica,Helvetica, From 6d4df45ab0cd094f195a860dfddc5b00bcc8f960 Mon Sep 17 00:00:00 2001 From: Shariq Ansari Date: Wed, 16 Feb 2022 13:58:24 +0530 Subject: [PATCH 125/143] revert: unrelated formatting changes --- frappe/public/js/frappe/form/form.js | 196 +++++++++++++-------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 1fa5d6192d..171115b60b 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -44,7 +44,7 @@ frappe.ui.form.Form = class FrappeForm { setup_meta() { this.meta = frappe.get_doc('DocType', this.doctype); - if (this.meta.istable) { + if(this.meta.istable) { this.meta.in_dialog = 1; } @@ -248,7 +248,7 @@ frappe.ui.form.Form = class FrappeForm { // on main doc frappe.model.on(me.doctype, "*", function(fieldname, value, doc) { // set input - if (doc.name === me.docname) { + if(doc.name===me.docname) { me.dirty(); let field = me.fields_dict[fieldname]; @@ -271,7 +271,7 @@ frappe.ui.form.Form = class FrappeForm { // using $.each to preserve df via closure $.each(table_fields, function(i, df) { frappe.model.on(df.options, "*", function(fieldname, value, doc) { - if (doc.parent === me.docname && doc.parentfield === df.fieldname) { + if(doc.parent===me.docname && doc.parentfield===df.fieldname) { me.dirty(); me.fields_dict[df.fieldname].grid.set_value(fieldname, value, doc); return me.script_manager.trigger(fieldname, doc.doctype, doc.name); @@ -282,7 +282,7 @@ frappe.ui.form.Form = class FrappeForm { setup_notify_on_rename() { $(document).on('rename', (ev, dt, old_name, new_name) => { - if (dt == this.doctype) + if (dt==this.doctype) this.rename_notify(dt, old_name, new_name); }); } @@ -299,7 +299,7 @@ frappe.ui.form.Form = class FrappeForm { e.stopPropagation(); e.preventDefault(); - if (me.doc.__islocal) { + if(me.doc.__islocal) { frappe.msgprint(__("Please save before attaching.")); throw "attach error"; } @@ -322,13 +322,13 @@ frappe.ui.form.Form = class FrappeForm { refresh(docname) { var switched = docname ? true : false; - if (docname) { + if(docname) { this.switch_doc(docname); } cur_frm = this; - if (this.docname) { // document to show + if(this.docname) { // document to show this.save_disabled = false; // set the doc this.doc = frappe.get_doc(this.doctype, this.docname); @@ -353,7 +353,7 @@ frappe.ui.form.Form = class FrappeForm { } // do setup - if (!this.setup_done) { + if(!this.setup_done) { this.setup(); } @@ -361,12 +361,12 @@ frappe.ui.form.Form = class FrappeForm { this.trigger_onload(switched); // if print format is shown, refresh the format - // if (this.print_preview.wrapper.is(":visible")) { + // if(this.print_preview.wrapper.is(":visible")) { // this.print_preview.preview(); // } - if (switched) { - if (this.show_print_first && this.doc.docstatus === 1) { + if(switched) { + if(this.show_print_first && this.doc.docstatus===1) { // show print view this.print_doc(); } @@ -374,9 +374,9 @@ frappe.ui.form.Form = class FrappeForm { // set status classes this.$wrapper.removeClass('validated-form') - .toggleClass('editable-form', this.doc.docstatus === 0) - .toggleClass('submitted-form', this.doc.docstatus === 1) - .toggleClass('cancelled-form', this.doc.docstatus === 2); + .toggleClass('editable-form', this.doc.docstatus===0) + .toggleClass('submitted-form', this.doc.docstatus===1) + .toggleClass('cancelled-form', this.doc.docstatus===2); this.show_conflict_message(); } @@ -415,7 +415,7 @@ frappe.ui.form.Form = class FrappeForm { frappe.throw(`Action ${action} not found`); } } - if (action.action_type === 'Server Action') { + if (action.action_type==='Server Action') { return frappe.xcall(action.action, {'doc': this.doc}).then((doc) => { if (doc.doctype) { // document is returned by the method, @@ -430,7 +430,7 @@ frappe.ui.form.Form = class FrappeForm { alert: true }); }); - } else if (action.action_type === 'Route') { + } else if (action.action_type==='Route') { return frappe.set_route(action.action); } } @@ -449,7 +449,7 @@ frappe.ui.form.Form = class FrappeForm { } check_reload() { - if (this.doc && (!this.doc.__unsaved) && this.doc.__last_sync_on && + if(this.doc && (!this.doc.__unsaved) && this.doc.__last_sync_on && (new Date() - this.doc.__last_sync_on) > (this.refresh_if_stale_for * 1000)) { this.reload_doc(); return true; @@ -458,7 +458,7 @@ frappe.ui.form.Form = class FrappeForm { trigger_onload(switched) { this.cscript.is_onload = false; - if (!this.opendocs[this.docname]) { + if(!this.opendocs[this.docname]) { var me = this; this.cscript.is_onload = true; this.initialize_new_doc(); @@ -496,13 +496,13 @@ frappe.ui.form.Form = class FrappeForm { }); // update seen - if (this.meta.track_seen) { + if(this.meta.track_seen) { $('.list-id[data-name="'+ me.docname +'"]').addClass('seen'); } } render_form(switched) { - if (!this.meta.istable) { + if(!this.meta.istable) { this.layout.doc = this.doc; this.layout.attach_doc_and_docfields(); @@ -530,7 +530,7 @@ frappe.ui.form.Form = class FrappeForm { () => this.script_manager.trigger("refresh"), // call onload post render for callbacks to be fired () => { - if (this.cscript.is_onload) { + if(this.cscript.is_onload) { return this.script_manager.trigger("onload_post_render"); } }, @@ -547,7 +547,7 @@ frappe.ui.form.Form = class FrappeForm { this.cscript.is_onload && this.set_first_tab_as_active(); - if (!this.hidden) { + if(!this.hidden) { this.layout.show_empty_form_message(); } @@ -588,7 +588,7 @@ frappe.ui.form.Form = class FrappeForm { } cleanup_refresh() { - if (this.fields_dict['amended_from']) { + if(this.fields_dict['amended_from']) { if (this.doc.amended_from) { unhide_field('amended_from'); if (this.fields_dict['amendment_date']) unhide_field('amendment_date'); @@ -598,15 +598,15 @@ frappe.ui.form.Form = class FrappeForm { } } - if (this.fields_dict['trash_reason']) { - if (this.doc.trash_reason && this.doc.docstatus == 2) { + if(this.fields_dict['trash_reason']) { + if(this.doc.trash_reason && this.doc.docstatus == 2) { unhide_field('trash_reason'); } else { hide_field('trash_reason'); } } - if (this.meta.autoname && this.meta.autoname.substr(0, 6) == 'field:' && !this.doc.__islocal) { + if(this.meta.autoname && this.meta.autoname.substr(0,6)=='field:' && !this.doc.__islocal) { var fn = this.meta.autoname.substr(6); if (this.doc[fn]) { @@ -614,7 +614,7 @@ frappe.ui.form.Form = class FrappeForm { } } - if (this.meta.autoname == "naming_series:" && !this.doc.__islocal) { + if(this.meta.autoname=="naming_series:" && !this.doc.__islocal) { this.toggle_display("naming_series", false); } } @@ -622,12 +622,12 @@ frappe.ui.form.Form = class FrappeForm { refresh_header(switched) { // set title // main title - if (!this.meta.in_dialog || this.in_form) { + if(!this.meta.in_dialog || this.in_form) { frappe.utils.set_title(this.meta.issingle ? this.doctype : this.docname); } // show / hide buttons - if (this.toolbar) { + if(this.toolbar) { if (switched) { this.toolbar.current_status = undefined; } @@ -645,11 +645,11 @@ frappe.ui.form.Form = class FrappeForm { // SAVE save_or_update() { - if (this.save_disabled) return; + if(this.save_disabled) return; - if (this.doc.docstatus === 0) { + if(this.doc.docstatus===0) { this.save(); - } else if (this.doc.docstatus === 1 && this.doc.__unsaved) { + } else if(this.doc.docstatus===1 && this.doc.__unsaved) { this.save("Update"); } } @@ -669,14 +669,14 @@ frappe.ui.form.Form = class FrappeForm { validate_and_save(save_action, callback, btn, on_error, resolve, reject) { var me = this; - if (!save_action) save_action = "Save"; + if(!save_action) save_action = "Save"; this.validate_form_action(save_action, resolve); var after_save = function(r) { // to remove hash from URL to avoid scroll after save history.replaceState(null, null, ' '); - if (!r.exc) { - if (["Save", "Update", "Amend"].indexOf(save_action) !== -1) { + if(!r.exc) { + if (["Save", "Update", "Amend"].indexOf(save_action)!==-1) { frappe.utils.play_sound("click"); } @@ -694,7 +694,7 @@ frappe.ui.form.Form = class FrappeForm { } me.refresh(); } else { - if (on_error) { + if(on_error) { on_error(); reject(); } @@ -708,20 +708,20 @@ frappe.ui.form.Form = class FrappeForm { console.error(e) } btn && $(btn).prop("disabled", false); - if (on_error) { + if(on_error) { on_error(); reject(); } }; - if (save_action != "Update") { + if(save_action != "Update") { // validate frappe.validated = true; frappe.run_serially([ () => this.script_manager.trigger("validate"), () => this.script_manager.trigger("before_save"), () => { - if (!frappe.validated) { + if(!frappe.validated) { fail(); return; } @@ -741,12 +741,12 @@ frappe.ui.form.Form = class FrappeForm { frappe.confirm(__("Permanently Submit {0}?", [this.docname]), function() { frappe.validated = true; me.script_manager.trigger("before_submit").then(function() { - if (!frappe.validated) { + if(!frappe.validated) { return me.handle_save_fail(btn, on_error); } me.save('Submit', function(r) { - if (r.exc) { + if(r.exc) { me.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("submit"); @@ -935,7 +935,7 @@ frappe.ui.form.Form = class FrappeForm { } if (!this.perm[0][perm_to_check] && !allowed_for_workflow) { - if (resolve) { + if(resolve) { // re-enable buttons resolve(); } @@ -980,7 +980,7 @@ frappe.ui.form.Form = class FrappeForm { // trigger link fields which have default values set if (this.is_new() && this.doc.__run_link_triggers) { $.each(this.fields_dict, function(fieldname, field) { - if (field.df.fieldtype == "Link" && this.doc[fieldname]) { + if (field.df.fieldtype=="Link" && this.doc[fieldname]) { // triggers add fetch, sets value in model and runs triggers field.set_value(this.doc[fieldname], true); } @@ -991,8 +991,8 @@ frappe.ui.form.Form = class FrappeForm { } show_conflict_message() { - if (this.doc.__needs_refresh) { - if (this.doc.__unsaved) { + if(this.doc.__needs_refresh) { + if(this.doc.__unsaved) { this.dashboard.clear_headline(); this.dashboard.set_headline_alert(__("This form has been modified after you have loaded it") + '' @@ -1004,20 +1004,20 @@ frappe.ui.form.Form = class FrappeForm { } show_submit_message() { - if (this.meta.is_submittable + if(this.meta.is_submittable && this.perm[0] && this.perm[0].submit && !this.is_dirty() && !this.is_new() && !frappe.model.has_workflow(this.doctype) // show only if no workflow - && this.doc.docstatus === 0) { + && this.doc.docstatus===0) { this.dashboard.add_comment(__('Submit this document to confirm'), 'blue', true); } } show_web_link() { - if (!this.doc.__islocal && this.doc.__onload && this.doc.__onload.is_website_generator) { + if(!this.doc.__islocal && this.doc.__onload && this.doc.__onload.is_website_generator) { this.web_link && this.web_link.remove(); - if (this.doc.__onload.published) { + if(this.doc.__onload.published) { this.add_web_link("/" + this.doc.route); } } @@ -1034,16 +1034,16 @@ frappe.ui.form.Form = class FrappeForm { var dt = this.parent_doctype ? this.parent_doctype : this.doctype; this.perm = frappe.perm.get_perm(dt, this.doc); - if (!this.perm[0].read) { + if(!this.perm[0].read) { return 0; } return 1; } check_doctype_conflict(docname) { - if (this.doctype == 'DocType' && docname == 'DocType') { + if(this.doctype=='DocType' && docname=='DocType') { frappe.msgprint(__('Allowing DocType, DocType. Be careful!')); - } else if (this.doctype == 'DocType') { + } else if(this.doctype=='DocType') { if (frappe.views.formview[docname] || frappe.pages['List/'+docname]) { window.location.reload(); // frappe.msgprint(__("Cannot open {0} when its instance is open", ['DocType'])) @@ -1062,16 +1062,16 @@ frappe.ui.form.Form = class FrappeForm { // notify this form of renamed records rename_notify(dt, old, name) { // from form - if (this.meta.istable) + if(this.meta.istable) return; - if (this.docname == old) + if(this.docname == old) this.docname = name; else return; // cleanup - if (this && this.opendocs[old] && frappe.meta.docfield_copy[dt]) { + if(this && this.opendocs[old] && frappe.meta.docfield_copy[dt]) { // delete docfield copy frappe.meta.docfield_copy[dt][name] = frappe.meta.docfield_copy[dt][old]; delete frappe.meta.docfield_copy[dt][old]; @@ -1080,7 +1080,7 @@ frappe.ui.form.Form = class FrappeForm { delete this.opendocs[old]; this.opendocs[name] = true; - if (this.meta.in_dialog || !this.in_form) { + if(this.meta.in_dialog || !this.in_form) { return; } @@ -1155,7 +1155,7 @@ frappe.ui.form.Form = class FrappeForm { newdoc.idx = null; newdoc.__run_link_triggers = false; - if (onload) { + if(onload) { onload(newdoc); } frappe.set_route('Form', newdoc.doctype, newdoc.name); @@ -1164,7 +1164,7 @@ frappe.ui.form.Form = class FrappeForm { reload_doc() { this.check_doctype_conflict(this.docname); - if (!this.doc.__islocal) { + if(!this.doc.__islocal) { frappe.model.remove_from_locals(this.doctype, this.docname); return frappe.model.with_doc(this.doctype, this.docname, () => { this.refresh(); @@ -1311,9 +1311,9 @@ frappe.ui.form.Form = class FrappeForm { $.each(fields_list, function(i, fname) { var docfield = frappe.meta.docfield_map[doctype][fname]; - if (docfield) { + if(docfield) { var label = __(docfield.label || "").replace(/\([^\)]*\)/g, ""); // eslint-disable-line - if (parentfield) { + if(parentfield) { grid_field_label_map[doctype + "-" + fname] = label.trim() + " (" + __(currency) + ")"; } else { @@ -1333,8 +1333,8 @@ frappe.ui.form.Form = class FrappeForm { } field_map(fnames, fn) { - if (typeof fnames === 'string') { - if (fnames == '*') { + if(typeof fnames==='string') { + if(fnames == '*') { fnames = Object.keys(this.fields_dict); } else { fnames = [fnames]; @@ -1343,7 +1343,7 @@ frappe.ui.form.Form = class FrappeForm { for (var i=0, l=fnames.length; i { - if (!unique_keys.includes(key)) { + if(!unique_keys.includes(key)) { d[key] = values[key]; } }); @@ -1448,9 +1448,9 @@ frappe.ui.form.Form = class FrappeForm { var me = this; var _set = function(f, v) { var fieldobj = me.fields_dict[f]; - if (fieldobj) { - if (!if_missing || !frappe.model.has_value(me.doctype, me.doc.name, f)) { - if (frappe.model.table_fields.includes(fieldobj.df.fieldtype) && $.isArray(v)) { + if(fieldobj) { + if(!if_missing || !frappe.model.has_value(me.doctype, me.doc.name, f)) { + if(frappe.model.table_fields.includes(fieldobj.df.fieldtype) && $.isArray(v)) { frappe.model.clear_table(me.doc, fieldobj.df.fieldname); @@ -1473,13 +1473,13 @@ frappe.ui.form.Form = class FrappeForm { } }; - if (typeof field == "string") { + if(typeof field=="string") { return _set(field, value); - } else if ($.isPlainObject(field)) { + } else if($.isPlainObject(field)) { let tasks = []; for (let f in field) { let v = field[f]; - if (me.get_field(f)) { + if(me.get_field(f)) { tasks.push(() => _set(f, v)); } } @@ -1489,7 +1489,7 @@ frappe.ui.form.Form = class FrappeForm { call(opts, args, callback) { var me = this; - if (typeof opts === 'string') { + if(typeof opts==='string') { // called as frm.call('do_this', {with_arg: 'arg'}); opts = { method: opts, @@ -1498,19 +1498,19 @@ frappe.ui.form.Form = class FrappeForm { callback: callback }; } - if (!opts.doc) { - if (opts.method.indexOf(".") === -1) + if(!opts.doc) { + if(opts.method.indexOf(".")===-1) opts.method = frappe.model.get_server_module_name(me.doctype) + "." + opts.method; opts.original_callback = opts.callback; opts.callback = function(r) { - if ($.isPlainObject(r.message)) { - if (opts.child) { + if($.isPlainObject(r.message)) { + if(opts.child) { // update child doc opts.child = locals[opts.child.doctype][opts.child.name]; var std_field_list = ["doctype"].concat(frappe.model.std_fields_list); for (var key in r.message) { - if (std_field_list.indexOf(key) === -1) { + if (std_field_list.indexOf(key)===-1) { opts.child[key] = r.message[key]; } } @@ -1526,7 +1526,7 @@ frappe.ui.form.Form = class FrappeForm { } else { opts.original_callback = opts.callback; opts.callback = function(r) { - if (!r.exc) me.refresh_fields(); + if(!r.exc) me.refresh_fields(); opts.original_callback && opts.original_callback(r); }; @@ -1567,7 +1567,7 @@ frappe.ui.form.Form = class FrappeForm { } get_title() { - if (this.meta.title_field) { + if(this.meta.title_field) { return this.doc[this.meta.title_field]; } else { return this.doc.name; @@ -1581,11 +1581,11 @@ frappe.ui.form.Form = class FrappeForm { // handle TableMultiselect child fields let _selected = []; - if (me.fields_dict[df.fieldname].grid) { + if(me.fields_dict[df.fieldname].grid) { _selected = me.fields_dict[df.fieldname].grid.get_selected(); } - if (_selected.length) { + if(_selected.length) { selected[df.fieldname] = _selected; } }); @@ -1595,11 +1595,11 @@ frappe.ui.form.Form = class FrappeForm { set_indicator_formatter(fieldname, get_color, get_text) { // get doctype from parent var doctype; - if (frappe.meta.docfield_map[this.doctype][fieldname]) { + if(frappe.meta.docfield_map[this.doctype][fieldname]) { doctype = this.doctype; } else { frappe.meta.get_table_fields(this.doctype).every(function(df) { - if (frappe.meta.docfield_map[df.options][fieldname]) { + if(frappe.meta.docfield_map[df.options][fieldname]) { doctype = df.options; return false; } else { @@ -1610,11 +1610,11 @@ frappe.ui.form.Form = class FrappeForm { frappe.meta.docfield_map[doctype][fieldname].formatter = function(value, df, options, doc) { - if (value) { + if(value) { var label; - if (get_text) { + if(get_text) { label = get_text(doc); - } else if (frappe.form.link_formatters[df.options]) { + } else if(frappe.form.link_formatters[df.options]) { label = frappe.form.link_formatters[df.options](value, doc); } else { label = value; @@ -1633,21 +1633,21 @@ frappe.ui.form.Form = class FrappeForm { // return true or false if the user can make a particlar doctype // will check permission, `can_make_methods` if exists, or will decided on // basis of whether the document is submittable - if (!frappe.model.can_create(doctype)) { + if(!frappe.model.can_create(doctype)) { return false; } - if (this.custom_make_buttons && this.custom_make_buttons[doctype]) { + if(this.custom_make_buttons && this.custom_make_buttons[doctype]) { // custom buttons are translated and so are the keys const key = __(this.custom_make_buttons[doctype]); // if the button is present, then show make return !!this.custom_buttons[key]; } - if (this.can_make_methods && this.can_make_methods[doctype]) { + if(this.can_make_methods && this.can_make_methods[doctype]) { return this.can_make_methods[doctype](this); } else { - if (this.meta.is_submittable && !this.doc.docstatus == 1) { + if(this.meta.is_submittable && !this.doc.docstatus==1) { return false; } else { return true; @@ -1660,9 +1660,9 @@ frappe.ui.form.Form = class FrappeForm { // will handover to `make_methods` if defined // or will create and match link fields let me = this; - if (this.make_methods && this.make_methods[doctype]) { + if(this.make_methods && this.make_methods[doctype]) { return this.make_methods[doctype](this); - } else if (this.custom_make_buttons && this.custom_make_buttons[doctype]) { + } else if(this.custom_make_buttons && this.custom_make_buttons[doctype]) { this.custom_buttons[__(this.custom_make_buttons[doctype])].trigger('click'); } else { frappe.model.with_doctype(doctype, function() { @@ -1693,10 +1693,10 @@ frappe.ui.form.Form = class FrappeForm { update_in_all_rows(table_fieldname, fieldname, value) { // update the child value in all tables where it is missing - if (!value) return; + if(!value) return; var cl = this.doc[table_fieldname] || []; - for (var i = 0; i < cl.length; i++) { - if (!cl[i][fieldname]) cl[i][fieldname] = value; + for(var i = 0; i < cl.length; i++){ + if(!cl[i][fieldname]) cl[i][fieldname] = value; } refresh_field("items"); } From 2337c70b7ade4216d4d7b2a20891255f76c58972 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 16 Feb 2022 14:42:19 +0530 Subject: [PATCH 126/143] fix: use `throw` instead of `msgprint` --- 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 2808a2710b..50a7b31bca 100755 --- a/frappe/core/doctype/file/file.py +++ b/frappe/core/doctype/file/file.py @@ -745,7 +745,7 @@ def delete_file(path): """Delete file from `public folder`""" if path: if ".." in path.split("/"): - frappe.msgprint(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path)) + frappe.throw(_("It is risky to delete this file: {0}. Please contact your System Manager.").format(path)) parts = os.path.split(path.strip("/")) if parts[0]=="files": From 20056a447febf8c507060372ab91078ead54e946 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 16 Feb 2022 17:21:59 +0530 Subject: [PATCH 127/143] ci: Track server-side coverage as well while doing UI tests --- .github/helper/install.sh | 4 +++- .github/workflows/ui-tests.yml | 19 ++++++++++++++++++- frappe/commands/utils.py | 11 ++++++++--- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 19a7c68e19..26b3f28ba2 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -50,7 +50,9 @@ if [ "$TYPE" == "server" ]; then sed -i 's/^socketio:/# socketio:/g' Procfile; f if [ "$TYPE" == "server" ]; then sed -i 's/^redis_socketio:/# redis_socketio:/g' Procfile; fi if [ "$TYPE" == "ui" ]; then bench setup requirements --node; fi -if [ "$TYPE" == "server" ]; then bench setup requirements --dev; fi +bench setup requirements --dev + +if [ "$TYPE" == "ui" ]; then sed -i 's/^web: bench serve/web: bench serve --with-coverage/g' Procfile; fi # install node-sass which is required for website theme test cd ./apps/frappe || exit diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 3eefd1ce82..fb09768c81 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -118,7 +118,9 @@ jobs: - name: Install if: ${{ steps.check-build.outputs.build == 'strawberry' }} - run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh + run: | + bash ${GITHUB_WORKSPACE}/.github/helper/install.sh + cat ~/frappe-bench/Procfile env: DB: mariadb TYPE: ui @@ -141,6 +143,11 @@ jobs: env: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb + - name: Stop server + run: | + ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true + sleep 5 + - name: Check If Coverage Report Exists id: check_coverage uses: andstor/file-existence-action@v1 @@ -156,3 +163,13 @@ jobs: directory: /home/runner/frappe-bench/apps/frappe/.cypress-coverage/ verbose: true flags: ui-tests + + - name: Upload Server Coverage Data + if: ${{ steps.check-build.outputs.build == 'strawberry' }} + uses: codecov/codecov-action@v2 + with: + name: MariaDB + fail_ci_if_error: true + files: /home/runner/frappe-bench/sites/coverage.xml + verbose: true + flags: server diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index e3379a43aa..7246df8aa7 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -742,8 +742,9 @@ def run_ui_tests(context, app, headless=False, parallel=True, with_coverage=Fals @click.option('--profile', is_flag=True, default=False) @click.option('--noreload', "no_reload", is_flag=True, default=False) @click.option('--nothreading', "no_threading", is_flag=True, default=False) +@click.option('--with-coverage', is_flag=True, default=False) @pass_context -def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None): +def serve(context, port=None, profile=False, no_reload=False, no_threading=False, sites_path='.', site=None, with_coverage=False): "Start development web server" import frappe.app @@ -751,8 +752,12 @@ def serve(context, port=None, profile=False, no_reload=False, no_threading=False site = None else: site = context.sites[0] - - frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.') + with CodeCoverage(with_coverage, 'frappe'): + if with_coverage: + # unable to track coverage with threading enabled + no_threading = True + no_reload = True + frappe.app.serve(port=port, profile=profile, no_reload=no_reload, no_threading=no_threading, site=site, sites_path='.') @click.command('request') From 4e24efda8f7aae035fcdc772b89c683c8450dfb6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 16 Feb 2022 17:44:14 +0530 Subject: [PATCH 128/143] ci: Exclude coverage.py and build.py from the report --- .github/workflows/ui-tests.yml | 4 +--- frappe/coverage.py | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index fb09768c81..91369dcaaa 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -118,9 +118,7 @@ jobs: - name: Install if: ${{ steps.check-build.outputs.build == 'strawberry' }} - run: | - bash ${GITHUB_WORKSPACE}/.github/helper/install.sh - cat ~/frappe-bench/Procfile + run: bash ${GITHUB_WORKSPACE}/.github/helper/install.sh env: DB: mariadb TYPE: ui diff --git a/frappe/coverage.py b/frappe/coverage.py index 1969cae141..e76bdaae90 100644 --- a/frappe/coverage.py +++ b/frappe/coverage.py @@ -29,6 +29,8 @@ FRAPPE_EXCLUSIONS = [ "*/commands/*", "*/frappe/change_log/*", "*/frappe/exceptions*", + "*/frappe/coverage.py", + "*/frappe/build.py", "*frappe/setup.py", "*/doctype/*/*_dashboard.py", "*/patches/*", From e0dcabf22499c6c900b7d72061ff7662a213d609 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 09:52:49 +0530 Subject: [PATCH 129/143] ci: Build not required for UI tests Since we build again after instrumentation --- .github/helper/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/helper/install.sh b/.github/helper/install.sh index 26b3f28ba2..246bdbe096 100644 --- a/.github/helper/install.sh +++ b/.github/helper/install.sh @@ -62,4 +62,4 @@ cd ../.. bench start & bench --site test_site reinstall --yes if [ "$TYPE" == "server" ]; then bench --site test_site_producer reinstall --yes; fi -CI=Yes bench build --app frappe +if [ "$TYPE" == "server" ]; then CI=Yes bench build --app frappe; fi From de22bd6297bd0224e291b8856e532432f199fcaa Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 17 Feb 2022 10:35:15 +0530 Subject: [PATCH 130/143] fix: improved validation --- frappe/utils/backups.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index 2ef53a3343..69f4ee2b01 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -653,7 +653,8 @@ def get_backup_path(): @frappe.whitelist() def get_backup_encryption_key(): - return frappe.local.conf.encryption_key + frappe.only("System Manager") + return frappe.conf.encryption_key class Backup: def __init__(self, file_path): From 0f95c2716de3d10cf27ba01556b3f8d7abab0e0d Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 17 Feb 2022 10:50:31 +0530 Subject: [PATCH 131/143] fix: incorrect function name in call --- 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 69f4ee2b01..d23804bef4 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -653,7 +653,7 @@ def get_backup_path(): @frappe.whitelist() def get_backup_encryption_key(): - frappe.only("System Manager") + frappe.only_for("System Manager") return frappe.conf.encryption_key class Backup: From 383eb668bf90c38594d6ebbde41962e4e12d06c6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 11:27:34 +0530 Subject: [PATCH 132/143] fix: Update docfields of a doctype while doing update_docfield_property - This is necessary to get updated docfields while adding new row --- frappe/public/js/frappe/form/grid.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 11fda3c8b0..98ab573b07 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -972,6 +972,7 @@ export default class Grid { // update the parent too (for new rows) this.docfields.find(d => d.fieldname === fieldname)[property] = value; + frappe.meta.docfield_map[this.doctype][fieldname][property] = value; this.debounced_refresh(); } From bb00c34e72bd4a9ae7f06289187904acf9da02f3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 11:30:28 +0530 Subject: [PATCH 133/143] fix: Update grid-row docfield instead of updating doctype meta --- frappe/public/js/frappe/form/grid.js | 3 ++- frappe/public/js/frappe/form/grid_row.js | 18 +++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 98ab573b07..5dc59120fd 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -368,6 +368,8 @@ export default class Grid { if (this.grid_rows[ri] && !append_row) { var grid_row = this.grid_rows[ri]; grid_row.doc = d; + // reset docfield list for this row + grid_row.docfields = this.docfields; grid_row.refresh(); } else { var grid_row = new GridRow({ @@ -972,7 +974,6 @@ export default class Grid { // update the parent too (for new rows) this.docfields.find(d => d.fieldname === fieldname)[property] = value; - frappe.meta.docfield_map[this.doctype][fieldname][property] = value; this.debounced_refresh(); } diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index a40f428969..441a879369 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -5,16 +5,13 @@ export default class GridRow { this.on_grid_fields_dict = {}; this.on_grid_fields = []; $.extend(this, opts); - if (this.doc && this.parent_df.options) { - frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); - const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); - this.docfields = docfields.length ? docfields : opts.docfields; - } + this.set_docfields(); this.columns = {}; this.columns_list = []; this.row_check_html = ''; this.make(); } + make() { var me = this; @@ -41,6 +38,15 @@ export default class GridRow { this.set_data(); } } + + set_docfields() { + if (this.doc && this.parent_df.options) { + frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); + const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); + this.docfields = docfields; + } + } + set_data() { this.wrapper.data({ "doc": this.doc @@ -152,6 +158,8 @@ export default class GridRow { this.doc = locals[this.doc.doctype][this.doc.name]; } + // update docfield list + this.set_docfields(); if(this.grid.template && !this.grid.meta.editable_grid) { this.render_template(); } else { From a8c9b92a013da438f25c873e93a1085148875a83 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 12:16:35 +0530 Subject: [PATCH 134/143] fix: No need to reset docfields, grid row already has df copy --- frappe/public/js/frappe/form/grid.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/public/js/frappe/form/grid.js b/frappe/public/js/frappe/form/grid.js index 5dc59120fd..11fda3c8b0 100644 --- a/frappe/public/js/frappe/form/grid.js +++ b/frappe/public/js/frappe/form/grid.js @@ -368,8 +368,6 @@ export default class Grid { if (this.grid_rows[ri] && !append_row) { var grid_row = this.grid_rows[ri]; grid_row.doc = d; - // reset docfield list for this row - grid_row.docfields = this.docfields; grid_row.refresh(); } else { var grid_row = new GridRow({ From 0a1cd9e623061dc563224dfbc941f003f82a83b4 Mon Sep 17 00:00:00 2001 From: ChillarAnand Date: Thu, 17 Feb 2022 15:43:07 +0530 Subject: [PATCH 135/143] fix: Removed verbose flag for gzip --- frappe/installer.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/installer.py b/frappe/installer.py index d892ff4ddc..0948620ab0 100644 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -529,10 +529,9 @@ def extract_sql_gzip(sql_gz_path): import subprocess try: - # dvf - decompress, verbose, force original_file = sql_gz_path decompressed_file = original_file.rstrip(".gz") - cmd = 'gzip -dvf < {0} > {1}'.format(original_file, decompressed_file) + cmd = 'gzip --decompress --force < {0} > {1}'.format(original_file, decompressed_file) subprocess.check_call(cmd, shell=True) except Exception: raise From 628c9bc2881abadb83fc1f7211cbffecbae48cec Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 17 Feb 2022 16:57:27 +0530 Subject: [PATCH 136/143] ci: Remove build.py from exclusion list Co-authored-by: gavin --- frappe/coverage.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/coverage.py b/frappe/coverage.py index e76bdaae90..5f89800deb 100644 --- a/frappe/coverage.py +++ b/frappe/coverage.py @@ -30,7 +30,6 @@ FRAPPE_EXCLUSIONS = [ "*/frappe/change_log/*", "*/frappe/exceptions*", "*/frappe/coverage.py", - "*/frappe/build.py", "*frappe/setup.py", "*/doctype/*/*_dashboard.py", "*/patches/*", From 9262d2774e00a4a4c12080f23983593790a01368 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 17 Feb 2022 18:50:33 +0530 Subject: [PATCH 137/143] fix(grid): Update docfields for new record --- frappe/public/js/frappe/form/grid_row.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/grid_row.js b/frappe/public/js/frappe/form/grid_row.js index 441a879369..0ee5a180e0 100644 --- a/frappe/public/js/frappe/form/grid_row.js +++ b/frappe/public/js/frappe/form/grid_row.js @@ -11,7 +11,6 @@ export default class GridRow { this.row_check_html = ''; this.make(); } - make() { var me = this; @@ -39,11 +38,18 @@ export default class GridRow { } } - set_docfields() { + set_docfields(update=false) { if (this.doc && this.parent_df.options) { frappe.meta.make_docfield_copy_for(this.parent_df.options, this.doc.name, this.docfields); const docfields = frappe.meta.get_docfields(this.parent_df.options, this.doc.name); - this.docfields = docfields; + if (update) { + // to maintain references + this.docfields.forEach(df => { + Object.assign(df, docfields.find(d => d.fieldname === df.fieldname)); + }); + } else { + this.docfields = docfields; + } } } @@ -154,12 +160,15 @@ export default class GridRow { }, __('Move To'), 'Update'); } refresh() { + // update docfields for new record + if (this.frm && this.doc && this.doc.__islocal) { + this.set_docfields(true); + } + if(this.frm && this.doc) { this.doc = locals[this.doc.doctype][this.doc.name]; } - // update docfield list - this.set_docfields(); if(this.grid.template && !this.grid.meta.editable_grid) { this.render_template(); } else { From 74748c60b2cb9e84a6c68aa3a873dbc31ee52635 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Fri, 18 Feb 2022 12:45:21 +0530 Subject: [PATCH 138/143] test: depends on for tabs --- cypress/integration/depends_on.js | 21 +++++++++++++++++++++ frappe/public/js/frappe/form/tab.js | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index 9aa6b5d89d..c0dbbf63f6 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -55,10 +55,31 @@ context('Depends On', () => { 'read_only_depends_on': "eval:doc.test_field=='Some Other Value'", 'options': "Child Test Depends On" }, + { + "label": "Dependent Tab", + "fieldname": "dependent_tab", + "fieldtype": "Tab Break", + "depends_on": "eval:doc.test_field=='Show Tab'" + }, + { + "fieldname": "tab_section", + "fieldtype": "Section Break", + }, + { + "label": "Field in Tab", + "fieldname": "field_in_tab", + "fieldtype": "Data", + } ] }); }); }); + it('should show the tab on other setting field value', () => { + cy.new_form('Test Depends On'); + cy.fill_field('test_field', 'Show Tab'); + cy.get('body').click(); + cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible'); + }) it('should set the field as mandatory depending on other fields value', () => { cy.new_form('Test Depends On'); cy.fill_field('test_field', 'Some Value'); diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index c8ca016398..7df4d3a0cc 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -40,7 +40,7 @@ export default class Tab { hide = true; } - hide && this.toggle(false); + this.toggle(!hide) } toggle(show) { From b8539028909f7786f6be21ab6c8a1dc861496afa Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Fri, 18 Feb 2022 13:03:31 +0530 Subject: [PATCH 139/143] chore: add missing semicolon --- cypress/integration/depends_on.js | 2 +- frappe/public/js/frappe/form/tab.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cypress/integration/depends_on.js b/cypress/integration/depends_on.js index c0dbbf63f6..12f54f2b6e 100644 --- a/cypress/integration/depends_on.js +++ b/cypress/integration/depends_on.js @@ -79,7 +79,7 @@ context('Depends On', () => { cy.fill_field('test_field', 'Show Tab'); cy.get('body').click(); cy.findByRole("tab", {name: "Dependent Tab"}).should('be.visible'); - }) + }); it('should set the field as mandatory depending on other fields value', () => { cy.new_form('Test Depends On'); cy.fill_field('test_field', 'Some Value'); diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index 7df4d3a0cc..0e740ce49c 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -40,7 +40,7 @@ export default class Tab { hide = true; } - this.toggle(!hide) + this.toggle(!hide); } toggle(show) { From 2d5c9651df262ccbf2c21956970ac18c1902aab8 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Fri, 18 Feb 2022 18:10:10 +0530 Subject: [PATCH 140/143] fix: share clickable URLs from List View --- frappe/public/js/frappe/list/list_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/list/list_view.js b/frappe/public/js/frappe/list/list_view.js index 64960e0b09..5cfc7c75d4 100644 --- a/frappe/public/js/frappe/list/list_view.js +++ b/frappe/public/js/frappe/list/list_view.js @@ -1483,7 +1483,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList { return [ filter[1], "=", - JSON.stringify([filter[2], filter[3]]), + encodeURIComponent(JSON.stringify([filter[2], filter[3]])), ].join(""); }) .join("&"); From d5ce2b4a8c10af3bad7c74ec2043fb882f6ecd4f Mon Sep 17 00:00:00 2001 From: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com> Date: Sat, 19 Feb 2022 21:22:35 +0530 Subject: [PATCH 141/143] fix: Totalling for tree view reports (#15950) --- frappe/core/doctype/report/test_report.py | 54 ++++++++++++++++++- frappe/desk/query_report.py | 24 ++++++--- .../js/frappe/views/reports/query_report.js | 5 +- 3 files changed, 73 insertions(+), 10 deletions(-) diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py index 5a22304f32..bf63afa5c5 100644 --- a/frappe/core/doctype/report/test_report.py +++ b/frappe/core/doctype/report/test_report.py @@ -3,7 +3,7 @@ import frappe, json, os import unittest -from frappe.desk.query_report import run, save_report +from frappe.desk.query_report import run, save_report, add_total_row from frappe.desk.reportview import delete_report, save_report as _save_report from frappe.custom.doctype.customize_form.customize_form import reset_customization from frappe.core.doctype.user_permission.test_user_permission import create_user @@ -282,3 +282,55 @@ result = [ # Set user back to administrator frappe.set_user('Administrator') + + def test_add_total_row_for_tree_reports(self): + report_settings = { + 'tree': True, + 'parent_field': 'parent_value' + } + + columns = [ + { + "fieldname": "parent_column", + "label": "Parent Column", + "fieldtype": "Data", + "width": 10 + }, + { + "fieldname": "column_1", + "label": "Column 1", + "fieldtype": "Float", + "width": 10 + }, + { + "fieldname": "column_2", + "label": "Column 2", + "fieldtype": "Float", + "width": 10 + } + ] + + result = [ + { + "parent_column": "Parent 1", + "column_1": 200, + "column_2": 150.50 + }, + { + "parent_column": "Child 1", + "column_1": 100, + "column_2": 75.25, + "parent_value": "Parent 1" + }, + { + "parent_column": "Child 2", + "column_1": 100, + "column_2": 75.25, + "parent_value": "Parent 1" + } + ] + + result = add_total_row(result, columns, meta=None, report_settings=report_settings) + self.assertEqual(result[-1][0], "Total") + self.assertEqual(result[-1][1], 200) + self.assertEqual(result[-1][2], 150.50) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 97bceeb725..9ed956e986 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -73,7 +73,7 @@ def get_report_result(report, filters): return res @frappe.read_only() -def generate_report_result(report, filters=None, user=None, custom_columns=None): +def generate_report_result(report, filters=None, user=None, custom_columns=None, report_settings=None): user = user or frappe.session.user filters = filters or [] @@ -108,7 +108,7 @@ def generate_report_result(report, filters=None, user=None, custom_columns=None) result = get_filtered_data(report.ref_doctype, columns, result, user) if cint(report.add_total_row) and result and not skip_total_row: - result = add_total_row(result, columns) + result = add_total_row(result, columns, report_settings=report_settings) return { "result": result, @@ -210,7 +210,7 @@ def get_script(report_name): @frappe.whitelist() @frappe.read_only() -def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None): +def run(report_name, filters=None, user=None, ignore_prepared_report=False, custom_columns=None, report_settings=None): report = get_report_doc(report_name) if not user: user = frappe.session.user @@ -238,7 +238,7 @@ def run(report_name, filters=None, user=None, ignore_prepared_report=False, cust dn = "" result = get_prepared_report_result(report, filters, dn, user) else: - result = generate_report_result(report, filters, user, custom_columns) + result = generate_report_result(report, filters, user, custom_columns, report_settings) result["add_total_row"] = report.add_total_row and not result.get( "skip_total_row", False @@ -435,9 +435,19 @@ def build_xlsx_data(columns, data, visible_idx, include_indentation, ignore_visi return result, column_widths -def add_total_row(result, columns, meta=None): +def add_total_row(result, columns, meta=None, report_settings=None): total_row = [""] * len(columns) has_percent = [] + is_tree = False + parent_field = '' + + if report_settings: + if isinstance(report_settings, (str,)): + report_settings = json.loads(report_settings) + + is_tree = report_settings.get('tree') + parent_field = report_settings.get('parent_field') + for i, col in enumerate(columns): fieldtype, options, fieldname = None, None, None if isinstance(col, str): @@ -464,12 +474,12 @@ def add_total_row(result, columns, meta=None): for row in result: if i >= len(row): continue - cell = row.get(fieldname) if isinstance(row, dict) else row[i] if fieldtype in ["Currency", "Int", "Float", "Percent", "Duration"] and flt( cell ): - total_row[i] = flt(total_row[i]) + flt(cell) + if not (is_tree and row.get(parent_field)): + total_row[i] = flt(total_row[i]) + flt(cell) if fieldtype == "Percent" and i not in has_percent: has_percent.append(i) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 7ba0a0228f..c226a3a458 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -578,6 +578,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { args: { report_name: this.report_name, filters: filters, + report_settings: this.report_settings }, callback: resolve, always: () => this.page.btn_secondary.prop('disabled', false) @@ -834,7 +835,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { let data = this.data; let columns = this.columns.filter((col) => !col.hidden); - if (this.raw_data.add_total_row) { + if (this.raw_data.add_total_row && !this.report_settings.tree) { data = data.slice(); data.splice(-1, 1); } @@ -854,7 +855,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { treeView: this.tree_report, layout: 'fixed', cellHeight: 33, - showTotalRow: this.raw_data.add_total_row, + showTotalRow: this.raw_data.add_total_row && !this.report_settings.tree, direction: frappe.utils.is_rtl() ? 'rtl' : 'ltr', hooks: { columnTotal: frappe.utils.report_column_total From 5de89df5b77d6b02f7662ac21006aa3301192f08 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 09:32:44 +0530 Subject: [PATCH 142/143] ci: Only upload server-side coverage report if .py files are changed --- .github/helper/roulette.py | 13 +++++++++---- .github/workflows/ui-tests.yml | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index 9831df7f30..f0caa74e96 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -52,7 +52,8 @@ if __name__ == "__main__": ci_files_changed = any(f for f in files_list if is_ci(f)) only_docs_changed = len(list(filter(is_docs, files_list))) == len(files_list) only_frontend_code_changed = len(list(filter(is_frontend_code, files_list))) == len(files_list) - only_py_changed = len(list(filter(is_py, files_list))) == len(files_list) + updated_py_file_count = len(list(filter(is_py, files_list))) + only_py_changed = updated_py_file_count == len(files_list) if ci_files_changed: print("CI related files were updated, running all build processes.") @@ -65,8 +66,12 @@ if __name__ == "__main__": print("Only Frontend code was updated; Stopping Python build process.") sys.exit(0) - elif only_py_changed and build_type == "ui": - print("Only Python code was updated, stopping Cypress build process.") - sys.exit(0) + elif build_type == "ui": + if only_py_changed: + print("Only Python code was updated, stopping Cypress build process.") + sys.exit(0) + elif updated_py_file_count > 0: + # both frontend and backend code were updated + os.system('echo "::set-output name=build-server::strawberry"') os.system('echo "::set-output name=build::strawberry"') diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index 91369dcaaa..fc8093444e 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -142,6 +142,7 @@ jobs: CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb - name: Stop server + if: ${{ steps.check-build.outputs.build-server == 'strawberry' }} run: | ps -ef | grep "frappe serve" | awk '{print $2}' | xargs kill -s SIGINT 2> /dev/null || true sleep 5 @@ -163,7 +164,7 @@ jobs: flags: ui-tests - name: Upload Server Coverage Data - if: ${{ steps.check-build.outputs.build == 'strawberry' }} + if: ${{ steps.check-build.outputs.build-server == 'strawberry' }} uses: codecov/codecov-action@v2 with: name: MariaDB From 21fcd00416fac36cbbbf0f1187f62ba4451ed369 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 21 Feb 2022 11:07:37 +0530 Subject: [PATCH 143/143] ci: While running all builds set build-server as well --- .github/helper/roulette.py | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/helper/roulette.py b/.github/helper/roulette.py index f0caa74e96..90f4608a22 100644 --- a/.github/helper/roulette.py +++ b/.github/helper/roulette.py @@ -41,6 +41,7 @@ if __name__ == "__main__": # this is a push build, run all builds if not pr_number: os.system('echo "::set-output name=build::strawberry"') + os.system('echo "::set-output name=build-server::strawberry"') sys.exit(0) files_list = files_list or get_files_list(pr_number=pr_number, repo=repo)