\
diff --git a/frappe/desk/page/user_profile/user_profile.js b/frappe/desk/page/user_profile/user_profile.js
index 3443a33942..5890975e69 100644
--- a/frappe/desk/page/user_profile/user_profile.js
+++ b/frappe/desk/page/user_profile/user_profile.js
@@ -1,6 +1,6 @@
frappe.pages['user-profile'].on_page_load = function (wrapper) {
- frappe.require('assets/js/user_profile_controller.min.js', () => {
+ frappe.require('user_profile_controller.bundle.js', () => {
let user_profile = new frappe.ui.UserProfile(wrapper);
user_profile.show();
});
-};
\ No newline at end of file
+};
diff --git a/frappe/email/doctype/auto_email_report/auto_email_report.py b/frappe/email/doctype/auto_email_report/auto_email_report.py
index 6f1cd8eebd..91ca518e67 100644
--- a/frappe/email/doctype/auto_email_report/auto_email_report.py
+++ b/frappe/email/doctype/auto_email_report/auto_email_report.py
@@ -245,6 +245,7 @@ def send_monthly():
def make_links(columns, data):
for row in data:
+ doc_name = row.get('name')
for col in columns:
if col.fieldtype == "Link" and col.options != "Currency":
if col.options and row.get(col.fieldname):
@@ -253,8 +254,9 @@ def make_links(columns, data):
if col.options and row.get(col.fieldname) and row.get(col.options):
row[col.fieldname] = get_link_to_form(row[col.options], row[col.fieldname])
elif col.fieldtype == "Currency" and row.get(col.fieldname):
- row[col.fieldname] = frappe.format_value(row[col.fieldname], col)
-
+ doc = frappe.get_doc(col.parent, doc_name) if doc_name else None
+ # Pass the Document to get the currency based on docfield option
+ row[col.fieldname] = frappe.format_value(row[col.fieldname], col, doc=doc)
return columns, data
def update_field_types(columns):
@@ -262,4 +264,4 @@ def update_field_types(columns):
if col.fieldtype in ("Link", "Dynamic Link", "Currency") and col.options != "Currency":
col.fieldtype = "Data"
col.options = ""
- return columns
\ No newline at end of file
+ return columns
diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py
index 36b662bb39..6ee106bb12 100755
--- a/frappe/email/doctype/email_account/email_account.py
+++ b/frappe/email/doctype/email_account/email_account.py
@@ -19,7 +19,7 @@ from frappe.utils import (validate_email_address, cint, cstr, get_datetime,
from frappe.utils.user import is_system_user
from frappe.utils.jinja import render_template
from frappe.email.smtp import SMTPServer
-from frappe.email.receive import EmailServer, Email
+from frappe.email.receive import EmailServer, InboundMail, SentEmailInInboxError
from poplib import error_proto
from dateutil.relativedelta import relativedelta
from datetime import datetime, timedelta
@@ -430,89 +430,76 @@ class EmailAccount(Document):
def receive(self, test_mails=None):
"""Called by scheduler to receive emails from this EMail account using POP3/IMAP."""
- def get_seen(status):
- if not status:
- return None
- seen = 1 if status == "SEEN" else 0
- return seen
-
- if self.enable_incoming:
- uid_list = []
- exceptions = []
- seen_status = []
- uid_reindexed = False
- email_server = None
-
- if frappe.local.flags.in_test:
- incoming_mails = test_mails or []
- else:
- email_sync_rule = self.build_email_sync_rule()
-
- try:
- email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
- except Exception:
- frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name))
-
- if not email_server:
- return
-
- emails = email_server.get_messages()
- if not emails:
- return
-
- incoming_mails = emails.get("latest_messages", [])
- uid_list = emails.get("uid_list", [])
- seen_status = emails.get("seen_status", [])
- uid_reindexed = emails.get("uid_reindexed", False)
-
- for idx, msg in enumerate(incoming_mails):
- uid = None if not uid_list else uid_list[idx]
- self.flags.notify = True
-
- try:
- args = {
- "uid": uid,
- "seen": None if not seen_status else get_seen(seen_status.get(uid, None)),
- "uid_reindexed": uid_reindexed
- }
- communication = self.insert_communication(msg, args=args)
-
- except SentEmailInInbox:
- frappe.db.rollback()
-
- except Exception:
- frappe.db.rollback()
- frappe.log_error('email_account.receive')
- if self.use_imap:
- self.handle_bad_emails(email_server, uid, msg, frappe.get_traceback())
- exceptions.append(frappe.get_traceback())
+ exceptions = []
+ inbound_mails = self.get_inbound_mails(test_mails=test_mails)
+ for mail in inbound_mails:
+ try:
+ communication = mail.process()
+ frappe.db.commit()
+ # If email already exists in the system
+ # then do not send notifications for the same email.
+ if communication and mail.flags.is_new_communication:
+ # notify all participants of this thread
+ if self.enable_auto_reply:
+ self.send_auto_reply(communication, mail)
+
+ attachments = []
+ if hasattr(communication, '_attachments'):
+ attachments = [d.file_name for d in communication._attachments]
+ communication.notify(attachments=attachments, fetched_from_email_account=True)
+ except SentEmailInInboxError:
+ frappe.db.rollback()
+ except Exception:
+ frappe.db.rollback()
+ frappe.log_error('email_account.receive')
+ if self.use_imap:
+ self.handle_bad_emails(mail.uid, mail.raw_message, frappe.get_traceback())
+ exceptions.append(frappe.get_traceback())
+
+ #notify if user is linked to account
+ if len(inbound_mails)>0 and not frappe.local.flags.in_test:
+ frappe.publish_realtime('new_email',
+ {"account":self.email_account_name, "number":len(inbound_mails)}
+ )
- else:
- frappe.db.commit()
- if communication and self.flags.notify:
+ if exceptions:
+ raise Exception(frappe.as_json(exceptions))
- # If email already exists in the system
- # then do not send notifications for the same email.
+ def get_inbound_mails(self, test_mails=None):
+ """retrive and return inbound mails.
- attachments = []
+ """
+ if frappe.local.flags.in_test:
+ return [InboundMail(msg, self) for msg in test_mails or []]
- if hasattr(communication, '_attachments'):
- attachments = [d.file_name for d in communication._attachments]
+ if not self.enable_incoming:
+ return []
- communication.notify(attachments=attachments, fetched_from_email_account=True)
+ email_sync_rule = self.build_email_sync_rule()
+ try:
+ email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
+ messages = email_server.get_messages() or {}
+ except Exception:
+ raise
+ frappe.log_error(title=_("Error while connecting to email account {0}").format(self.name))
+ return []
- #notify if user is linked to account
- if len(incoming_mails)>0 and not frappe.local.flags.in_test:
- frappe.publish_realtime('new_email', {"account":self.email_account_name, "number":len(incoming_mails)})
+ mails = []
+ for index, message in enumerate(messages.get("latest_messages", [])):
+ uid = messages['uid_list'][index]
+ seen_status = 1 if messages['seen_status'][uid]=='SEEN' else 0
+ mails.append(InboundMail(message, self, uid, seen_status))
- if exceptions:
- raise Exception(frappe.as_json(exceptions))
+ return mails
- def handle_bad_emails(self, email_server, uid, raw, reason):
- if email_server and cint(email_server.settings.use_imap):
+ def handle_bad_emails(self, uid, raw, reason):
+ if cint(self.use_imap):
import email
try:
- mail = email.message_from_string(raw)
+ if isinstance(raw, bytes):
+ mail = email.message_from_bytes(raw)
+ else:
+ mail = email.message_from_string(raw)
message_id = mail.get('Message-ID')
except Exception:
@@ -524,275 +511,18 @@ class EmailAccount(Document):
"reason":reason,
"message_id": message_id,
"doctype": "Unhandled Email",
- "email_account": email_server.settings.email_account
+ "email_account": self.name
})
unhandled_email.insert(ignore_permissions=True)
frappe.db.commit()
- def insert_communication(self, msg, args=None):
- if isinstance(msg, list):
- raw, uid, seen = msg
- else:
- raw = msg
- uid = -1
- seen = 0
- if isinstance(args, dict):
- if args.get("uid", -1): uid = args.get("uid", -1)
- if args.get("seen", 0): seen = args.get("seen", 0)
-
- email = Email(raw)
-
- if email.from_email == self.email_id and not email.mail.get("Reply-To"):
- # gmail shows sent emails in inbox
- # and we don't want emails sent by us to be pulled back into the system again
- # dont count emails sent by the system get those
- if frappe.flags.in_test:
- print('WARN: Cannot pull email. Sender sames as recipient inbox')
- raise SentEmailInInbox
-
- if email.message_id:
- # https://stackoverflow.com/a/18367248
- names = frappe.db.sql("""SELECT DISTINCT `name`, `creation` FROM `tabCommunication`
- WHERE `message_id`='{message_id}'
- ORDER BY `creation` DESC LIMIT 1""".format(
- message_id=email.message_id
- ), as_dict=True)
-
- if names:
- name = names[0].get("name")
- # email is already available update communication uid instead
- frappe.db.set_value("Communication", name, "uid", uid, update_modified=False)
-
- self.flags.notify = False
-
- return frappe.get_doc("Communication", name)
-
- if email.content_type == 'text/html':
- email.content = clean_email_html(email.content)
-
- communication = frappe.get_doc({
- "doctype": "Communication",
- "subject": email.subject,
- "content": email.content,
- 'text_content': email.text_content,
- "sent_or_received": "Received",
- "sender_full_name": email.from_real_name,
- "sender": email.from_email,
- "recipients": email.mail.get("To"),
- "cc": email.mail.get("CC"),
- "email_account": self.name,
- "communication_medium": "Email",
- "uid": int(uid or -1),
- "message_id": email.message_id,
- "communication_date": email.date,
- "has_attachment": 1 if email.attachments else 0,
- "seen": seen or 0
- })
-
- self.set_thread(communication, email)
- if communication.seen:
- # get email account user and set communication as seen
- users = frappe.get_all("User Email", filters={ "email_account": self.name },
- fields=["parent"])
- users = list(set([ user.get("parent") for user in users ]))
- communication._seen = json.dumps(users)
-
- communication.flags.in_receive = True
- communication.insert(ignore_permissions=True)
-
- # save attachments
- communication._attachments = email.save_attachments_in_doc(communication)
-
- # replace inline images
- dirty = False
- for file in communication._attachments:
- if file.name in email.cid_map and email.cid_map[file.name]:
- dirty = True
-
- email.content = email.content.replace("cid:{0}".format(email.cid_map[file.name]),
- file.file_url)
-
- if dirty:
- # not sure if using save() will trigger anything
- communication.db_set("content", sanitize_html(email.content))
-
- # notify all participants of this thread
- if self.enable_auto_reply and getattr(communication, "is_first", False):
- self.send_auto_reply(communication, email)
-
- return communication
-
- def set_thread(self, communication, email):
- """Appends communication to parent based on thread ID. Will extract
- parent communication and will link the communication to the reference of that
- communication. Also set the status of parent transaction to Open or Replied.
-
- If no thread id is found and `append_to` is set for the email account,
- it will create a new parent transaction (e.g. Issue)"""
- parent = None
-
- parent = self.find_parent_from_in_reply_to(communication, email)
-
- if not parent and self.append_to:
- self.set_sender_field_and_subject_field()
-
- if not parent and self.append_to:
- parent = self.find_parent_based_on_subject_and_sender(communication, email)
-
- if not parent and self.append_to and self.append_to!="Communication":
- parent = self.create_new_parent(communication, email)
-
- if parent:
- communication.reference_doctype = parent.doctype
- communication.reference_name = parent.name
-
- # check if message is notification and disable notifications for this message
- isnotification = email.mail.get("isnotification")
- if isnotification:
- if "notification" in isnotification:
- communication.unread_notification_sent = 1
-
- def set_sender_field_and_subject_field(self):
- '''Identify the sender and subject fields from the `append_to` DocType'''
- # set subject_field and sender_field
- meta = frappe.get_meta(self.append_to)
- self.subject_field = None
- self.sender_field = None
-
- if hasattr(meta, "subject_field"):
- self.subject_field = meta.subject_field
-
- if hasattr(meta, "sender_field"):
- self.sender_field = meta.sender_field
-
- def find_parent_based_on_subject_and_sender(self, communication, email):
- '''Find parent document based on subject and sender match'''
- parent = None
-
- if self.append_to and self.sender_field:
- if self.subject_field:
- if '#' in email.subject:
- # try and match if ID is found
- # document ID is appended to subject
- # example "Re: Your email (#OPP-2020-2334343)"
- parent_id = email.subject.rsplit('#', 1)[-1].strip(' ()')
- if parent_id:
- parent = frappe.db.get_all(self.append_to, filters = dict(name = parent_id),
- fields = 'name')
-
- if not parent:
- # try and match by subject and sender
- # if sent by same sender with same subject,
- # append it to old coversation
- subject = frappe.as_unicode(strip(re.sub(r"(^\s*(fw|fwd|wg)[^:]*:|\s*(re|aw)[^:]*:\s*)*",
- "", email.subject, 0, flags=re.IGNORECASE)))
-
- parent = frappe.db.get_all(self.append_to, filters={
- self.sender_field: email.from_email,
- self.subject_field: ("like", "%{0}%".format(subject)),
- "creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
- }, fields = "name", limit = 1)
-
- if not parent and len(subject) > 10 and is_system_user(email.from_email):
- # match only subject field
- # when the from_email is of a user in the system
- # and subject is atleast 10 chars long
- parent = frappe.db.get_all(self.append_to, filters={
- self.subject_field: ("like", "%{0}%".format(subject)),
- "creation": (">", (get_datetime() - relativedelta(days=60)).strftime(DATE_FORMAT))
- }, fields = "name", limit = 1)
-
-
-
- if parent:
- parent = frappe._dict(doctype=self.append_to, name=parent[0].name)
- return parent
-
- def create_new_parent(self, communication, email):
- '''If no parent found, create a new reference document'''
-
- # no parent found, but must be tagged
- # insert parent type doc
- parent = frappe.new_doc(self.append_to)
-
- if self.subject_field:
- parent.set(self.subject_field, frappe.as_unicode(email.subject)[:140])
-
- if self.sender_field:
- parent.set(self.sender_field, frappe.as_unicode(email.from_email))
-
- if parent.meta.has_field("email_account"):
- parent.email_account = self.name
-
- parent.flags.ignore_mandatory = True
-
- try:
- parent.insert(ignore_permissions=True)
- except frappe.DuplicateEntryError:
- # try and find matching parent
- parent_name = frappe.db.get_value(self.append_to, {self.sender_field: email.from_email})
- if parent_name:
- parent.name = parent_name
- else:
- parent = None
-
- # NOTE if parent isn't found and there's no subject match, it is likely that it is a new conversation thread and hence is_first = True
- communication.is_first = True
-
- return parent
-
- def find_parent_from_in_reply_to(self, communication, email):
- '''Returns parent reference if embedded in In-Reply-To header
-
- Message-ID is formatted as `{message_id}@{site}`'''
- parent = None
- in_reply_to = (email.mail.get("In-Reply-To") or "").strip(" <>")
-
- if in_reply_to:
- if "@{0}".format(frappe.local.site) in in_reply_to:
- # reply to a communication sent from the system
- email_queue = frappe.db.get_value('Email Queue', dict(message_id=in_reply_to), ['communication','reference_doctype', 'reference_name'])
- if email_queue:
- parent_communication, parent_doctype, parent_name = email_queue
- if parent_communication:
- communication.in_reply_to = parent_communication
- else:
- reference, domain = in_reply_to.split("@", 1)
- parent_doctype, parent_name = 'Communication', reference
-
- if frappe.db.exists(parent_doctype, parent_name):
- parent = frappe._dict(doctype=parent_doctype, name=parent_name)
-
- # set in_reply_to of current communication
- if parent_doctype=='Communication':
- # communication.in_reply_to = email_queue.communication
-
- if parent.reference_name:
- # the true parent is the communication parent
- parent = frappe.get_doc(parent.reference_doctype,
- parent.reference_name)
- else:
- comm = frappe.db.get_value('Communication',
- dict(
- message_id=in_reply_to,
- creation=['>=', add_days(get_datetime(), -30)]),
- ['reference_doctype', 'reference_name'], as_dict=1)
- if comm:
- parent = frappe._dict(doctype=comm.reference_doctype, name=comm.reference_name)
-
- return parent
-
def send_auto_reply(self, communication, email):
"""Send auto reply if set."""
from frappe.core.doctype.communication.email import set_incoming_outgoing_accounts
-
if self.enable_auto_reply:
set_incoming_outgoing_accounts(communication)
- if self.send_unsubscribe_message:
- unsubscribe_message = _("Leave this conversation")
- else:
- unsubscribe_message = ""
+ unsubscribe_message = (self.send_unsubscribe_message and _("Leave this conversation")) or ""
frappe.sendmail(recipients = [email.from_email],
sender = self.email_id,
diff --git a/frappe/email/doctype/email_account/test_email_account.py b/frappe/email/doctype/email_account/test_email_account.py
index f87ee32bb1..35cacac45a 100644
--- a/frappe/email/doctype/email_account/test_email_account.py
+++ b/frappe/email/doctype/email_account/test_email_account.py
@@ -1,45 +1,56 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
-from __future__ import unicode_literals
-import frappe, os
-import unittest, email
+import os
+import email
+import unittest
+from datetime import datetime, timedelta
+from frappe.email.receive import InboundMail, SentEmailInInboxError, Email
+from frappe.email.email_body import get_message_id
+import frappe
from frappe.test_runner import make_test_records
+from frappe.core.doctype.communication.email import make
+from frappe.desk.form.load import get_attachments
+from frappe.email.doctype.email_account.email_account import notify_unreplied
make_test_records("User")
make_test_records("Email Account")
-from frappe.core.doctype.communication.email import make
-from frappe.desk.form.load import get_attachments
-from frappe.email.doctype.email_account.email_account import notify_unreplied
-from datetime import datetime, timedelta
-class TestEmailAccount(unittest.TestCase):
- def setUp(self):
- frappe.flags.mute_emails = False
- frappe.flags.sent_mail = None
+class TestEmailAccount(unittest.TestCase):
+ @classmethod
+ def setUpClass(cls):
email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
email_account.db_set("enable_incoming", 1)
- frappe.db.sql('delete from `tabEmail Queue`')
+ email_account.db_set("enable_auto_reply", 1)
- def tearDown(self):
+ @classmethod
+ def tearDownClass(cls):
email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
email_account.db_set("enable_incoming", 0)
+ def setUp(self):
+ frappe.flags.mute_emails = False
+ frappe.flags.sent_mail = None
+ frappe.db.sql('delete from `tabEmail Queue`')
+ frappe.db.sql('delete from `tabUnhandled Email`')
+
+ def get_test_mail(self, fname):
+ with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f:
+ return f.read()
+
def test_incoming(self):
cleanup("test_sender@example.com")
- with open(os.path.join(os.path.dirname(__file__), "test_mails", "incoming-1.raw"), "r") as f:
- test_mails = [f.read()]
+ test_mails = [self.get_test_mail('incoming-1.raw')]
email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
email_account.receive(test_mails=test_mails)
comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"})
self.assertTrue("test_receiver@example.com" in comm.recipients)
-
# check if todo is created
self.assertTrue(frappe.db.get_value(comm.reference_doctype, comm.reference_name, "name"))
@@ -88,7 +99,7 @@ class TestEmailAccount(unittest.TestCase):
email_account.receive(test_mails=test_mails)
comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"})
- self.assertTrue("From: \"Microsoft Outlook\" <test_sender@example.com>" in comm.content)
+ self.assertTrue("From: "Microsoft Outlook" <test_sender@example.com>" in comm.content)
self.assertTrue("This is an e-mail message sent automatically by Microsoft Outlook while" in comm.content)
def test_incoming_attached_email_from_outlook_layers(self):
@@ -101,7 +112,7 @@ class TestEmailAccount(unittest.TestCase):
email_account.receive(test_mails=test_mails)
comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"})
- self.assertTrue("From: \"Microsoft Outlook\" <test_sender@example.com>" in comm.content)
+ self.assertTrue("From: "Microsoft Outlook" <test_sender@example.com>" in comm.content)
self.assertTrue("This is an e-mail message sent automatically by Microsoft Outlook while" in comm.content)
def test_outgoing(self):
@@ -166,7 +177,6 @@ class TestEmailAccount(unittest.TestCase):
comm_list = frappe.get_all("Communication", filters={"sender":"test_sender@example.com"},
fields=["name", "reference_doctype", "reference_name"])
-
# both communications attached to the same reference
self.assertEqual(comm_list[0].reference_doctype, comm_list[1].reference_doctype)
self.assertEqual(comm_list[0].reference_name, comm_list[1].reference_name)
@@ -199,6 +209,215 @@ class TestEmailAccount(unittest.TestCase):
self.assertEqual(comm_list[0].reference_doctype, event.doctype)
self.assertEqual(comm_list[0].reference_name, event.name)
+ def test_auto_reply(self):
+ cleanup("test_sender@example.com")
+
+ test_mails = [self.get_test_mail('incoming-1.raw')]
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ email_account.receive(test_mails=test_mails)
+
+ comm = frappe.get_doc("Communication", {"sender": "test_sender@example.com"})
+ self.assertTrue(frappe.db.get_value("Email Queue", {"reference_doctype": comm.reference_doctype,
+ "reference_name": comm.reference_name}))
+
+ def test_handle_bad_emails(self):
+ mail_content = self.get_test_mail(fname="incoming-1.raw")
+ message_id = Email(mail_content).mail.get('Message-ID')
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ email_account.handle_bad_emails(uid=-1, raw=mail_content, reason="Testing")
+ self.assertTrue(frappe.db.get_value("Unhandled Email", {'message_id': message_id}))
+
+class TestInboundMail(unittest.TestCase):
+ @classmethod
+ def setUpClass(cls):
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ email_account.db_set("enable_incoming", 1)
+
+ @classmethod
+ def tearDownClass(cls):
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ email_account.db_set("enable_incoming", 0)
+
+ def setUp(self):
+ cleanup()
+ frappe.db.sql('delete from `tabEmail Queue`')
+ frappe.db.sql('delete from `tabToDo`')
+
+ def get_test_mail(self, fname):
+ with open(os.path.join(os.path.dirname(__file__), "test_mails", fname), "r") as f:
+ return f.read()
+
+ def new_doc(self, doctype, **data):
+ doc = frappe.new_doc(doctype)
+ for field, value in data.items():
+ setattr(doc, field, value)
+ doc.insert()
+ return doc
+
+ def new_communication(self, **kwargs):
+ defaults = {
+ 'subject': "Test Subject"
+ }
+ d = {**defaults, **kwargs}
+ return self.new_doc('Communication', **d)
+
+ def new_email_queue(self, **kwargs):
+ defaults = {
+ 'message_id': get_message_id().strip(" <>")
+ }
+ d = {**defaults, **kwargs}
+ return self.new_doc('Email Queue', **d)
+
+ def new_todo(self, **kwargs):
+ defaults = {
+ 'description': "Description"
+ }
+ d = {**defaults, **kwargs}
+ return self.new_doc('ToDo', **d)
+
+ def test_self_sent_mail(self):
+ """Check that we raise SentEmailInInboxError if the inbound mail is self sent mail.
+ """
+ mail_content = self.get_test_mail(fname="incoming-self-sent.raw")
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 1, 1)
+ with self.assertRaises(SentEmailInInboxError):
+ inbound_mail.process()
+
+ def test_mail_exist_validation(self):
+ """Do not create communication record if the mail is already downloaded into the system.
+ """
+ mail_content = self.get_test_mail(fname="incoming-1.raw")
+ message_id = Email(mail_content).message_id
+ # Create new communication record in DB
+ communication = self.new_communication(message_id=message_id)
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ new_communiction = inbound_mail.process()
+
+ # Make sure that uid is changed to new uid
+ self.assertEqual(new_communiction.uid, 12345)
+ self.assertEqual(communication.name, new_communiction.name)
+
+ def test_find_parent_email_queue(self):
+ """If the mail is reply to the already sent mail, there will be a email queue record.
+ """
+ # Create email queue record
+ queue_record = self.new_email_queue()
+
+ mail_content = self.get_test_mail(fname="reply-4.raw").replace(
+ "{{ message_id }}", queue_record.message_id
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ parent_queue = inbound_mail.parent_email_queue()
+ self.assertEqual(queue_record.name, parent_queue.name)
+
+ def test_find_parent_communication_through_queue(self):
+ """Find parent communication of an inbound mail.
+ Cases where parent communication does exist:
+ 1. No parent communication is the mail is not a reply.
+
+ Cases where parent communication does not exist:
+ 2. If mail is not a reply to system sent mail, then there can exist co
+ """
+ # Create email queue record
+ communication = self.new_communication()
+ queue_record = self.new_email_queue(communication=communication.name)
+ mail_content = self.get_test_mail(fname="reply-4.raw").replace(
+ "{{ message_id }}", queue_record.message_id
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ parent_communication = inbound_mail.parent_communication()
+ self.assertEqual(parent_communication.name, communication.name)
+
+ def test_find_parent_communication_for_self_reply(self):
+ """If the inbound email is a reply but not reply to system sent mail.
+
+ Ex: User replied to his/her mail.
+ """
+ message_id = "new-message-id"
+ mail_content = self.get_test_mail(fname="reply-4.raw").replace(
+ "{{ message_id }}", message_id
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ parent_communication = inbound_mail.parent_communication()
+ self.assertFalse(parent_communication)
+
+ communication = self.new_communication(message_id=message_id)
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ parent_communication = inbound_mail.parent_communication()
+ self.assertEqual(parent_communication.name, communication.name)
+
+ def test_find_parent_communication_from_header(self):
+ """Incase of header contains parent communication name
+ """
+ communication = self.new_communication()
+ mail_content = self.get_test_mail(fname="reply-4.raw").replace(
+ "{{ message_id }}", f"<{communication.name}@{frappe.local.site}>"
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ parent_communication = inbound_mail.parent_communication()
+ self.assertEqual(parent_communication.name, communication.name)
+
+ def test_reference_document(self):
+ # Create email queue record
+ todo = self.new_todo()
+ # communication = self.new_communication(reference_doctype='ToDo', reference_name=todo.name)
+ queue_record = self.new_email_queue(reference_doctype='ToDo', reference_name=todo.name)
+ mail_content = self.get_test_mail(fname="reply-4.raw").replace(
+ "{{ message_id }}", queue_record.message_id
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ reference_doc = inbound_mail.reference_document()
+ self.assertEqual(todo.name, reference_doc.name)
+
+ def test_reference_document_by_record_name_in_subject(self):
+ # Create email queue record
+ todo = self.new_todo()
+
+ mail_content = self.get_test_mail(fname="incoming-subject-placeholder.raw").replace(
+ "{{ subject }}", f"RE: (#{todo.name})"
+ )
+
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ reference_doc = inbound_mail.reference_document()
+ self.assertEqual(todo.name, reference_doc.name)
+
+ def test_reference_document_by_subject_match(self):
+ subject = "New todo"
+ todo = self.new_todo(sender='test_sender@example.com', description=subject)
+
+ mail_content = self.get_test_mail(fname="incoming-subject-placeholder.raw").replace(
+ "{{ subject }}", f"RE: {subject}"
+ )
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ reference_doc = inbound_mail.reference_document()
+ self.assertEqual(todo.name, reference_doc.name)
+
+ def test_create_communication_from_mail(self):
+ # Create email queue record
+ mail_content = self.get_test_mail(fname="incoming-2.raw")
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ inbound_mail = InboundMail(mail_content, email_account, 12345, 1)
+ communication = inbound_mail.process()
+ self.assertTrue(communication.is_first)
+ self.assertTrue(communication._attachments)
+
def cleanup(sender=None):
filters = {}
if sender:
@@ -207,4 +426,4 @@ def cleanup(sender=None):
names = frappe.get_list("Communication", filters=filters, fields=["name"])
for name in names:
frappe.delete_doc_if_exists("Communication", name.name)
- frappe.delete_doc_if_exists("Communication Link", {"parent": name.name})
\ No newline at end of file
+ frappe.delete_doc_if_exists("Communication Link", {"parent": name.name})
diff --git a/frappe/email/doctype/email_account/test_mails/incoming-self-sent.raw b/frappe/email/doctype/email_account/test_mails/incoming-self-sent.raw
new file mode 100644
index 0000000000..a16eecccd5
--- /dev/null
+++ b/frappe/email/doctype/email_account/test_mails/incoming-self-sent.raw
@@ -0,0 +1,91 @@
+Delivered-To: test_receiver@example.com
+Received: by 10.96.153.227 with SMTP id vj3csp416144qdb;
+ Mon, 15 Sep 2014 03:35:07 -0700 (PDT)
+X-Received: by 10.66.119.103 with SMTP id kt7mr36981968pab.95.1410777306321;
+ Mon, 15 Sep 2014 03:35:06 -0700 (PDT)
+Return-Path:
+Received: from mail-pa0-x230.google.com (mail-pa0-x230.google.com [2607:f8b0:400e:c03::230])
+ by mx.google.com with ESMTPS id dg10si22178346pdb.115.2014.09.15.03.35.06
+ for
+ (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
+ Mon, 15 Sep 2014 03:35:06 -0700 (PDT)
+Received-SPF: pass (google.com: domain of test@example.com designates 2607:f8b0:400e:c03::230 as permitted sender) client-ip=2607:f8b0:400e:c03::230;
+Authentication-Results: mx.google.com;
+ spf=pass (google.com: domain of test@example.com designates 2607:f8b0:400e:c03::230 as permitted sender) smtp.mail=test@example.com;
+ dkim=pass header.i=@gmail.com;
+ dmarc=pass (p=NONE dis=NONE) header.from=gmail.com
+Received: by mail-pa0-f48.google.com with SMTP id hz1so6118714pad.21
+ for ; Mon, 15 Sep 2014 03:35:06 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=gmail.com; s=20120113;
+ h=from:content-type:subject:message-id:date:to:mime-version;
+ bh=rwiLijtF3lfy9M6cP/7dv2Hm7NJuBwFZn1OFsN8Tlvs=;
+ b=x7U4Ny3Kz2ULRJ7a04NDBrBTVhP2ImIB9n3LVNGQDnDonPUM5Ro/wZcxPTVnBWZ2L1
+ o1bGfP+lhBrvYUlHsd5r4FYC0Uvpad6hbzLr0DGUQgPTxW4cGKbtDEAq+BR2JWd9f803
+ vdjSWdGk8w2dt2qbngTqIZkm5U2XWjICDOAYuPIseLUgCFwi9lLyOSARFB7mjAa2YL7Q
+ Nswk7mbWU1hbnHP6jaBb0m8QanTc7Up944HpNDRxIrB1ZHgKzYhXtx8nhnOx588ZGIAe
+ E6tyG8IwogR11vLkkrBhtMaOme9PohYx4F1CSTiwspmDCadEzJFGRe//lEXKmZHAYH6g
+ 90Zg==
+X-Received: by 10.70.38.135 with SMTP id g7mr22078275pdk.100.1410777305744;
+ Mon, 15 Sep 2014 03:35:05 -0700 (PDT)
+Return-Path:
+Received: from [192.168.0.100] ([27.106.4.70])
+ by mx.google.com with ESMTPSA id zr6sm11025126pbc.50.2014.09.15.03.35.02
+ for
+ (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128);
+ Mon, 15 Sep 2014 03:35:04 -0700 (PDT)
+From: Rushabh Mehta
+Content-Type: multipart/alternative; boundary="Apple-Mail=_57F71261-5C3A-43F6-918B-4438B96F61AA"
+Subject: test mail 🦄🌈😎
+Message-Id: <9143999C-8456-4399-9CF1-4A2DA9DD7711@gmail.com>
+Date: Mon, 15 Sep 2014 16:04:57 +0530
+To: Rushabh Mehta
+Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
+X-Mailer: Apple Mail (2.1878.6)
+
+
+--Apple-Mail=_57F71261-5C3A-43F6-918B-4438B96F61AA
+Content-Transfer-Encoding: 7bit
+Content-Type: text/plain;
+ charset=us-ascii
+
+test mail
+
+
+
+@rushabh_mehta
+https://erpnext.org
+
+
+--Apple-Mail=_57F71261-5C3A-43F6-918B-4438B96F61AA
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/html;
+ charset=us-ascii
+
+test =
+mail
+
=
+
+--Apple-Mail=_57F71261-5C3A-43F6-918B-4438B96F61AA--
diff --git a/frappe/email/doctype/email_account/test_mails/incoming-subject-placeholder.raw b/frappe/email/doctype/email_account/test_mails/incoming-subject-placeholder.raw
new file mode 100644
index 0000000000..35ddf06b01
--- /dev/null
+++ b/frappe/email/doctype/email_account/test_mails/incoming-subject-placeholder.raw
@@ -0,0 +1,183 @@
+Return-path:
+Envelope-to: test_receiver@example.com
+Delivery-date: Wed, 27 Jan 2016 16:24:20 +0800
+Received: from 23-59-23-10.perm.iinet.net.au ([23.59.23.10]:62191 helo=DESKTOP7C66I2M)
+ by webcloud85.au.syrahost.com with esmtp (Exim 4.86)
+ (envelope-from )
+ id 1aOLOj-002xFL-CP
+ for test_receiver@example.com; Wed, 27 Jan 2016 16:24:20 +0800
+From:
+To:
+References:
+In-Reply-To:
+Subject: RE: {{ subject }}
+Date: Wed, 27 Jan 2016 16:24:09 +0800
+Message-ID: <000001d158dc$1b8363a0$528a2ae0$@example.com>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+ boundary="----=_NextPart_000_0001_01D1591F.29A7DC20"
+X-Mailer: Microsoft Outlook 14.0
+Thread-Index: AQJZfZxrgcB9KnMqoZ+S4Qq9hcoSeZ3+vGiQ
+Content-Language: en-au
+
+This is a multipart message in MIME format.
+
+------=_NextPart_000_0001_01D1591F.29A7DC20
+Content-Type: multipart/alternative;
+ boundary="----=_NextPart_001_0002_01D1591F.29A7DC20"
+
+
+------=_NextPart_001_0002_01D1591F.29A7DC20
+Content-Type: text/plain;
+ charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+Test purely for testing with the debugger has email attached
+
+=20
+
+From: Notification [mailto:test_receiver@example.com]=20
+Sent: Wednesday, 27 January 2016 9:30 AM
+To: test_receiver@example.com
+Subject: Sales Invoice: SINV-12276
+
+=20
+
+test no 6 sent from bench to outlook to be replied to with messaging
+
+
+
+
+------=_NextPart_001_0002_01D1591F.29A7DC20
+Content-Type: text/html;
+ charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+hi thereTest purely for testing with the debugger has email =
+attached
From:=
+ =
+Notification [mailto:test_receiver@example.com]
Sent: Wednesday, 27 =
+January 2016 9:30 AM
To: =
+test_receiver@example.com
Subject: Sales Invoice: =
+SINV-12276
test no 3 sent from bench to outlook to be replied to with =
+messaging
fizz buzz
'
message = ''
- if frappe.conf.use_ssl and self.queue_doc.track_email_status:
+ if frappe.conf.use_ssl and self.email_account_doc.track_email_status:
message = quopri.encodestring(
tracker_url_html.format(frappe.local.site, self.queue_doc.communication).encode()
).decode()
diff --git a/frappe/email/doctype/newsletter/newsletter..json b/frappe/email/doctype/newsletter/newsletter..json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frappe/email/doctype/notification/test_notification.py b/frappe/email/doctype/notification/test_notification.py
index 87c4b2527a..31d5d9d1cc 100644
--- a/frappe/email/doctype/notification/test_notification.py
+++ b/frappe/email/doctype/notification/test_notification.py
@@ -7,9 +7,7 @@ import frappe, frappe.utils, frappe.utils.scheduler
from frappe.desk.form import assign_to
import unittest
-test_records = frappe.get_test_records('Notification')
-
-test_dependencies = ["User"]
+test_dependencies = ["User", "Notification"]
class TestNotification(unittest.TestCase):
def setUp(self):
diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py
index 45888119ea..9f085aa94f 100755
--- a/frappe/email/email_body.py
+++ b/frappe/email/email_body.py
@@ -292,18 +292,12 @@ def inline_style_in_html(html):
''' Convert email.css and html to inline-styled html
'''
from premailer import Premailer
+ from frappe.utils.jinja_globals import bundled_asset
- apps = frappe.get_installed_apps()
-
- # add frappe email css file
- css_files = ['assets/css/email.css']
- if 'frappe' in apps:
- apps.remove('frappe')
-
- for app in apps:
- path = 'assets/{0}/css/email.css'.format(app)
- css_files.append(path)
-
+ # get email css files from hooks
+ css_files = frappe.get_hooks('email_css')
+ css_files = [bundled_asset(path) for path in css_files]
+ css_files = [path.lstrip('/') for path in css_files]
css_files = [css_file for css_file in css_files if os.path.exists(os.path.abspath(css_file))]
p = Premailer(html=html, external_styles=css_files, strip_important=False)
@@ -359,9 +353,7 @@ def add_attachment(fname, fcontent, content_type=None,
def get_message_id():
'''Returns Message ID created from doctype and name'''
- return "<{unique}@{site}>".format(
- site=frappe.local.site,
- unique=email.utils.make_msgid(random_string(10)).split('@')[0].split('<')[1])
+ return email.utils.make_msgid(domain=frappe.local.site)
def get_signature(email_account):
if email_account and email_account.add_signature and email_account.signature:
diff --git a/frappe/email/receive.py b/frappe/email/receive.py
index 949da4a343..7b3623df21 100644
--- a/frappe/email/receive.py
+++ b/frappe/email/receive.py
@@ -8,6 +8,7 @@ import imaplib
import poplib
import re
import time
+import json
from email.header import decode_header
import _socket
@@ -20,13 +21,26 @@ from frappe import _, safe_decode, safe_encode
from frappe.core.doctype.file.file import (MaxFileSizeReachedError,
get_random_filename)
from frappe.utils import (cint, convert_utc_to_user_timezone, cstr,
- extract_email_id, markdown, now, parse_addr, strip)
+ extract_email_id, markdown, now, parse_addr, strip, get_datetime,
+ add_days, sanitize_html)
+from frappe.utils.user import is_system_user
+from frappe.utils.html_utils import clean_email_html
+
+# fix due to a python bug in poplib that limits it to 2048
+poplib._MAXLINE = 20480
+imaplib._MAXLINE = 20480
+
+# fix due to a python bug in poplib that limits it to 2048
+poplib._MAXLINE = 20480
+imaplib._MAXLINE = 20480
class EmailSizeExceededError(frappe.ValidationError): pass
class EmailTimeoutError(frappe.ValidationError): pass
class TotalSizeExceededError(frappe.ValidationError): pass
class LoginLimitExceeded(frappe.ValidationError): pass
+class SentEmailInInboxError(Exception):
+ pass
class EmailServer:
"""Wrapper for POP server to pull emails."""
@@ -100,14 +114,11 @@ class EmailServer:
def get_messages(self):
"""Returns new email messages in a list."""
- if not self.check_mails():
- return # nothing to do
+ if not (self.check_mails() or self.connect()):
+ return []
frappe.db.commit()
- if not self.connect():
- return
-
uid_list = []
try:
@@ -116,7 +127,6 @@ class EmailServer:
self.latest_messages = []
self.seen_status = {}
self.uid_reindexed = False
-
uid_list = email_list = self.get_new_mails()
if not email_list:
@@ -132,11 +142,7 @@ class EmailServer:
self.max_email_size = cint(frappe.local.conf.get("max_email_size"))
self.max_total_size = 5 * self.max_email_size
- for i, message_meta in enumerate(email_list):
- # do not pull more than NUM emails
- if (i+1) > num:
- break
-
+ for i, message_meta in enumerate(email_list[:num]):
try:
self.retrieve_message(message_meta, i+1)
except (TotalSizeExceededError, EmailTimeoutError, LoginLimitExceeded):
@@ -152,7 +158,6 @@ class EmailServer:
except Exception as e:
if self.has_login_limit_exceeded(e):
pass
-
else:
raise
@@ -284,7 +289,7 @@ class EmailServer:
flags = []
for flag in imaplib.ParseFlags(flag_string) or []:
- pattern = re.compile("\w+")
+ pattern = re.compile(r"\w+")
match = re.search(pattern, frappe.as_unicode(flag))
flags.append(match.group(0))
@@ -369,6 +374,7 @@ class Email:
else:
self.mail = email.message_from_string(content)
+ self.raw_message = content
self.text_content = ''
self.html_content = ''
self.attachments = []
@@ -391,6 +397,10 @@ class Email:
if self.date > now():
self.date = now()
+ @property
+ def in_reply_to(self):
+ return (self.mail.get("In-Reply-To") or "").strip(" <>")
+
def parse(self):
"""Walk and process multi-part email."""
for part in self.mail.walk():
@@ -555,13 +565,333 @@ class Email:
def get_thread_id(self):
"""Extract thread ID from `[]`"""
- l = re.findall('(?<=\[)[\w/-]+', self.subject)
+ l = re.findall(r'(?<=\[)[\w/-]+', self.subject)
return l and l[0] or None
+ def is_reply(self):
+ return bool(self.in_reply_to)
+
+class InboundMail(Email):
+ """Class representation of incoming mail along with mail handlers.
+ """
+ def __init__(self, content, email_account, uid=None, seen_status=None):
+ super().__init__(content)
+ self.email_account = email_account
+ self.uid = uid or -1
+ self.seen_status = seen_status or 0
+
+ # System documents related to this mail
+ self._parent_email_queue = None
+ self._parent_communication = None
+ self._reference_document = None
+
+ self.flags = frappe._dict()
+
+ def get_content(self):
+ if self.content_type == 'text/html':
+ return clean_email_html(self.content)
+
+ def process(self):
+ """Create communication record from email.
+ """
+ if self.is_sender_same_as_receiver() and not self.is_reply():
+ if frappe.flags.in_test:
+ print('WARN: Cannot pull email. Sender same as recipient inbox')
+ raise SentEmailInInboxError
+
+ communication = self.is_exist_in_system()
+ if communication:
+ communication.update_db(uid=self.uid)
+ communication.reload()
+ return communication
+
+ self.flags.is_new_communication = True
+ return self._build_communication_doc()
+
+ def _build_communication_doc(self):
+ data = self.as_dict()
+ data['doctype'] = "Communication"
+
+ if self.parent_communication():
+ data['in_reply_to'] = self.parent_communication().name
+
+ if self.reference_document():
+ data['reference_doctype'] = self.reference_document().doctype
+ data['reference_name'] = self.reference_document().name
+ elif self.email_account.append_to and self.email_account.append_to != 'Communication':
+ reference_doc = self._create_reference_document(self.email_account.append_to)
+ if reference_doc:
+ data['reference_doctype'] = reference_doc.doctype
+ data['reference_name'] = reference_doc.name
+ data['is_first'] = True
+
+ if self.is_notification():
+ # Disable notifications for notification.
+ data['unread_notification_sent'] = 1
+
+ if self.seen_status:
+ data['_seen'] = json.dumps(self.get_users_linked_to_account(self.email_account))
+
+ communication = frappe.get_doc(data)
+ communication.flags.in_receive = True
+ communication.insert(ignore_permissions=True)
+
+ # save attachments
+ communication._attachments = self.save_attachments_in_doc(communication)
+ communication.content = sanitize_html(self.replace_inline_images(communication._attachments))
+ communication.save()
+ return communication
+
+ def replace_inline_images(self, attachments):
+ # replace inline images
+ content = self.content
+ for file in attachments:
+ if file.name in self.cid_map and self.cid_map[file.name]:
+ content = content.replace("cid:{0}".format(self.cid_map[file.name]),
+ file.file_url)
+ return content
+
+ def is_notification(self):
+ isnotification = self.mail.get("isnotification")
+ return isnotification and ("notification" in isnotification)
+
+ def is_exist_in_system(self):
+ """Check if this email already exists in the system(as communication document).
+ """
+ from frappe.core.doctype.communication.communication import Communication
+ if not self.message_id:
+ return
-# fix due to a python bug in poplib that limits it to 2048
-poplib._MAXLINE = 20480
-imaplib._MAXLINE = 20480
+ return Communication.find_one_by_filters(message_id = self.message_id,
+ order_by = 'creation DESC')
+
+ def is_sender_same_as_receiver(self):
+ return self.from_email == self.email_account.email_id
+
+ def is_reply_to_system_sent_mail(self):
+ """Is it a reply to already sent mail.
+ """
+ return self.is_reply() and frappe.local.site in self.in_reply_to
+
+ def parent_email_queue(self):
+ """Get parent record from `Email Queue`.
+
+ If it is a reply to already sent mail, then there will be a parent record in EMail Queue.
+ """
+ from frappe.email.doctype.email_queue.email_queue import EmailQueue
+
+ if self._parent_email_queue is not None:
+ return self._parent_email_queue
+
+ parent_email_queue = ''
+ if self.is_reply_to_system_sent_mail():
+ parent_email_queue = EmailQueue.find_one_by_filters(message_id=self.in_reply_to)
+
+ self._parent_email_queue = parent_email_queue or ''
+ return self._parent_email_queue
+
+ def parent_communication(self):
+ """Find a related communication so that we can prepare a mail thread.
+
+ The way it happens is by using in-reply-to header, and we can't make thread if it does not exist.
+
+ Here are the cases to handle:
+ 1. If mail is a reply to already sent mail, then we can get parent communicaion from
+ Email Queue record.
+ 2. Sometimes we send communication name in message-ID directly, use that to get parent communication.
+ 3. Sender sent a reply but reply is on top of what (s)he sent before,
+ then parent record exists directly in communication.
+ """
+ from frappe.core.doctype.communication.communication import Communication
+ if self._parent_communication is not None:
+ return self._parent_communication
+
+ if not self.is_reply():
+ return ''
+
+ if not self.is_reply_to_system_sent_mail():
+ communication = Communication.find_one_by_filters(message_id=self.in_reply_to,
+ creation = ['>=', self.get_relative_dt(-30)])
+ elif self.parent_email_queue() and self.parent_email_queue().communication:
+ communication = Communication.find(self.parent_email_queue().communication, ignore_error=True)
+ else:
+ reference = self.in_reply_to
+ if '@' in self.in_reply_to:
+ reference, _ = self.in_reply_to.split("@", 1)
+ communication = Communication.find(reference, ignore_error=True)
+
+ self._parent_communication = communication or ''
+ return self._parent_communication
+
+ def reference_document(self):
+ """Reference document is a document to which mail relate to.
+
+ We can get reference document from Parent record(EmailQueue | Communication) if exists.
+ Otherwise we do subject match to find reference document if we know the reference(append_to) doctype.
+ """
+ if self._reference_document is not None:
+ return self._reference_document
+
+ reference_document = ""
+ parent = self.parent_email_queue() or self.parent_communication()
+
+ if parent and parent.reference_doctype:
+ reference_doctype, reference_name = parent.reference_doctype, parent.reference_name
+ reference_document = self.get_doc(reference_doctype, reference_name, ignore_error=True)
+
+ if not reference_document and self.email_account.append_to:
+ reference_document = self.match_record_by_subject_and_sender(self.email_account.append_to)
+
+ # if not reference_document:
+ # reference_document = Create_reference_document(self.email_account.append_to)
+
+ self._reference_document = reference_document or ''
+ return self._reference_document
+
+ def get_reference_name_from_subject(self):
+ """
+ Ex: "Re: Your email (#OPP-2020-2334343)"
+ """
+ return self.subject.rsplit('#', 1)[-1].strip(' ()')
+
+ def match_record_by_subject_and_sender(self, doctype):
+ """Find a record in the given doctype that matches with email subject and sender.
+
+ Cases:
+ 1. Sometimes record name is part of subject. We can get document by parsing name from subject
+ 2. Find by matching sender and subject
+ 3. Find by matching subject alone (Special case)
+ Ex: when a System User is using Outlook and replies to an email from their own client,
+ it reaches the Email Account with the threading info lost and the (sender + subject match)
+ doesn't work because the sender in the first communication was someone different to whom
+ the system user is replying to via the common email account in Frappe. This fix bypasses
+ the sender match when the sender is a system user and subject is atleast 10 chars long
+ (for additional safety)
+
+ NOTE: We consider not to match by subject if match record is very old.
+ """
+ name = self.get_reference_name_from_subject()
+ email_fields = self.get_email_fields(doctype)
+
+ record = self.get_doc(doctype, name, ignore_error=True) if name else None
+
+ if not record:
+ subject = self.clean_subject(self.subject)
+ filters = {
+ email_fields.subject_field: ("like", f"%{subject}%"),
+ "creation": (">", self.get_relative_dt(days=-60))
+ }
+
+ # Sender check is not needed incase mail is from system user.
+ if not (len(subject) > 10 and is_system_user(self.from_email)):
+ filters[email_fields.sender_field] = self.from_email
+
+ name = frappe.db.get_value(self.email_account.append_to, filters = filters)
+ record = self.get_doc(doctype, name, ignore_error=True) if name else None
+ return record
+
+ def _create_reference_document(self, doctype):
+ """ Create reference document if it does not exist in the system.
+ """
+ parent = frappe.new_doc(doctype)
+ email_fileds = self.get_email_fields(doctype)
+
+ if email_fileds.subject_field:
+ parent.set(email_fileds.subject_field, frappe.as_unicode(self.subject)[:140])
+
+ if email_fileds.sender_field:
+ parent.set(email_fileds.sender_field, frappe.as_unicode(self.from_email))
+
+ parent.flags.ignore_mandatory = True
+
+ try:
+ parent.insert(ignore_permissions=True)
+ except frappe.DuplicateEntryError:
+ # try and find matching parent
+ parent_name = frappe.db.get_value(self.email_account.append_to,
+ {email_fileds.sender_field: email.from_email}
+ )
+ if parent_name:
+ parent.name = parent_name
+ else:
+ parent = None
+ return parent
+
+
+ @staticmethod
+ def get_doc(doctype, docname, ignore_error=False):
+ try:
+ return frappe.get_doc(doctype, docname)
+ except frappe.DoesNotExistError:
+ if ignore_error:
+ return
+ raise
+
+ @staticmethod
+ def get_relative_dt(days):
+ """Get relative to current datetime. Only relative days are supported.
+ """
+ return add_days(get_datetime(), days)
+
+ @staticmethod
+ def get_users_linked_to_account(email_account):
+ """Get list of users who linked to Email account.
+ """
+ users = frappe.get_all("User Email", filters={"email_account": email_account.name},
+ fields=["parent"])
+ return list(set([user.get("parent") for user in users]))
+
+ @staticmethod
+ def clean_subject(subject):
+ """Remove Prefixes like 'fw', FWD', 're' etc from subject.
+ """
+ # Match strings like "fw:", "re :" etc.
+ regex = r"(^\s*(fw|fwd|wg)[^:]*:|\s*(re|aw)[^:]*:\s*)*"
+ return frappe.as_unicode(strip(re.sub(regex, "", subject, 0, flags=re.IGNORECASE)))
+
+ @staticmethod
+ def get_email_fields(doctype):
+ """Returns Email related fields of a doctype.
+ """
+ fields = frappe._dict()
+
+ email_fields = ['subject_field', 'sender_field']
+ meta = frappe.get_meta(doctype)
+
+ for field in email_fields:
+ if hasattr(meta, field):
+ fields[field] = getattr(meta, field)
+ return fields
+
+ @staticmethod
+ def get_document(self, doctype, name):
+ """Is same as frappe.get_doc but suppresses the DoesNotExist error.
+ """
+ try:
+ return frappe.get_doc(doctype, name)
+ except frappe.DoesNotExistError:
+ return None
+
+ def as_dict(self):
+ """
+ """
+ return {
+ "subject": self.subject,
+ "content": self.get_content(),
+ 'text_content': self.text_content,
+ "sent_or_received": "Received",
+ "sender_full_name": self.from_real_name,
+ "sender": self.from_email,
+ "recipients": self.mail.get("To"),
+ "cc": self.mail.get("CC"),
+ "email_account": self.email_account.name,
+ "communication_medium": "Email",
+ "uid": self.uid,
+ "message_id": self.message_id,
+ "communication_date": self.date,
+ "has_attachment": 1 if self.attachments else 0,
+ "seen": self.seen_status or 0
+ }
class TimerMixin(object):
def __init__(self, *args, **kwargs):
diff --git a/frappe/geo/country_info.json b/frappe/geo/country_info.json
index 1e0ae161bc..7ffdf0a8bf 100644
--- a/frappe/geo/country_info.json
+++ b/frappe/geo/country_info.json
@@ -953,7 +953,7 @@
"currency_fraction_units": 100,
"smallest_currency_fraction_value": 0.01,
"currency_symbol": "\u20ac",
- "number_format": "#,###.##",
+ "number_format": "#.###,##",
"timezones": [
"Europe/Berlin"
]
diff --git a/frappe/hooks.py b/frappe/hooks.py
index 1c78d47755..d0968ce051 100644
--- a/frappe/hooks.py
+++ b/frappe/hooks.py
@@ -29,16 +29,16 @@ page_js = {
# website
app_include_js = [
- "/assets/js/libs.min.js",
- "/assets/js/desk.min.js",
- "/assets/js/list.min.js",
- "/assets/js/form.min.js",
- "/assets/js/control.min.js",
- "/assets/js/report.min.js",
+ "libs.bundle.js",
+ "desk.bundle.js",
+ "list.bundle.js",
+ "form.bundle.js",
+ "controls.bundle.js",
+ "report.bundle.js",
]
app_include_css = [
- "/assets/css/desk.min.css",
- "/assets/css/report.min.css",
+ "desk.bundle.css",
+ "report.bundle.css",
]
doctype_js = {
@@ -52,6 +52,8 @@ web_include_js = [
web_include_css = []
+email_css = ['email.bundle.css']
+
website_route_rules = [
{"from_route": "/blog/", "to_route": "Blog Post"},
{"from_route": "/kb/", "to_route": "Help Article"},
@@ -226,7 +228,6 @@ scheduler_events = {
"frappe.desk.doctype.event.event.send_event_digest",
"frappe.sessions.clear_expired_sessions",
"frappe.email.doctype.notification.notification.trigger_daily_alerts",
- "frappe.realtime.remove_old_task_logs",
"frappe.utils.scheduler.restrict_scheduler_events_if_dormant",
"frappe.email.doctype.auto_email_report.auto_email_report.send_daily",
"frappe.website.doctype.personal_data_deletion_request.personal_data_deletion_request.remove_unverified_record",
diff --git a/frappe/installer.py b/frappe/installer.py
index 0cd5b136ae..d7d885d60e 100755
--- a/frappe/installer.py
+++ b/frappe/installer.py
@@ -390,19 +390,16 @@ def get_conf_params(db_name=None, db_password=None):
def make_site_dirs():
- site_public_path = os.path.join(frappe.local.site_path, 'public')
- site_private_path = os.path.join(frappe.local.site_path, 'private')
- for dir_path in (
- os.path.join(site_private_path, 'backups'),
- os.path.join(site_public_path, 'files'),
- os.path.join(site_private_path, 'files'),
- os.path.join(frappe.local.site_path, 'logs'),
- os.path.join(frappe.local.site_path, 'task-logs')):
- if not os.path.exists(dir_path):
- os.makedirs(dir_path)
- locks_dir = frappe.get_site_path('locks')
- if not os.path.exists(locks_dir):
- os.makedirs(locks_dir)
+ for dir_path in [
+ os.path.join("public", "files"),
+ os.path.join("private", "backups"),
+ os.path.join("private", "files"),
+ "error-snapshots",
+ "locks",
+ "logs",
+ ]:
+ path = frappe.get_site_path(dir_path)
+ os.makedirs(path, exist_ok=True)
def add_module_defs(app):
diff --git a/frappe/integrations/doctype/connected_app/connected_app.json b/frappe/integrations/doctype/connected_app/connected_app.json
index e5dbb0472a..b5330f4d4f 100644
--- a/frappe/integrations/doctype/connected_app/connected_app.json
+++ b/frappe/integrations/doctype/connected_app/connected_app.json
@@ -54,7 +54,8 @@
"fieldname": "client_id",
"fieldtype": "Data",
"in_list_view": 1,
- "label": "Client Id"
+ "label": "Client Id",
+ "mandatory_depends_on": "eval:doc.redirect_uri"
},
{
"fieldname": "redirect_uri",
@@ -96,12 +97,14 @@
{
"fieldname": "authorization_uri",
"fieldtype": "Data",
- "label": "Authorization URI"
+ "label": "Authorization URI",
+ "mandatory_depends_on": "eval:doc.redirect_uri"
},
{
"fieldname": "token_uri",
"fieldtype": "Data",
- "label": "Token URI"
+ "label": "Token URI",
+ "mandatory_depends_on": "eval:doc.redirect_uri"
},
{
"fieldname": "revocation_uri",
@@ -136,7 +139,7 @@
"link_fieldname": "connected_app"
}
],
- "modified": "2020-11-16 16:29:50.277405",
+ "modified": "2021-05-10 05:03:06.296863",
"modified_by": "Administrator",
"module": "Integrations",
"name": "Connected App",
diff --git a/frappe/integrations/doctype/connected_app/connected_app.py b/frappe/integrations/doctype/connected_app/connected_app.py
index 95077ece77..449e30f6d0 100644
--- a/frappe/integrations/doctype/connected_app/connected_app.py
+++ b/frappe/integrations/doctype/connected_app/connected_app.py
@@ -26,20 +26,27 @@ class ConnectedApp(Document):
self.redirect_uri = urljoin(base_url, callback_path)
def get_oauth2_session(self, user=None, init=False):
+ """Return an auto-refreshing OAuth2 session which is an extension of a requests.Session()"""
token = None
token_updater = None
+ auto_refresh_kwargs = None
if not init:
user = user or frappe.session.user
token_cache = self.get_user_token(user)
token = token_cache.get_json()
token_updater = token_cache.update_data
+ auto_refresh_kwargs = {'client_id': self.client_id}
+ client_secret = self.get_password('client_secret')
+ if client_secret:
+ auto_refresh_kwargs['client_secret'] = client_secret
return OAuth2Session(
client_id=self.client_id,
token=token,
token_updater=token_updater,
auto_refresh_url=self.token_uri,
+ auto_refresh_kwargs=auto_refresh_kwargs,
redirect_uri=self.redirect_uri,
scope=self.get_scopes()
)
diff --git a/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.json b/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.json
index c610d6286b..56a76b989b 100644
--- a/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.json
+++ b/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.json
@@ -1,126 +1,61 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "field:webhook_name",
- "beta": 0,
- "creation": "2018-05-22 13:20:51.450815",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "autoname": "field:webhook_name",
+ "creation": "2018-05-22 13:20:51.450815",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "webhook_name",
+ "webhook_url",
+ "show_document_link"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "webhook_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "webhook_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Name",
+ "reqd": 1,
+ "unique": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "webhook_url",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Webhook URL",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "webhook_url",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Webhook URL",
+ "reqd": 1
+ },
+ {
+ "allow_in_quick_entry": 1,
+ "default": "1",
+ "fieldname": "show_document_link",
+ "fieldtype": "Check",
+ "label": "Show link to document"
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-05-22 13:25:24.621129",
- "modified_by": "Administrator",
- "module": "Integrations",
- "name": "Slack Webhook URL",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "links": [],
+ "modified": "2021-05-12 18:24:37.810235",
+ "modified_by": "Administrator",
+ "module": "Integrations",
+ "name": "Slack Webhook URL",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
"write": 1
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0
+ ],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.py b/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.py
index b28a6c50e6..8756d19c88 100644
--- a/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.py
+++ b/frappe/integrations/doctype/slack_webhook_url/slack_webhook_url.py
@@ -25,22 +25,27 @@ class SlackWebhookURL(Document):
def send_slack_message(webhook_url, message, reference_doctype, reference_name):
- slack_url = frappe.db.get_value("Slack Webhook URL", webhook_url, "webhook_url")
- doc_url = get_url_to_form(reference_doctype, reference_name)
- attachments = [
- {
+ data = {"text": message, "attachments": []}
+
+ slack_url, show_link = frappe.db.get_value(
+ "Slack Webhook URL", webhook_url, ["webhook_url", "show_document_link"]
+ )
+
+ if show_link:
+ doc_url = get_url_to_form(reference_doctype, reference_name)
+ link_to_doc = {
"fallback": _("See the document at {0}").format(doc_url),
"actions": [
{
"type": "button",
"text": _("Go to the document"),
"url": doc_url,
- "style": "primary"
+ "style": "primary",
}
- ]
+ ],
}
- ]
- data = {"text": message, "attachments": attachments}
+ data["attachments"].append(link_to_doc)
+
r = requests.post(slack_url, data=json.dumps(data))
if not r.ok:
diff --git a/frappe/integrations/oauth2.py b/frappe/integrations/oauth2.py
index 2ce99d8aa3..2b227f503d 100644
--- a/frappe/integrations/oauth2.py
+++ b/frappe/integrations/oauth2.py
@@ -1,6 +1,5 @@
import json
from urllib.parse import quote, urlencode
-
from oauthlib.oauth2 import FatalClientError, OAuth2Error
from oauthlib.openid.connect.core.endpoints.pre_configured import (
Server as WebApplicationServer,
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 05435482bd..54d77ba988 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -34,8 +34,9 @@ def get_controller(doctype):
from frappe.model.document import Document
from frappe.utils.nestedset import NestedSet
- module_name, custom = frappe.db.get_value("DocType", doctype, ("module", "custom"), cache=True) \
- or ["Core", False]
+ module_name, custom = frappe.db.get_value(
+ "DocType", doctype, ("module", "custom"), cache=True
+ ) or ["Core", False]
if custom:
if frappe.db.field_exists("DocType", "is_tree"):
@@ -869,7 +870,7 @@ class BaseDocument(object):
from frappe.model.meta import get_default_df
df = get_default_df(fieldname)
- if not currency:
+ if not currency and df:
currency = self.get(df.get("options"))
if not frappe.db.exists('Currency', currency, cache=True):
currency = None
diff --git a/frappe/model/document.py b/frappe/model/document.py
index 623916597e..a3f8ad0cfa 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -17,6 +17,7 @@ from frappe.model.workflow import set_workflow_state_on_action
from frappe.utils.global_search import update_global_search
from frappe.integrations.doctype.webhook import run_webhooks
from frappe.desk.form.document_follow import follow_document
+from frappe.desk.utils import slug
from frappe.core.doctype.server_script.server_script_utils import run_server_script_for_doc_event
# once_only validation
@@ -1202,8 +1203,8 @@ class Document(BaseDocument):
doc.set(fieldname, flt(doc.get(fieldname), self.precision(fieldname, doc.parentfield)))
def get_url(self):
- """Returns Desk URL for this document. `/app/Form/{doctype}/{name}`"""
- return "/app/Form/{doctype}/{name}".format(doctype=self.doctype, name=self.name)
+ """Returns Desk URL for this document. `/app/{doctype}/{name}`"""
+ return f"/app/{slug(self.doctype)}/{self.name}"
def add_comment(self, comment_type='Comment', text=None, comment_email=None, link_doctype=None, link_name=None, comment_by=None):
"""Add a comment to this document.
diff --git a/frappe/model/naming.py b/frappe/model/naming.py
index 1a3f90da37..b8d6a6f8d7 100644
--- a/frappe/model/naming.py
+++ b/frappe/model/naming.py
@@ -199,10 +199,39 @@ def getseries(key, digits):
def revert_series_if_last(key, name, doc=None):
- if ".#" in key:
+ """
+ Reverts the series for particular naming series:
+ * key is naming series - SINV-.YYYY-.####
+ * name is actual name - SINV-2021-0001
+
+ 1. This function split the key into two parts prefix (SINV-YYYY) & hashes (####).
+ 2. Use prefix to get the current index of that naming series from Series table
+ 3. Then revert the current index.
+
+ *For custom naming series:*
+ 1. hash can exist anywhere, if it exist in hashes then it take normal flow.
+ 2. If hash doesn't exit in hashes, we get the hash from prefix, then update name and prefix accordingly.
+
+ *Example:*
+ 1. key = SINV-.YYYY.-
+ * If key doesn't have hash it will add hash at the end
+ * prefix will be SINV-YYYY based on this will get current index from Series table.
+ 2. key = SINV-.####.-2021
+ * now prefix = SINV-#### and hashes = 2021 (hash doesn't exist)
+ * will search hash in key then accordingly get prefix = SINV-
+ 3. key = ####.-2021
+ * prefix = #### and hashes = 2021 (hash doesn't exist)
+ * will search hash in key then accordingly get prefix = ""
+ """
+ if ".#" in key:
prefix, hashes = key.rsplit(".", 1)
if "#" not in hashes:
- return
+ # get the hash part from the key
+ hash = re.search("#+", key)
+ if not hash:
+ return
+ name = name.replace(hashes, "")
+ prefix = prefix.replace(hash.group(), "")
else:
prefix = key
@@ -254,7 +283,7 @@ def append_number_if_name_exists(doctype, value, fieldname="name", separator="-"
filters.update({fieldname: value})
exists = frappe.db.exists(doctype, filters)
- regex = "^{value}{separator}\d+$".format(value=re.escape(value), separator=separator)
+ regex = "^{value}{separator}\\d+$".format(value=re.escape(value), separator=separator)
if exists:
last = frappe.db.sql("""SELECT `{fieldname}` FROM `tab{doctype}`
diff --git a/frappe/modules/import_file.py b/frappe/modules/import_file.py
index 5970eae5ca..fdfd00404c 100644
--- a/frappe/modules/import_file.py
+++ b/frappe/modules/import_file.py
@@ -107,6 +107,15 @@ def import_doc(docdict, force=False, data_import=False, pre_process=None,
doc = frappe.get_doc(docdict)
+ # Note on Tree DocTypes:
+ # The tree structure is maintained in the database via the fields "lft" and
+ # "rgt". They are automatically set and kept up-to-date. Importing them
+ # would destroy any existing tree structure.
+ if getattr(doc.meta, 'is_tree', None) and any([doc.lft, doc.rgt]):
+ print('Ignoring values of `lft` and `rgt` for {} "{}"'.format(doc.doctype, doc.name))
+ doc.lft = None
+ doc.rgt = None
+
doc.run_method("before_import")
doc.flags.ignore_version = ignore_version
diff --git a/frappe/oauth.py b/frappe/oauth.py
index 35f047a2b6..a4c66bf3f2 100644
--- a/frappe/oauth.py
+++ b/frappe/oauth.py
@@ -4,11 +4,9 @@ import hashlib
import re
from http import cookies
from urllib.parse import unquote, urlparse
-
import jwt
import pytz
from oauthlib.openid import RequestValidator
-
import frappe
from frappe.auth import LoginManager
diff --git a/frappe/parallel_test_runner.py b/frappe/parallel_test_runner.py
new file mode 100644
index 0000000000..1dbb24f191
--- /dev/null
+++ b/frappe/parallel_test_runner.py
@@ -0,0 +1,282 @@
+import json
+import os
+import re
+import sys
+import time
+import unittest
+import click
+import frappe
+import requests
+
+from .test_runner import (SLOW_TEST_THRESHOLD, make_test_records, set_test_email_config)
+
+click_ctx = click.get_current_context(True)
+if click_ctx:
+ click_ctx.color = True
+
+class ParallelTestRunner():
+ def __init__(self, app, site, build_number=1, total_builds=1, with_coverage=False):
+ self.app = app
+ self.site = site
+ self.with_coverage = with_coverage
+ self.build_number = frappe.utils.cint(build_number) or 1
+ self.total_builds = frappe.utils.cint(total_builds)
+ self.setup_test_site()
+ self.run_tests()
+
+ def setup_test_site(self):
+ frappe.init(site=self.site)
+ if not frappe.db:
+ frappe.connect()
+
+ frappe.flags.in_test = True
+ frappe.clear_cache()
+ frappe.utils.scheduler.disable_scheduler()
+ set_test_email_config()
+ self.before_test_setup()
+
+ def before_test_setup(self):
+ start_time = time.time()
+ for fn in frappe.get_hooks("before_tests", app_name=self.app):
+ frappe.get_attr(fn)()
+
+ test_module = frappe.get_module(f'{self.app}.tests')
+
+ if hasattr(test_module, "global_test_dependencies"):
+ for doctype in test_module.global_test_dependencies:
+ make_test_records(doctype)
+
+ elapsed = time.time() - start_time
+ elapsed = click.style(f' ({elapsed:.03}s)', fg='red')
+ click.echo(f'Before Test {elapsed}')
+
+ def run_tests(self):
+ self.test_result = ParallelTestResult(stream=sys.stderr, descriptions=True, verbosity=2)
+
+ self.start_coverage()
+
+ for test_file_info in self.get_test_file_list():
+ self.run_tests_for_file(test_file_info)
+
+ self.save_coverage()
+ self.print_result()
+
+ def run_tests_for_file(self, file_info):
+ if not file_info: return
+
+ frappe.set_user('Administrator')
+ path, filename = file_info
+ module = self.get_module(path, filename)
+ self.create_test_dependency_records(module, path, filename)
+ test_suite = unittest.TestSuite()
+ module_test_cases = unittest.TestLoader().loadTestsFromModule(module)
+ test_suite.addTest(module_test_cases)
+ test_suite(self.test_result)
+
+ def create_test_dependency_records(self, module, path, filename):
+ if hasattr(module, "test_dependencies"):
+ for doctype in module.test_dependencies:
+ make_test_records(doctype)
+
+ if os.path.basename(os.path.dirname(path)) == "doctype":
+ # test_data_migration_connector.py > data_migration_connector.json
+ test_record_filename = re.sub('^test_', '', filename).replace(".py", ".json")
+ test_record_file_path = os.path.join(path, test_record_filename)
+ if os.path.exists(test_record_file_path):
+ with open(test_record_file_path, 'r') as f:
+ doc = json.loads(f.read())
+ doctype = doc["name"]
+ make_test_records(doctype)
+
+ def get_module(self, path, filename):
+ app_path = frappe.get_pymodule_path(self.app)
+ relative_path = os.path.relpath(path, app_path)
+ if relative_path == '.':
+ module_name = self.app
+ else:
+ relative_path = relative_path.replace('/', '.')
+ module_name = os.path.splitext(filename)[0]
+ module_name = f'{self.app}.{relative_path}.{module_name}'
+
+ return frappe.get_module(module_name)
+
+ def print_result(self):
+ self.test_result.printErrors()
+ click.echo(self.test_result)
+ if self.test_result.failures or self.test_result.errors:
+ if os.environ.get('CI'):
+ sys.exit(1)
+
+ def start_coverage(self):
+ if self.with_coverage:
+ from coverage import Coverage
+ from frappe.utils import get_bench_path
+
+ # Generate coverage report only for app that is being tested
+ source_path = os.path.join(get_bench_path(), 'apps', self.app)
+ omit=['*.html', '*.js', '*.xml', '*.css', '*.less', '*.scss',
+ '*.vue', '*/doctype/*/*_dashboard.py', '*/patches/*']
+
+ if self.app == 'frappe':
+ omit.append('*/commands/*')
+
+ self.coverage = Coverage(source=[source_path], omit=omit)
+ self.coverage.start()
+
+ def save_coverage(self):
+ if not self.with_coverage:
+ return
+ self.coverage.stop()
+ self.coverage.save()
+
+ def get_test_file_list(self):
+ test_list = get_all_tests(self.app)
+ split_size = frappe.utils.ceil(len(test_list) / self.total_builds)
+ # [1,2,3,4,5,6] to [[1,2], [3,4], [4,6]] if split_size is 2
+ test_chunks = [test_list[x:x+split_size] for x in range(0, len(test_list), split_size)]
+ return test_chunks[self.build_number - 1]
+
+
+class ParallelTestResult(unittest.TextTestResult):
+ def startTest(self, test):
+ self._started_at = time.time()
+ super(unittest.TextTestResult, self).startTest(test)
+ test_class = unittest.util.strclass(test.__class__)
+ if not hasattr(self, 'current_test_class') or self.current_test_class != test_class:
+ click.echo(f"\n{unittest.util.strclass(test.__class__)}")
+ self.current_test_class = test_class
+
+ def getTestMethodName(self, test):
+ return test._testMethodName if hasattr(test, '_testMethodName') else str(test)
+
+ def addSuccess(self, test):
+ super(unittest.TextTestResult, self).addSuccess(test)
+ elapsed = time.time() - self._started_at
+ threshold_passed = elapsed >= SLOW_TEST_THRESHOLD
+ elapsed = click.style(f' ({elapsed:.03}s)', fg='red') if threshold_passed else ''
+ click.echo(f" {click.style(' ✔ ', fg='green')} {self.getTestMethodName(test)}{elapsed}")
+
+ def addError(self, test, err):
+ super(unittest.TextTestResult, self).addError(test, err)
+ click.echo(f" {click.style(' ✖ ', fg='red')} {self.getTestMethodName(test)}")
+
+ def addFailure(self, test, err):
+ super(unittest.TextTestResult, self).addFailure(test, err)
+ click.echo(f" {click.style(' ✖ ', fg='red')} {self.getTestMethodName(test)}")
+
+ def addSkip(self, test, reason):
+ super(unittest.TextTestResult, self).addSkip(test, reason)
+ click.echo(f" {click.style(' = ', fg='white')} {self.getTestMethodName(test)}")
+
+ def addExpectedFailure(self, test, err):
+ super(unittest.TextTestResult, self).addExpectedFailure(test, err)
+ click.echo(f" {click.style(' ✖ ', fg='red')} {self.getTestMethodName(test)}")
+
+ def addUnexpectedSuccess(self, test):
+ super(unittest.TextTestResult, self).addUnexpectedSuccess(test)
+ click.echo(f" {click.style(' ✔ ', fg='green')} {self.getTestMethodName(test)}")
+
+ def printErrors(self):
+ click.echo('\n')
+ self.printErrorList(' ERROR ', self.errors, 'red')
+ self.printErrorList(' FAIL ', self.failures, 'red')
+
+ def printErrorList(self, flavour, errors, color):
+ for test, err in errors:
+ click.echo(self.separator1)
+ click.echo(f"{click.style(flavour, bg=color)} {self.getDescription(test)}")
+ click.echo(self.separator2)
+ click.echo(err)
+
+ def __str__(self):
+ return f"Tests: {self.testsRun}, Failing: {len(self.failures)}, Errors: {len(self.errors)}"
+
+def get_all_tests(app):
+ test_file_list = []
+ for path, folders, files in os.walk(frappe.get_pymodule_path(app)):
+ for dontwalk in ('locals', '.git', 'public', '__pycache__'):
+ if dontwalk in folders:
+ folders.remove(dontwalk)
+
+ # for predictability
+ folders.sort()
+ files.sort()
+
+ if os.path.sep.join(["doctype", "doctype", "boilerplate"]) in path:
+ # in /doctype/doctype/boilerplate/
+ continue
+
+ for filename in files:
+ if filename.startswith("test_") and filename.endswith(".py") \
+ and filename != 'test_runner.py':
+ test_file_list.append([path, filename])
+
+ return test_file_list
+
+
+class ParallelTestWithOrchestrator(ParallelTestRunner):
+ '''
+ This can be used to balance-out test time across multiple instances
+ This is dependent on external orchestrator which returns next test to run
+
+ orchestrator endpoints
+ - register-instance (, , test_spec_list)
+ - get-next-test-spec (, )
+ - test-completed (, )
+ '''
+ def __init__(self, app, site, with_coverage=False):
+ self.orchestrator_url = os.environ.get('ORCHESTRATOR_URL')
+ if not self.orchestrator_url:
+ click.echo('ORCHESTRATOR_URL environment variable not found!')
+ click.echo('Pass public URL after hosting https://github.com/frappe/test-orchestrator')
+ sys.exit(1)
+
+ self.ci_build_id = os.environ.get('CI_BUILD_ID')
+ self.ci_instance_id = os.environ.get('CI_INSTANCE_ID') or frappe.generate_hash(length=10)
+ if not self.ci_build_id:
+ click.echo('CI_BUILD_ID environment variable not found!')
+ sys.exit(1)
+
+ ParallelTestRunner.__init__(self, app, site, with_coverage=with_coverage)
+
+ def run_tests(self):
+ self.test_status = 'ongoing'
+ self.register_instance()
+ super().run_tests()
+
+ def get_test_file_list(self):
+ while self.test_status == 'ongoing':
+ yield self.get_next_test()
+
+ def register_instance(self):
+ test_spec_list = get_all_tests(self.app)
+ response_data = self.call_orchestrator('register-instance', data={
+ 'test_spec_list': test_spec_list
+ })
+ self.is_master = response_data.get('is_master')
+
+ def get_next_test(self):
+ response_data = self.call_orchestrator('get-next-test-spec')
+ self.test_status = response_data.get('status')
+ return response_data.get('next_test')
+
+ def print_result(self):
+ self.call_orchestrator('test-completed')
+ return super().print_result()
+
+ def call_orchestrator(self, endpoint, data={}):
+ # add repo token header
+ # build id in header
+ headers = {
+ 'CI-BUILD-ID': self.ci_build_id,
+ 'CI-INSTANCE-ID': self.ci_instance_id,
+ 'REPO-TOKEN': '2948288382838DE'
+ }
+ url = f'{self.orchestrator_url}/{endpoint}'
+ res = requests.get(url, json=data, headers=headers)
+ res.raise_for_status()
+ response_data = {}
+ if 'application/json' in res.headers.get('content-type'):
+ response_data = res.json()
+
+ return response_data
diff --git a/frappe/patches/v5_0/fix_text_editor_file_urls.py b/frappe/patches/v5_0/fix_text_editor_file_urls.py
index d91aad0234..a6d7d2fb9a 100644
--- a/frappe/patches/v5_0/fix_text_editor_file_urls.py
+++ b/frappe/patches/v5_0/fix_text_editor_file_urls.py
@@ -33,8 +33,7 @@ def execute():
def scrub_relative_urls(html):
"""prepend a slash before a relative url"""
try:
- return re.sub("""src[\s]*=[\s]*['"]files/([^'"]*)['"]""", 'src="/files/\g<1>"', html)
- # return re.sub("""(src|href)[^\w'"]*['"](?!http|ftp|mailto|/|#|%|{|cid:|\.com/www\.)([^'" >]+)['"]""", '\g<1>="/\g<2>"', html)
+ return re.sub(r'src[\s]*=[\s]*[\'"]files/([^\'"]*)[\'"]', r'src="/files/\g<1>"', html)
except:
print("Error", html)
raise
diff --git a/frappe/printing/doctype/print_format/test_print_format.py b/frappe/printing/doctype/print_format/test_print_format.py
index 7e30bda23e..121916ae5f 100644
--- a/frappe/printing/doctype/print_format/test_print_format.py
+++ b/frappe/printing/doctype/print_format/test_print_format.py
@@ -12,13 +12,13 @@ class TestPrintFormat(unittest.TestCase):
def test_print_user(self, style=None):
print_html = frappe.get_print("User", "Administrator", style=style)
self.assertTrue("" in print_html)
- self.assertTrue(re.findall('[\s]*administrator[\s]*
', print_html))
+ self.assertTrue(re.findall(r'[\s]*administrator[\s]*
', print_html))
return print_html
def test_print_user_standard(self):
print_html = self.test_print_user("Standard")
- self.assertTrue(re.findall('\.print-format {[\s]*font-size: 9pt;', print_html))
- self.assertFalse(re.findall('th {[\s]*background-color: #eee;[\s]*}', print_html))
+ self.assertTrue(re.findall(r'\.print-format {[\s]*font-size: 9pt;', print_html))
+ self.assertFalse(re.findall(r'th {[\s]*background-color: #eee;[\s]*}', print_html))
self.assertFalse("font-family: serif;" in print_html)
def test_print_user_modern(self):
diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js
index dfd93c4efa..233bbe0ce7 100644
--- a/frappe/printing/page/print/print.js
+++ b/frappe/printing/page/print/print.js
@@ -408,14 +408,17 @@ frappe.ui.form.PrintView = class {
setup_print_format_dom(out, $print_format) {
this.print_wrapper.find('.print-format-skeleton').remove();
+ let base_url = frappe.urllib.get_base_url();
+ let print_css = frappe.assets.bundled_asset('print.bundle.css');
this.$print_format_body.find('head').html(
`
- `
+ `
);
if (frappe.utils.is_rtl(this.lang_code)) {
+ let rtl_css = frappe.assets.bundled_asset('frappe-rtl.bundle.css');
this.$print_format_body.find('head').append(
- ``
+ ``
);
}
diff --git a/frappe/printing/page/print_format_builder/print_format_builder.js b/frappe/printing/page/print_format_builder/print_format_builder.js
index 7e58e295b5..ca2a8bc378 100644
--- a/frappe/printing/page/print_format_builder/print_format_builder.js
+++ b/frappe/printing/page/print_format_builder/print_format_builder.js
@@ -23,13 +23,13 @@ frappe.pages['print-format-builder'].on_page_show = function(wrapper) {
}
}
-frappe.PrintFormatBuilder = Class.extend({
- init: function(parent) {
+frappe.PrintFormatBuilder = class PrintFormatBuilder {
+ constructor(parent) {
this.parent = parent;
this.make();
this.refresh();
- },
- refresh: function() {
+ }
+ refresh() {
this.custom_html_count = 0;
if(!this.print_format) {
this.show_start();
@@ -37,8 +37,8 @@ frappe.PrintFormatBuilder = Class.extend({
this.page.set_title(this.print_format.name);
this.setup_print_format();
}
- },
- make: function() {
+ }
+ make() {
this.page = frappe.ui.make_app_page({
parent: this.parent,
title: __("Print Format Builder"),
@@ -56,15 +56,15 @@ frappe.PrintFormatBuilder = Class.extend({
this.setup_edit_custom_html();
// $(this.page.sidebar).css({"position": 'fixed'});
// $(this.page.main).parent().css({"margin-left": '16.67%'});
- },
- show_start: function() {
+ }
+ show_start() {
this.page.main.html(frappe.render_template("print_format_builder_start", {}));
this.page.clear_actions();
this.page.set_title(__("Print Format Builder"));
this.start_edit_print_format();
this.start_new_print_format();
- },
- start_edit_print_format: function() {
+ }
+ start_edit_print_format() {
// print format control
var me = this;
this.print_format_input = frappe.ui.form.make_control({
@@ -89,8 +89,8 @@ frappe.PrintFormatBuilder = Class.extend({
frappe.set_route('print-format-builder', name);
});
});
- },
- start_new_print_format: function() {
+ }
+ start_new_print_format() {
var me = this;
this.doctype_input = frappe.ui.form.make_control({
parent: this.page.main.find(".doctype-selector"),
@@ -125,8 +125,8 @@ frappe.PrintFormatBuilder = Class.extend({
me.setup_new_print_format(doctype, name);
});
- },
- setup_new_print_format: function(doctype, name, based_on) {
+ }
+ setup_new_print_format(doctype, name, based_on) {
frappe.call({
method: 'frappe.printing.page.print_format_builder.print_format_builder.create_custom_format',
args: {
@@ -143,8 +143,8 @@ frappe.PrintFormatBuilder = Class.extend({
}
},
});
- },
- setup_print_format: function() {
+ }
+ setup_print_format() {
var me = this;
frappe.model.with_doctype(this.print_format.doc_type, function(doctype) {
me.meta = frappe.get_meta(me.print_format.doc_type);
@@ -163,23 +163,23 @@ frappe.PrintFormatBuilder = Class.extend({
frappe.set_route("Form", "Print Format", me.print_format.name);
});
});
- },
- setup_sidebar: function() {
+ }
+ setup_sidebar() {
// prepend custom HTML field
var fields = [this.get_custom_html_field()].concat(this.meta.fields);
this.page.sidebar.html(
$(frappe.render_template("print_format_builder_sidebar", {fields: fields}))
);
this.setup_field_filter();
- },
- get_custom_html_field: function() {
+ }
+ get_custom_html_field() {
return {
fieldtype: "Custom HTML",
fieldname: "_custom_html",
label: __("Custom HTML")
- }
- },
- render_layout: function() {
+ };
+ }
+ render_layout() {
this.page.main.empty();
this.prepare_data();
$(frappe.render_template("print_format_builder_layout", {
@@ -190,8 +190,8 @@ frappe.PrintFormatBuilder = Class.extend({
this.setup_edit_heading();
this.setup_field_settings();
this.setup_html_data();
- },
- prepare_data: function() {
+ }
+ prepare_data() {
this.print_heading_template = null;
this.data = JSON.parse(this.print_format.format_data || "[]");
if(!this.data.length) {
@@ -280,22 +280,22 @@ frappe.PrintFormatBuilder = Class.extend({
this.layout_data = $.map(this.layout_data, function(s) {
return s.has_fields ? s : null
});
- },
- get_new_section: function() {
+ }
+ get_new_section() {
return {columns: [], no_of_columns: 0, label:''};
- },
- get_new_column: function() {
+ }
+ get_new_column() {
return {fields: []}
- },
- add_table_properties: function(f) {
+ }
+ add_table_properties(f) {
// build table columns and widths in a dict
// visible_columns
var me = this;
if(!f.visible_columns) {
me.init_visible_columns(f);
}
- },
- init_visible_columns: function(f) {
+ }
+ init_visible_columns(f) {
f.visible_columns = []
$.each(frappe.get_meta(f.options).fields, function(i, _f) {
if(!in_list(["Section Break", "Column Break"], _f.fieldtype) &&
@@ -306,8 +306,8 @@ frappe.PrintFormatBuilder = Class.extend({
print_width: (_f.width || ""), print_hide:0});
}
});
- },
- setup_sortable: function() {
+ }
+ setup_sortable() {
var me = this;
// drag from fields library
@@ -332,8 +332,8 @@ frappe.PrintFormatBuilder = Class.extend({
Sortable.create(this.page.main.find(".print-format-builder-layout").get(0),
{ handle: ".print-format-builder-section-head" }
);
- },
- setup_sortable_for_column: function(col) {
+ }
+ setup_sortable_for_column(col) {
var me = this;
Sortable.create(col, {
group: {
@@ -363,8 +363,8 @@ frappe.PrintFormatBuilder = Class.extend({
}
});
- },
- setup_field_filter: function() {
+ }
+ setup_field_filter() {
var me = this;
this.page.sidebar.find(".filter-fields").on("keyup", function() {
var text = $(this).val();
@@ -373,8 +373,8 @@ frappe.PrintFormatBuilder = Class.extend({
$(this).parent().toggle(show);
})
});
- },
- setup_section_settings: function() {
+ }
+ setup_section_settings() {
var me = this;
this.page.main.on("click", ".section-settings", function() {
var section = $(this).parent().parent();
@@ -431,8 +431,8 @@ frappe.PrintFormatBuilder = Class.extend({
return false;
});
- },
- setup_field_settings: function() {
+ }
+ setup_field_settings() {
this.page.main.find(".field-settings").on("click", e => {
const field = $(e.currentTarget).parent();
// new dialog
@@ -482,8 +482,8 @@ frappe.PrintFormatBuilder = Class.extend({
return false;
});
- },
- setup_html_data: function() {
+ }
+ setup_html_data() {
// set JQuery `data` for Custom HTML fields, since editing the HTML
// directly causes problem becuase of HTML reformatting
//
@@ -496,8 +496,8 @@ frappe.PrintFormatBuilder = Class.extend({
var html = me.custom_html_dict[parseInt(content.attr('data-custom-html-id'))].options;
content.data('content', html);
})
- },
- update_columns_in_section: function(section, no_of_columns, new_no_of_columns) {
+ }
+ update_columns_in_section(section, no_of_columns, new_no_of_columns) {
var col_size = 12 / new_no_of_columns,
me = this,
resize = function() {
@@ -539,8 +539,8 @@ frappe.PrintFormatBuilder = Class.extend({
resize();
}
- },
- setup_add_section: function() {
+ }
+ setup_add_section() {
var me = this;
this.page.main.find(".print-format-builder-add-section").on("click", function() {
// boostrap new section info
@@ -554,8 +554,8 @@ frappe.PrintFormatBuilder = Class.extend({
me.setup_sortable_for_column($section.find(".print-format-builder-column").get(0));
});
- },
- setup_edit_heading: function() {
+ }
+ setup_edit_heading() {
var me = this;
var $heading = this.page.main.find(".print-format-builder-print-heading");
@@ -565,8 +565,8 @@ frappe.PrintFormatBuilder = Class.extend({
this.page.main.find(".edit-heading").on("click", function() {
var d = me.get_edit_html_dialog(__("Edit Heading"), __("Heading"), $heading);
})
- },
- setup_column_selector: function() {
+ }
+ setup_column_selector() {
var me = this;
this.page.main.on("click", ".select-columns", function() {
var parent = $(this).parents(".print-format-builder-field:first"),
@@ -657,24 +657,24 @@ frappe.PrintFormatBuilder = Class.extend({
return false;
});
- },
- get_visible_columns_string: function(f) {
+ }
+ get_visible_columns_string(f) {
if(!f.visible_columns) {
this.init_visible_columns(f);
}
return $.map(f.visible_columns, function(v) { return v.fieldname + "|" + (v.print_width || "") }).join(",");
- },
- get_no_content: function() {
+ }
+ get_no_content() {
return __("Edit to add content")
- },
- setup_edit_custom_html: function() {
+ }
+ setup_edit_custom_html() {
var me = this;
this.page.main.on("click", ".edit-html", function() {
me.get_edit_html_dialog(__("Edit Custom HTML"), __("Custom HTML"),
$(this).parents(".print-format-builder-field:first").find(".html-content"));
});
- },
- get_edit_html_dialog: function(title, label, $content) {
+ }
+ get_edit_html_dialog(title, label, $content) {
var me = this;
var d = new frappe.ui.Dialog({
title: title,
@@ -710,8 +710,8 @@ frappe.PrintFormatBuilder = Class.extend({
d.show();
return d;
- },
- save_print_format: function() {
+ }
+ save_print_format() {
var data = [],
me = this;
@@ -789,4 +789,4 @@ frappe.PrintFormatBuilder = Class.extend({
}
});
}
-});
+};
diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html
index bdb09541c9..721bec7fa7 100644
--- a/frappe/public/html/print_template.html
+++ b/frappe/public/html/print_template.html
@@ -7,7 +7,7 @@
{{ title }}
-
+
diff --git a/frappe/public/js/barcode_scanner.bundle.js b/frappe/public/js/barcode_scanner.bundle.js
new file mode 100644
index 0000000000..294f20c08f
--- /dev/null
+++ b/frappe/public/js/barcode_scanner.bundle.js
@@ -0,0 +1 @@
+import "./frappe/barcode_scanner/quagga";
diff --git a/frappe/public/js/bootstrap-4-web.bundle.js b/frappe/public/js/bootstrap-4-web.bundle.js
new file mode 100644
index 0000000000..2e3c4d7145
--- /dev/null
+++ b/frappe/public/js/bootstrap-4-web.bundle.js
@@ -0,0 +1,64 @@
+
+// multilevel dropdown
+$('.dropdown-menu a.dropdown-toggle').on('click', function (e) {
+ e.preventDefault();
+ e.stopImmediatePropagation();
+ if (!$(this).next().hasClass('show')) {
+ $(this).parents('.dropdown-menu').first().find('.show').removeClass("show");
+ }
+ var $subMenu = $(this).next(".dropdown-menu");
+ $subMenu.toggleClass('show');
+
+
+ $(this).parents('li.nav-item.dropdown.show').on('hidden.bs.dropdown', function () {
+ $('.dropdown-submenu .show').removeClass("show");
+ });
+
+ return false;
+});
+
+frappe.get_modal = function (title, content) {
+ return $(
+ ``
+ );
+};
+
+frappe.ui.Dialog = class Dialog extends frappe.ui.Dialog {
+ get_primary_btn() {
+ return this.$wrapper.find(".modal-footer .btn-primary");
+ }
+
+ set_primary_action(label, click) {
+ this.$wrapper.find('.modal-footer').removeClass('hidden');
+ return super.set_primary_action(label, click)
+ .removeClass('hidden');
+ }
+
+ make() {
+ super.make();
+ if (this.fields) {
+ this.$wrapper.find('.section-body').addClass('w-100');
+ }
+ }
+};
diff --git a/frappe/public/js/chat.bundle.js b/frappe/public/js/chat.bundle.js
new file mode 100644
index 0000000000..5f9a91ebb7
--- /dev/null
+++ b/frappe/public/js/chat.bundle.js
@@ -0,0 +1 @@
+import "./frappe/chat";
diff --git a/frappe/public/js/checkout.bundle.js b/frappe/public/js/checkout.bundle.js
new file mode 100644
index 0000000000..954e838fa8
--- /dev/null
+++ b/frappe/public/js/checkout.bundle.js
@@ -0,0 +1 @@
+import "./integrations/razorpay";
diff --git a/frappe/public/js/controls.bundle.js b/frappe/public/js/controls.bundle.js
new file mode 100644
index 0000000000..30b5d43905
--- /dev/null
+++ b/frappe/public/js/controls.bundle.js
@@ -0,0 +1,18 @@
+import "air-datepicker/dist/js/datepicker.min.js";
+import "air-datepicker/dist/js/i18n/datepicker.cs.js";
+import "air-datepicker/dist/js/i18n/datepicker.da.js";
+import "air-datepicker/dist/js/i18n/datepicker.de.js";
+import "air-datepicker/dist/js/i18n/datepicker.en.js";
+import "air-datepicker/dist/js/i18n/datepicker.es.js";
+import "air-datepicker/dist/js/i18n/datepicker.fi.js";
+import "air-datepicker/dist/js/i18n/datepicker.fr.js";
+import "air-datepicker/dist/js/i18n/datepicker.hu.js";
+import "air-datepicker/dist/js/i18n/datepicker.nl.js";
+import "air-datepicker/dist/js/i18n/datepicker.pl.js";
+import "air-datepicker/dist/js/i18n/datepicker.pt-BR.js";
+import "air-datepicker/dist/js/i18n/datepicker.pt.js";
+import "air-datepicker/dist/js/i18n/datepicker.ro.js";
+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";
diff --git a/frappe/public/js/data_import_tools.bundle.js b/frappe/public/js/data_import_tools.bundle.js
new file mode 100644
index 0000000000..b6e4c11968
--- /dev/null
+++ b/frappe/public/js/data_import_tools.bundle.js
@@ -0,0 +1 @@
+import "./frappe/data_import";
diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js
new file mode 100644
index 0000000000..66eb72cda0
--- /dev/null
+++ b/frappe/public/js/desk.bundle.js
@@ -0,0 +1,105 @@
+import "./frappe/translate.js";
+import "./frappe/class.js";
+import "./frappe/polyfill.js";
+import "./frappe/provide.js";
+import "./frappe/assets.js";
+import "./frappe/format.js";
+import "./frappe/form/formatters.js";
+import "./frappe/dom.js";
+import "./frappe/ui/messages.js";
+import "./frappe/ui/keyboard.js";
+import "./frappe/ui/colors.js";
+import "./frappe/ui/sidebar.js";
+import "./frappe/ui/link_preview.js";
+
+import "./frappe/request.js";
+import "./frappe/socketio_client.js";
+import "./frappe/utils/utils.js";
+import "./frappe/event_emitter.js";
+import "./frappe/router.js";
+import "./frappe/router_history.js";
+import "./frappe/defaults.js";
+import "./frappe/roles_editor.js";
+import "./frappe/module_editor.js";
+import "./frappe/microtemplate.js";
+
+import "./frappe/ui/page.html";
+import "./frappe/ui/page.js";
+import "./frappe/ui/slides.js";
+// import "./frappe/ui/onboarding_dialog.js";
+import "./frappe/ui/find.js";
+import "./frappe/ui/iconbar.js";
+import "./frappe/form/layout.js";
+import "./frappe/ui/field_group.js";
+import "./frappe/form/link_selector.js";
+import "./frappe/form/multi_select_dialog.js";
+import "./frappe/ui/dialog.js";
+import "./frappe/ui/capture.js";
+import "./frappe/ui/app_icon.js";
+import "./frappe/ui/theme_switcher.js";
+
+import "./frappe/model/model.js";
+import "./frappe/db.js";
+import "./frappe/model/meta.js";
+import "./frappe/model/sync.js";
+import "./frappe/model/create_new.js";
+import "./frappe/model/perm.js";
+import "./frappe/model/workflow.js";
+import "./frappe/model/user_settings.js";
+
+import "./frappe/utils/user.js";
+import "./frappe/utils/common.js";
+import "./frappe/utils/urllib.js";
+import "./frappe/utils/pretty_date.js";
+import "./frappe/utils/tools.js";
+import "./frappe/utils/datetime.js";
+import "./frappe/utils/number_format.js";
+import "./frappe/utils/help.js";
+import "./frappe/utils/help_links.js";
+import "./frappe/utils/address_and_contact.js";
+import "./frappe/utils/preview_email.js";
+import "./frappe/utils/file_manager.js";
+
+import "./frappe/upload.js";
+import "./frappe/ui/tree.js";
+
+import "./frappe/views/container.js";
+import "./frappe/views/breadcrumbs.js";
+import "./frappe/views/factory.js";
+import "./frappe/views/pageview.js";
+
+import "./frappe/ui/toolbar/awesome_bar.js";
+// import "./frappe/ui/toolbar/energy_points_notifications.js";
+import "./frappe/ui/notifications/notifications.js";
+import "./frappe/ui/toolbar/search.js";
+import "./frappe/ui/toolbar/tag_utils.js";
+import "./frappe/ui/toolbar/search.html";
+import "./frappe/ui/toolbar/search_utils.js";
+import "./frappe/ui/toolbar/about.js";
+import "./frappe/ui/toolbar/navbar.html";
+import "./frappe/ui/toolbar/toolbar.js";
+// import "./frappe/ui/toolbar/notifications.js";
+import "./frappe/views/communication.js";
+import "./frappe/views/translation_manager.js";
+import "./frappe/views/workspace/workspace.js";
+
+import "./frappe/widgets/widget_group.js";
+
+import "./frappe/ui/sort_selector.html";
+import "./frappe/ui/sort_selector.js";
+
+import "./frappe/change_log.html";
+import "./frappe/ui/workspace_loading_skeleton.html";
+import "./frappe/desk.js";
+import "./frappe/query_string.js";
+
+// import "./frappe/ui/comment.js";
+
+import "./frappe/chat.js";
+import "./frappe/utils/energy_point_utils.js";
+import "./frappe/utils/dashboard_utils.js";
+import "./frappe/ui/chart.js";
+import "./frappe/ui/datatable.js";
+import "./frappe/ui/driver.js";
+import "./frappe/ui/plyr.js";
+import "./frappe/barcode_scanner/index.js";
diff --git a/frappe/public/js/dialog.bundle.js b/frappe/public/js/dialog.bundle.js
new file mode 100644
index 0000000000..3100b42ca7
--- /dev/null
+++ b/frappe/public/js/dialog.bundle.js
@@ -0,0 +1,7 @@
+import "./frappe/dom.js";
+import "./frappe/form/formatters.js";
+import "./frappe/form/layout.js";
+import "./frappe/ui/field_group.js";
+import "./frappe/form/link_selector.js";
+import "./frappe/form/multi_select_dialog.js";
+import "./frappe/ui/dialog.js";
diff --git a/frappe/public/js/form.bundle.js b/frappe/public/js/form.bundle.js
new file mode 100644
index 0000000000..5bed5c2cb8
--- /dev/null
+++ b/frappe/public/js/form.bundle.js
@@ -0,0 +1,17 @@
+import "./frappe/form/templates/address_list.html";
+import "./frappe/form/templates/contact_list.html";
+import "./frappe/form/templates/form_dashboard.html";
+import "./frappe/form/templates/form_footer.html";
+import "./frappe/form/templates/form_links.html";
+import "./frappe/form/templates/form_sidebar.html";
+import "./frappe/form/templates/print_layout.html";
+import "./frappe/form/templates/report_links.html";
+import "./frappe/form/templates/set_sharing.html";
+import "./frappe/form/templates/timeline_message_box.html";
+import "./frappe/form/templates/users_in_sidebar.html";
+
+import "./frappe/form/controls/control.js";
+import "./frappe/views/formview.js";
+import "./frappe/form/form.js";
+import "./frappe/meta_tag.js";
+
diff --git a/frappe/public/js/frappe-web.bundle.js b/frappe/public/js/frappe-web.bundle.js
new file mode 100644
index 0000000000..9f7875f96b
--- /dev/null
+++ b/frappe/public/js/frappe-web.bundle.js
@@ -0,0 +1,26 @@
+import "./jquery-bootstrap";
+import "./frappe/class.js";
+import "./frappe/polyfill.js";
+import "./lib/md5.min.js";
+import "./frappe/provide.js";
+import "./frappe/format.js";
+import "./frappe/utils/number_format.js";
+import "./frappe/utils/utils.js";
+import "./frappe/utils/common.js";
+import "./frappe/ui/messages.js";
+import "./frappe/translate.js";
+import "./frappe/utils/pretty_date.js";
+import "./frappe/microtemplate.js";
+import "./frappe/query_string.js";
+
+import "./frappe/upload.js";
+
+import "./frappe/model/meta.js";
+import "./frappe/model/model.js";
+import "./frappe/model/perm.js";
+
+import "./bootstrap-4-web.bundle";
+
+
+import "../../website/js/website.js";
+import "./frappe/socketio_client.js";
diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js
index 76441af235..3fca8640f3 100644
--- a/frappe/public/js/frappe/assets.js
+++ b/frappe/public/js/frappe/assets.js
@@ -9,7 +9,14 @@ frappe.require = function(items, callback) {
if(typeof items === "string") {
items = [items];
}
- frappe.assets.execute(items, callback);
+ items = items.map(item => frappe.assets.bundled_asset(item));
+
+ return new Promise(resolve => {
+ frappe.assets.execute(items, () => {
+ resolve();
+ callback && callback();
+ });
+ });
};
frappe.assets = {
@@ -160,4 +167,11 @@ frappe.assets = {
frappe.dom.set_style(txt);
}
},
+
+ bundled_asset(path) {
+ if (!path.startsWith('/assets') && path.includes('.bundle.')) {
+ return frappe.boot.assets_json[path] || path;
+ }
+ return path;
+ }
};
diff --git a/frappe/public/js/frappe/barcode_scanner/index.js b/frappe/public/js/frappe/barcode_scanner/index.js
index c5e7a7600f..fa3975b578 100644
--- a/frappe/public/js/frappe/barcode_scanner/index.js
+++ b/frappe/public/js/frappe/barcode_scanner/index.js
@@ -13,7 +13,7 @@ frappe.barcode.scan_barcode = function() {
}
}, reject);
} else {
- frappe.require('/assets/js/barcode_scanner.min.js', () => {
+ frappe.require('barcode_scanner.bundle.js', () => {
frappe.barcode.get_barcode().then(barcode => {
resolve(barcode);
});
diff --git a/frappe/public/js/frappe/build_events/BuildError.vue b/frappe/public/js/frappe/build_events/BuildError.vue
new file mode 100644
index 0000000000..6e10852719
--- /dev/null
+++ b/frappe/public/js/frappe/build_events/BuildError.vue
@@ -0,0 +1,111 @@
+
+
+
+
+
diff --git a/frappe/public/js/frappe/build_events/BuildSuccess.vue b/frappe/public/js/frappe/build_events/BuildSuccess.vue
new file mode 100644
index 0000000000..75a365fdc2
--- /dev/null
+++ b/frappe/public/js/frappe/build_events/BuildSuccess.vue
@@ -0,0 +1,52 @@
+
+
+
+
+
diff --git a/frappe/public/js/frappe/build_events/build_events.bundle.js b/frappe/public/js/frappe/build_events/build_events.bundle.js
new file mode 100644
index 0000000000..6c8986af3f
--- /dev/null
+++ b/frappe/public/js/frappe/build_events/build_events.bundle.js
@@ -0,0 +1,48 @@
+import BuildError from "./BuildError.vue";
+import BuildSuccess from "./BuildSuccess.vue";
+
+let $container = $("#build-events-overlay");
+let success = null;
+let error = null;
+
+frappe.realtime.on("build_event", data => {
+ if (data.success) {
+ show_build_success(data);
+ } else if (data.error) {
+ show_build_error(data);
+ }
+});
+
+function show_build_success() {
+ if (error) {
+ error.hide();
+ }
+ if (!success) {
+ let target = $('')
+ .appendTo($container)
+ .get(0);
+ let vm = new Vue({
+ el: target,
+ render: h => h(BuildSuccess)
+ });
+ success = vm.$children[0];
+ }
+ success.show();
+}
+
+function show_build_error(data) {
+ if (success) {
+ success.hide();
+ }
+ if (!error) {
+ let target = $('
')
+ .appendTo($container)
+ .get(0);
+ let vm = new Vue({
+ el: target,
+ render: h => h(BuildError)
+ });
+ error = vm.$children[0];
+ }
+ error.show(data);
+}
diff --git a/frappe/public/js/frappe/class.js b/frappe/public/js/frappe/class.js
index 4f6dd0dc97..79ef2792ae 100644
--- a/frappe/public/js/frappe/class.js
+++ b/frappe/public/js/frappe/class.js
@@ -80,4 +80,4 @@ To subclass, use:
// export
global.Class = Class;
- })(this);
\ No newline at end of file
+ })(window);
diff --git a/frappe/public/js/frappe/data_import/data_exporter.js b/frappe/public/js/frappe/data_import/data_exporter.js
index dee4839b34..03e6288856 100644
--- a/frappe/public/js/frappe/data_import/data_exporter.js
+++ b/frappe/public/js/frappe/data_import/data_exporter.js
@@ -72,8 +72,8 @@ frappe.data_import.DataExporter = class DataExporter {
let child_fieldname = df.fieldname;
let label = df.reqd
? // prettier-ignore
- __('{0} ({1}) (1 row mandatory)', [df.label || df.fieldname, doctype])
- : __('{0} ({1})', [df.label || df.fieldname, doctype]);
+ __('{0} ({1}) (1 row mandatory)', [__(df.label || df.fieldname), __(doctype)])
+ : __('{0} ({1})', [__(df.label || df.fieldname), __(doctype)]);
return {
label,
fieldname: child_fieldname,
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 6bcd20c494..46812f5fb6 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -24,12 +24,12 @@ $(document).ready(function() {
frappe.start_app();
});
-frappe.Application = Class.extend({
- init: function() {
+frappe.Application = class Application {
+ constructor() {
this.startup();
- },
+ }
- startup: function() {
+ startup() {
frappe.socketio.init();
frappe.model.init();
@@ -115,7 +115,7 @@ frappe.Application = Class.extend({
});
// listen to build errors
- this.setup_build_error_listener();
+ this.setup_build_events();
if (frappe.sys_defaults.email_user_password) {
var email_list = frappe.sys_defaults.email_user_password.split(',');
@@ -160,7 +160,7 @@ frappe.Application = Class.extend({
}, 600000); // check every 10 minutes
}
}
- },
+ }
set_route() {
frappe.flags.setting_original_route = true;
@@ -175,14 +175,14 @@ frappe.Application = Class.extend({
frappe.router.on('change', () => {
$(".tooltip").hide();
});
- },
+ }
setup_frappe_vue() {
Vue.prototype.__ = window.__;
Vue.prototype.frappe = window.frappe;
- },
+ }
- set_password: function(user) {
+ set_password(user) {
var me=this;
frappe.call({
method: 'frappe.core.doctype.user.user.get_email_awaiting',
@@ -199,9 +199,9 @@ frappe.Application = Class.extend({
}
}
});
- },
+ }
- email_password_prompt: function(email_account,user,i) {
+ email_password_prompt(email_account,user,i) {
var me = this;
let d = new frappe.ui.Dialog({
title: __('Password missing in Email Account'),
@@ -255,8 +255,8 @@ frappe.Application = Class.extend({
});
});
d.show();
- },
- load_bootinfo: function() {
+ }
+ load_bootinfo() {
if(frappe.boot) {
this.setup_workspaces();
frappe.model.sync(frappe.boot.docs);
@@ -278,7 +278,7 @@ frappe.Application = Class.extend({
} else {
this.set_as_guest();
}
- },
+ }
setup_workspaces() {
frappe.modules = {};
@@ -289,26 +289,26 @@ frappe.Application = Class.extend({
}
if (!frappe.workspaces['home']) {
// default workspace is settings for Frappe
- frappe.workspaces['home'] = frappe.workspaces['build'];
+ frappe.workspaces['home'] = frappe.workspaces[Object.keys(frappe.workspaces)[0]];
}
- },
+ }
- load_user_permissions: function() {
+ load_user_permissions() {
frappe.defaults.update_user_permissions();
frappe.realtime.on('update_user_permissions', frappe.utils.debounce(() => {
frappe.defaults.update_user_permissions();
}, 500));
- },
+ }
- check_metadata_cache_status: function() {
+ check_metadata_cache_status() {
if(frappe.boot.metadata_version != localStorage.metadata_version) {
frappe.assets.clear_local_storage();
frappe.assets.init_local_storage();
}
- },
+ }
- set_globals: function() {
+ set_globals() {
frappe.session.user = frappe.boot.user.name;
frappe.session.logged_in_user = frappe.boot.user.name;
frappe.session.user_email = frappe.boot.user.email;
@@ -360,8 +360,8 @@ frappe.Application = Class.extend({
}
}
});
- },
- sync_pages: function() {
+ }
+ sync_pages() {
// clear cached pages if timestamp is not found
if(localStorage["page_info"]) {
frappe.boot.allowed_pages = [];
@@ -376,8 +376,8 @@ frappe.Application = Class.extend({
frappe.boot.allowed_pages = Object.keys(frappe.boot.page_info);
}
localStorage["page_info"] = JSON.stringify(frappe.boot.page_info);
- },
- set_as_guest: function() {
+ }
+ set_as_guest() {
frappe.session.user = 'Guest';
frappe.session.user_email = '';
frappe.session.user_fullname = 'Guest';
@@ -385,23 +385,23 @@ frappe.Application = Class.extend({
frappe.user_defaults = {};
frappe.user_roles = ['Guest'];
frappe.sys_defaults = {};
- },
- make_page_container: function() {
+ }
+ make_page_container() {
if ($("#body").length) {
$(".splash").remove();
frappe.temp_container = $("
")
.appendTo("body");
frappe.container = new frappe.views.Container();
}
- },
- make_nav_bar: function() {
+ }
+ make_nav_bar() {
// toolbar
if(frappe.boot && frappe.boot.home_page!=='setup-wizard') {
frappe.frappe_toolbar = new frappe.ui.toolbar.Toolbar();
}
- },
- logout: function() {
+ }
+ logout() {
var me = this;
me.logged_out = true;
return frappe.call({
@@ -413,8 +413,8 @@ frappe.Application = Class.extend({
me.redirect_to_login();
}
});
- },
- handle_session_expired: function() {
+ }
+ handle_session_expired() {
if(!frappe.app.session_expired_dialog) {
var dialog = new frappe.ui.Dialog({
title: __('Session Expired'),
@@ -464,38 +464,43 @@ frappe.Application = Class.extend({
'background-color': '#4B4C9D'
});
}
- },
- redirect_to_login: function() {
+ }
+ redirect_to_login() {
window.location.href = '/';
- },
- set_favicon: function() {
+ }
+ set_favicon() {
var link = $('link[type="image/x-icon"]').remove().attr("href");
$('
').appendTo("head");
$('
').appendTo("head");
- },
- trigger_primary_action: function() {
- if(window.cur_dialog && cur_dialog.display) {
- // trigger primary
- cur_dialog.get_primary_btn().trigger("click");
- } else if(cur_frm && cur_frm.page.btn_primary.is(':visible')) {
- cur_frm.page.btn_primary.trigger('click');
- } else if(frappe.container.page.save_action) {
- frappe.container.page.save_action();
- }
- },
+ }
+ trigger_primary_action() {
+ // to trigger change event on active input before triggering primary action
+ $(document.activeElement).blur();
+ // wait for possible JS validations triggered after blur (it might change primary button)
+ setTimeout(() => {
+ if (window.cur_dialog && cur_dialog.display) {
+ // trigger primary
+ cur_dialog.get_primary_btn().trigger("click");
+ } else if (cur_frm && cur_frm.page.btn_primary.is(':visible')) {
+ cur_frm.page.btn_primary.trigger('click');
+ } else if (frappe.container.page.save_action) {
+ frappe.container.page.save_action();
+ }
+ }, 100);
+ }
- set_rtl: function() {
+ set_rtl() {
if (frappe.utils.is_rtl()) {
var ls = document.createElement('link');
ls.rel="stylesheet";
ls.type = "text/css";
- ls.href= "/assets/css/frappe-rtl.css";
+ ls.href= frappe.assets.bundled_asset("frappe-rtl.bundle.css");
document.getElementsByTagName('head')[0].appendChild(ls);
$('body').addClass('frappe-rtl');
}
- },
+ }
- show_change_log: function() {
+ show_change_log() {
var me = this;
let change_log = frappe.boot.change_log;
@@ -526,15 +531,15 @@ frappe.Application = Class.extend({
});
me.show_notes();
};
- },
+ }
- show_update_available: () => {
+ show_update_available() {
frappe.call({
"method": "frappe.utils.change_log.show_update_popup"
});
- },
+ }
- setup_analytics: function() {
+ setup_analytics() {
if(window.mixpanel) {
window.mixpanel.identify(frappe.session.user);
window.mixpanel.people.set({
@@ -544,17 +549,17 @@ frappe.Application = Class.extend({
"$email": frappe.session.user
});
}
- },
+ }
add_browser_class() {
$('html').addClass(frappe.utils.get_browser().name.toLowerCase());
- },
+ }
set_fullwidth_if_enabled() {
frappe.ui.toolbar.set_fullwidth_if_enabled();
- },
+ }
- show_notes: function() {
+ show_notes() {
var me = this;
if(frappe.boot.notes.length) {
frappe.boot.notes.forEach(function(note) {
@@ -581,21 +586,19 @@ frappe.Application = Class.extend({
}
});
}
- },
+ }
- setup_build_error_listener() {
+ setup_build_events() {
if (frappe.boot.developer_mode) {
- frappe.realtime.on('build_error', (data) => {
- console.log(data);
- });
+ frappe.require("build_events.bundle.js");
}
- },
+ }
setup_energy_point_listeners() {
frappe.realtime.on('energy_point_alert', (message) => {
frappe.show_alert(message);
});
- },
+ }
setup_copy_doc_listener() {
$('body').on('paste', (e) => {
@@ -629,7 +632,7 @@ frappe.Application = Class.extend({
}
});
}
-});
+}
frappe.get_module = function(m, default_module) {
var module = frappe.modules[m] || default_module;
diff --git a/frappe/public/js/frappe/form/controls/attach.js b/frappe/public/js/frappe/form/controls/attach.js
index 604510bb52..672087ddc2 100644
--- a/frappe/public/js/frappe/form/controls/attach.js
+++ b/frappe/public/js/frappe/form/controls/attach.js
@@ -1,5 +1,5 @@
-frappe.ui.form.ControlAttach = frappe.ui.form.ControlData.extend({
- make_input: function() {
+frappe.ui.form.ControlAttach = class ControlAttach extends frappe.ui.form.ControlData {
+ make_input() {
let me = this;
this.$input = $('
').appendTo(this.parent);
}
- },
- toggle_label: function(show) {
+ }
+ toggle_label(show) {
this.$wrapper.find(".control-label").toggleClass("hide", !show);
- },
- toggle_description: function(show) {
+ }
+ toggle_description(show) {
this.$wrapper.find(".help-box").toggleClass("hide", !show);
- },
- set_input_areas: function() {
+ }
+ set_input_areas() {
if(this.only_input) {
this.input_area = this.wrapper;
} else {
@@ -43,17 +43,17 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
// like links, currencies, HTMLs etc.
this.disp_area = this.$wrapper.find(".control-value").get(0);
}
- },
- set_max_width: function() {
- if(this.horizontal) {
+ }
+ set_max_width() {
+ if(this.constructor.horizontal) {
this.$wrapper.addClass("input-max-width");
}
- },
+ }
// update input value, label, description
// display (show/hide/read-only),
// mandatory style on refresh
- refresh_input: function() {
+ refresh_input() {
var me = this;
var make_input = function() {
if (!me.has_input) {
@@ -106,13 +106,13 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
me.set_bold();
me.set_required();
}
- },
+ }
can_write() {
return this.disp_status == "Write";
- },
+ }
- set_disp_area: function(value) {
+ set_disp_area(value) {
if(in_list(["Currency", "Int", "Float"], this.df.fieldtype)
&& (this.value === 0 || value === 0)) {
// to set the 0 value in readonly for currency, int, float field
@@ -126,8 +126,8 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
let doc = this.doc || (this.frm && this.frm.doc);
let display_value = frappe.format(value, this.df, { no_icon: true, inline: true }, doc);
this.disp_area && $(this.disp_area).html(display_value);
- },
- set_label: function(label) {
+ }
+ set_label(label) {
if(label) this.df.label = label;
if(this.only_input || this.df.label==this._label)
@@ -137,8 +137,8 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
this.label_span.innerHTML = (icon ? '
' : "") +
__(this.df.label) || " ";
this._label = this.df.label;
- },
- set_description: function(description) {
+ }
+ set_description(description) {
if (description !== undefined) {
this.df.description = description;
}
@@ -151,17 +151,17 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
this.set_empty_description();
}
this._description = this.df.description;
- },
- set_new_description: function(description) {
+ }
+ set_new_description(description) {
this.$wrapper.find(".help-box").html(description);
- },
- set_empty_description: function() {
+ }
+ set_empty_description() {
this.$wrapper.find(".help-box").html("");
- },
- set_mandatory: function(value) {
+ }
+ set_mandatory(value) {
this.$wrapper.toggleClass("has-error", Boolean(this.df.reqd && is_null(value)));
- },
- set_invalid: function () {
+ }
+ set_invalid () {
let invalid = !!this.df.invalid;
if (this.grid) {
this.$wrapper.parents('.grid-static-col').toggleClass('invalid', invalid);
@@ -170,11 +170,11 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
} else {
this.$wrapper.toggleClass('has-error', invalid);
}
- },
+ }
set_required() {
this.label_area && $(this.label_area).toggleClass('reqd', Boolean(this.df.reqd));
- },
- set_bold: function() {
+ }
+ set_bold() {
if(this.$input) {
this.$input.toggleClass("bold", !!(this.df.bold || this.df.reqd));
}
@@ -182,4 +182,4 @@ frappe.ui.form.ControlInput = frappe.ui.form.Control.extend({
$(this.disp_area).toggleClass("bold", !!(this.df.bold || this.df.reqd));
}
}
-});
+};
diff --git a/frappe/public/js/frappe/form/controls/button.js b/frappe/public/js/frappe/form/controls/button.js
index d09e9c3a95..5e80ebfa0e 100644
--- a/frappe/public/js/frappe/form/controls/button.js
+++ b/frappe/public/js/frappe/form/controls/button.js
@@ -1,9 +1,9 @@
-frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
+frappe.ui.form.ControlButton = class ControlButton extends frappe.ui.form.ControlData {
can_write() {
// should be always true in case of button
return true;
- },
- make_input: function() {
+ }
+ make_input() {
var me = this;
const btn_type = this.df.primary ? 'btn-primary': 'btn-default';
const btn_size = this.df.btn_size
@@ -18,8 +18,8 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
this.set_input_attributes();
this.has_input = true;
this.toggle_label(false);
- },
- onclick: function() {
+ }
+ onclick() {
if (this.frm && this.frm.doc) {
if (this.frm.script_manager.has_handlers(this.df.fieldname, this.doctype)) {
this.frm.script_manager.trigger(this.df.fieldname, this.doctype, this.docname);
@@ -31,8 +31,8 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
} else if (this.df.click) {
this.df.click();
}
- },
- run_server_script: function() {
+ }
+ run_server_script() {
// DEPRECATE
var me = this;
if(this.frm && this.frm.docname) {
@@ -47,18 +47,18 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
}
});
}
- },
+ }
hide() {
this.$input.hide();
- },
- set_input_areas: function() {
- this._super();
+ }
+ set_input_areas() {
+ super.set_input_areas();
$(this.disp_area).removeClass().addClass("hide");
- },
- set_empty_description: function() {
+ }
+ set_empty_description() {
this.$wrapper.find(".help-box").empty().toggle(false);
- },
- set_label: function(label) {
+ }
+ set_label(label) {
if (label) {
this.df.label = label;
}
@@ -66,4 +66,4 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
$(this.label_span).html(" ");
this.$input && this.$input.html(label);
}
-});
+};
diff --git a/frappe/public/js/frappe/form/controls/check.js b/frappe/public/js/frappe/form/controls/check.js
index c8dc0df962..1209f52e6d 100644
--- a/frappe/public/js/frappe/form/controls/check.js
+++ b/frappe/public/js/frappe/form/controls/check.js
@@ -1,6 +1,7 @@
-frappe.ui.form.ControlCheck = frappe.ui.form.ControlData.extend({
- input_type: "checkbox",
- make_wrapper: function() {
+frappe.ui.form.ControlCheck = class ControlCheck extends frappe.ui.form.ControlData {
+ static html_element = "input"
+ static input_type = "checkbox"
+ make_wrapper() {
this.$wrapper = $(`
`).appendTo(this.parent);
- },
- set_input_areas: function() {
- this.label_area = this.label_span = this.$wrapper.find(".label-area").get(0);
+ }
+ set_input_areas() {
this.input_area = this.$wrapper.find(".input-area").get(0);
+ if (this.only_input) return;
+
+ this.label_area = this.label_span = this.$wrapper.find(".label-area").get(0);
this.disp_area = this.$wrapper.find(".disp-area").get(0);
- },
- make_input: function() {
- this._super();
+ }
+ make_input() {
+ super.make_input();
this.$input.removeClass("form-control");
- },
- get_input_value: function() {
+ }
+ get_input_value() {
return this.input && this.input.checked ? 1 : 0;
- },
- validate: function(value) {
+ }
+ validate(value) {
return cint(value);
- },
- set_input: function(value) {
+ }
+ set_input(value) {
value = cint(value);
if(this.input) {
this.input.checked = (value ? 1 : 0);
@@ -36,4 +39,4 @@ frappe.ui.form.ControlCheck = frappe.ui.form.ControlData.extend({
this.set_mandatory(value);
this.set_disp_area(value);
}
-});
+};
diff --git a/frappe/public/js/frappe/form/controls/code.js b/frappe/public/js/frappe/form/controls/code.js
index 9600763588..9155333ee3 100644
--- a/frappe/public/js/frappe/form/controls/code.js
+++ b/frappe/public/js/frappe/form/controls/code.js
@@ -1,8 +1,8 @@
-frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
+frappe.ui.form.ControlCode = class ControlCode extends frappe.ui.form.ControlText {
make_input() {
if (this.editor) return;
this.load_lib().then(() => this.make_ace_editor());
- },
+ }
make_ace_editor() {
if (this.editor) return;
@@ -34,6 +34,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
// setup autocompletion when it is set the first time
Object.defineProperty(this.df, 'autocompletions', {
+ configurable: true,
get() {
return this._autocompletions || [];
},
@@ -42,7 +43,7 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
this.df._autocompletions = value;
}
});
- },
+ }
setup_autocompletion() {
if (this._autocompletion_setup) return;
@@ -82,20 +83,20 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
});
});
this._autocompletion_setup = true;
- },
+ }
refresh_height() {
this.ace_editor_target.css('height', this.expanded ? 600 : 300);
this.editor.resize();
- },
+ }
toggle_label() {
this.$expand_button && this.$expand_button.text(this.get_button_label());
- },
+ }
get_button_label() {
return this.expanded ? __('Collapse', null, 'Shrink code field.') : __('Expand', null, 'Enlarge code field.');
- },
+ }
set_language() {
const language_map = {
@@ -122,14 +123,14 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
const ace_language_mode = language_map[language] || '';
this.editor.session.setMode(ace_language_mode);
this.editor.setKeyboardHandler('ace/keyboard/vscode');
- },
+ }
parse(value) {
if (value == null) {
value = "";
}
return value;
- },
+ }
set_formatted_input(value) {
return this.load_lib().then(() => {
@@ -138,11 +139,11 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
if (value === this.get_input_value()) return;
this.editor.session.setValue(value);
});
- },
+ }
get_input_value() {
return this.editor ? this.editor.session.getValue() : '';
- },
+ }
load_lib() {
if (this.library_loaded) return this.library_loaded;
@@ -162,4 +163,4 @@ frappe.ui.form.ControlCode = frappe.ui.form.ControlText.extend({
return this.library_loaded;
}
-});
+};
diff --git a/frappe/public/js/frappe/form/controls/color.js b/frappe/public/js/frappe/form/controls/color.js
index 8a60f3e3da..7e8e25fac9 100644
--- a/frappe/public/js/frappe/form/controls/color.js
+++ b/frappe/public/js/frappe/form/controls/color.js
@@ -1,12 +1,13 @@
import Picker from '../../color_picker/color_picker';
-frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
- make_input: function () {
+frappe.ui.form.ControlColor = class ControlColor extends frappe.ui.form.ControlData {
+ make_input() {
this.df.placeholder = this.df.placeholder || __('Choose a color');
- this._super();
+ super.make_input();
this.make_color_input();
- },
- make_color_input: function () {
+ }
+
+ make_color_input() {
let picker_wrapper = $('
');
this.picker = new Picker({
parent: picker_wrapper[0],
@@ -73,27 +74,31 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
this.$wrapper.popover('hide');
});
});
- },
+ }
+
refresh() {
- this._super();
+ super.refresh();
let color = this.get_color();
if (this.picker && this.picker.color !== color) {
this.picker.color = color;
this.picker.refresh();
}
- },
- set_formatted_input: function(value) {
- this._super(value);
+ }
+
+ set_formatted_input(value) {
+ super.set_formatted_input(value);
this.$input.val(value);
this.selected_color.css({
"background-color": value || 'transparent',
});
this.selected_color.toggleClass('no-value', !value);
- },
+ }
+
get_color() {
return this.validate(this.get_value());
- },
- validate: function (value) {
+ }
+
+ validate(value) {
if (value === '') {
return '';
}
@@ -103,4 +108,4 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
}
return null;
}
-});
+};
diff --git a/frappe/public/js/frappe/form/controls/comment.js b/frappe/public/js/frappe/form/controls/comment.js
index 7efc60b61d..7c10b61366 100644
--- a/frappe/public/js/frappe/form/controls/comment.js
+++ b/frappe/public/js/frappe/form/controls/comment.js
@@ -3,7 +3,7 @@ import Mention from './quill-mention/quill.mention';
Quill.register('modules/mention', Mention, true);
-frappe.ui.form.ControlComment = frappe.ui.form.ControlTextEditor.extend({
+frappe.ui.form.ControlComment = class ControlComment extends frappe.ui.form.ControlTextEditor {
make_wrapper() {
this.comment_wrapper = !this.no_wrapper ? $(`
-
-
- 
-
+
+ 
+
+
+ 
+
+
+ 
-
- 
-
+
+
' + time_zone; } } - this._super(); - }, - set_datepicker: function() { - this._super(); + super.set_description(); + } + set_datepicker() { + super.set_datepicker(); if (this.datepicker.opts.timeFormat.indexOf('s') == -1) { // No seconds in time format const $tp = this.datepicker.timepicker; @@ -36,4 +36,4 @@ frappe.ui.form.ControlDatetime = frappe.ui.form.ControlDate.extend({ $tp.$secondsText.prev().css('display', 'none'); } } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/duration.js b/frappe/public/js/frappe/form/controls/duration.js index e70afd6e65..361d10982e 100644 --- a/frappe/public/js/frappe/form/controls/duration.js +++ b/frappe/public/js/frappe/form/controls/duration.js @@ -1,10 +1,10 @@ -frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ - make_input: function() { - this._super(); +frappe.ui.form.ControlDuration = class ControlDuration extends frappe.ui.form.ControlData { + make_input() { + super.make_input(); this.make_picker(); - }, + } - make_picker: function() { + make_picker() { this.inputs = []; this.set_duration_options(); this.$picker = $( @@ -21,9 +21,9 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ this.$picker.hide(); this.bind_events(); this.refresh(); - }, + } - build_numeric_input: function(label, hidden, max) { + build_numeric_input(label, hidden, max) { let $duration_input = $(` `); @@ -47,13 +47,13 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ } $control.prepend($input); $control.appendTo(this.$picker.find(".picker-row")); - }, + } set_duration_options() { this.duration_options = frappe.utils.get_duration_options(this.df); - }, + } - set_duration_picker_value: function(value) { + set_duration_picker_value(value) { let total_duration = frappe.utils.seconds_to_duration(value, this.duration_options); if (this.$picker) { @@ -61,9 +61,9 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ this.inputs[duration].prop("value", total_duration[duration]); }); } - }, + } - bind_events: function() { + bind_events() { // flag to handle the display property of the picker let clicked = false; @@ -103,21 +103,21 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ this.$picker.hide(); } }); - }, + } get_value() { return cint(this.value); - }, + } - refresh_input: function() { - this._super(); + refresh_input() { + super.refresh_input(); this.set_duration_options(); this.set_duration_picker_value(this.value); - }, + } - format_for_input: function(value) { + format_for_input(value) { return frappe.utils.get_formatted_duration(value, this.duration_options); - }, + } get_duration() { // returns an object of days, hours, minutes and seconds from the inputs array @@ -138,7 +138,7 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ } } return total_duration; - }, + } is_duration_picker_set(inputs) { let is_set = false; @@ -149,4 +149,4 @@ frappe.ui.form.ControlDuration = frappe.ui.form.ControlData.extend({ }); return is_set; } -}); \ No newline at end of file +}; diff --git a/frappe/public/js/frappe/form/controls/dynamic_link.js b/frappe/public/js/frappe/form/controls/dynamic_link.js index 00bb02a5fc..2c5661ca87 100644 --- a/frappe/public/js/frappe/form/controls/dynamic_link.js +++ b/frappe/public/js/frappe/form/controls/dynamic_link.js @@ -1,5 +1,5 @@ -frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ - get_options: function() { +frappe.ui.form.ControlDynamicLink = class ControlDynamicLink extends frappe.ui.form.ControlLink { + get_options() { let options = ''; if (this.df.get_options) { options = this.df.get_options(); @@ -28,5 +28,5 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({ } return options; - }, -}); + } +}; diff --git a/frappe/public/js/frappe/form/controls/float.js b/frappe/public/js/frappe/form/controls/float.js index 306c05dc1b..89f8f23cc5 100644 --- a/frappe/public/js/frappe/form/controls/float.js +++ b/frappe/public/js/frappe/form/controls/float.js @@ -1,27 +1,27 @@ -frappe.ui.form.ControlFloat = frappe.ui.form.ControlInt.extend({ - parse: function(value) { +frappe.ui.form.ControlFloat = class ControlFloat extends frappe.ui.form.ControlInt { + parse(value) { value = this.eval_expression(value); return isNaN(parseFloat(value)) ? null : flt(value, this.get_precision()); - }, + } - format_for_input: function(value) { + format_for_input(value) { var number_format; if (this.df.fieldtype==="Float" && this.df.options && this.df.options.trim()) { number_format = this.get_number_format(); } var formatted_value = format_number(value, number_format, this.get_precision()); return isNaN(Number(value)) ? "" : formatted_value; - }, + } - get_number_format: function() { + get_number_format() { var currency = frappe.meta.get_field_currency(this.df, this.get_doc()); return get_number_format(currency); - }, + } - get_precision: function() { + get_precision() { // round based on field precision or float precision, else don't round return this.df.precision || cint(frappe.boot.sysdefaults.float_precision, null); } -}); +}; frappe.ui.form.ControlPercent = frappe.ui.form.ControlFloat; diff --git a/frappe/public/js/frappe/form/controls/geolocation.js b/frappe/public/js/frappe/form/controls/geolocation.js index dfd0f4d174..080a1cbb48 100644 --- a/frappe/public/js/frappe/form/controls/geolocation.js +++ b/frappe/public/js/frappe/form/controls/geolocation.js @@ -1,11 +1,11 @@ frappe.provide('frappe.utils.utils'); -frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ - horizontal: false, +frappe.ui.form.ControlGeolocation = class ControlGeolocation extends frappe.ui.form.ControlData { + static horizontal = false make_wrapper() { // Create the elements for map area - this._super(); + super.make_wrapper(); let $input_wrapper = this.$wrapper.find('.control-input-wrapper'); this.map_id = frappe.dom.get_unique_id(); @@ -24,14 +24,14 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ this.make_map(); }); } - }, + } make_map() { this.bind_leaflet_map(); this.bind_leaflet_draw_control(); this.bind_leaflet_locate_control(); this.bind_leaflet_refresh_button(); - }, + } format_for_input(value) { if (!this.map) return; @@ -65,7 +65,7 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ } else if ((value===undefined) || (value == JSON.stringify(new L.FeatureGroup().toGeoJSON()))) { this.locate_control.start(); } - }, + } bind_leaflet_map() { var circleToGeoJSON = L.Circle.prototype.toGeoJSON; @@ -97,13 +97,13 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ L.tileLayer(frappe.utils.map_defaults.tiles, frappe.utils.map_defaults.options).addTo(this.map); - }, + } bind_leaflet_locate_control() { // To request location update and set location, sets current geolocation on load this.locate_control = L.control.locate({position:'topright'}); this.locate_control.addTo(this.map); - }, + } bind_leaflet_draw_control() { this.editableLayers = new L.FeatureGroup(); @@ -160,7 +160,7 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ this.editableLayers.removeLayer(layer); this.set_value(JSON.stringify(this.editableLayers.toGeoJSON())); }); - }, + } bind_leaflet_refresh_button() { L.easyButton({ @@ -177,7 +177,7 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ icon: 'fa fa-refresh' }] }).addTo(this.map); - }, + } add_non_group_layers(source_layer, target_group) { // https://gis.stackexchange.com/a/203773 @@ -189,11 +189,11 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlData.extend({ } else { target_group.addLayer(source_layer); } - }, + } clear_editable_layers() { this.editableLayers.eachLayer((l)=>{ this.editableLayers.removeLayer(l); }); } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/heading.js b/frappe/public/js/frappe/form/controls/heading.js index 7b9dd043f2..ccce412eaf 100644 --- a/frappe/public/js/frappe/form/controls/heading.js +++ b/frappe/public/js/frappe/form/controls/heading.js @@ -1,5 +1,5 @@ -frappe.ui.form.ControlHeading = frappe.ui.form.ControlHTML.extend({ - get_content: function() { +frappe.ui.form.ControlHeading = class ControlHeading extends frappe.ui.form.ControlHTML { + get_content() { return "
" + __(this.df.label) + "
"; } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/html.js b/frappe/public/js/frappe/form/controls/html.js index f8a3645705..b2f18d4ccc 100644 --- a/frappe/public/js/frappe/form/controls/html.js +++ b/frappe/public/js/frappe/form/controls/html.js @@ -1,13 +1,13 @@ -frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({ - make: function() { - this._super(); +frappe.ui.form.ControlHTML = class ControlHTML extends frappe.ui.form.Control { + make() { + super.make(); this.disp_area = this.wrapper; - }, - refresh_input: function() { + } + refresh_input() { var content = this.get_content(); if(content) this.$wrapper.html(content); - }, - get_content: function() { + } + get_content() { var content = this.df.options || ""; content = __(content); try { @@ -15,11 +15,11 @@ frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({ } catch (e) { return content; } - }, - html: function(html) { + } + html(html) { this.$wrapper.html(html || this.get_content()); - }, - set_value: function(html) { + } + set_value(html) { if(html.appendTo) { // jquery object html.appendTo(this.$wrapper.empty()); @@ -29,4 +29,4 @@ frappe.ui.form.ControlHTML = frappe.ui.form.Control.extend({ this.html(html); } } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/html_editor.js b/frappe/public/js/frappe/form/controls/html_editor.js index f708bdbd98..7d43112e6a 100644 --- a/frappe/public/js/frappe/form/controls/html_editor.js +++ b/frappe/public/js/frappe/form/controls/html_editor.js @@ -1,13 +1,13 @@ -frappe.ui.form.ControlHTMLEditor = frappe.ui.form.ControlMarkdownEditor.extend({ - editor_class: 'html', +frappe.ui.form.ControlHTMLEditor = class ControlHTMLEditor extends frappe.ui.form.ControlMarkdownEditor { + static editor_class = 'html'; set_language() { this.df.options = 'HTML'; - this._super(); - }, + super.set_language(); + } update_preview() { if (!this.markdown_preview) return; let value = this.get_value() || ''; value = frappe.dom.remove_script_and_style(value); this.markdown_preview.html(value); } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/image.js b/frappe/public/js/frappe/form/controls/image.js index 90de22138a..d175330947 100644 --- a/frappe/public/js/frappe/form/controls/image.js +++ b/frappe/public/js/frappe/form/controls/image.js @@ -1,12 +1,12 @@ -frappe.ui.form.ControlImage = frappe.ui.form.Control.extend({ - make: function() { - this._super(); +frappe.ui.form.ControlImage = class ControlImage extends frappe.ui.form.Control { + make() { + super.make(); this.$wrapper.css({"margin": "0px"}); this.$body = $("").appendTo(this.$wrapper) .css({"margin-bottom": "10px"}); $('').appendTo(this.$wrapper); - }, - refresh_input: function() { + } + refresh_input() { this.$body.empty(); var doc = this.get_doc(); @@ -19,4 +19,4 @@ frappe.ui.form.ControlImage = frappe.ui.form.Control.extend({ } return false; } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/int.js b/frappe/public/js/frappe/form/controls/int.js index aca3a85603..12652bf86e 100644 --- a/frappe/public/js/frappe/form/controls/int.js +++ b/frappe/public/js/frappe/form/controls/int.js @@ -1,13 +1,13 @@ -frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ - trigger_change_on_input_event: false, - make: function () { - this._super(); +frappe.ui.form.ControlInt = class ControlInt extends frappe.ui.form.ControlData { + static trigger_change_on_input_event = false + make () { + super.make(); // $(this.label_area).addClass('pull-right'); // $(this.disp_area).addClass('text-right'); - }, - make_input: function () { + } + make_input () { var me = this; - this._super(); + super.make_input(); this.$input // .addClass("text-right") .on("focus", function () { @@ -19,11 +19,11 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ }, 100); return false; }); - }, - validate: function (value) { + } + validate (value) { return this.parse(value); - }, - eval_expression: function (value) { + } + eval_expression (value) { if (typeof value === 'string') { if (value.match(/^[0-9+\-/* ]+$/)) { // If it is a string containing operators @@ -36,8 +36,8 @@ frappe.ui.form.ControlInt = frappe.ui.form.ControlData.extend({ } } return value; - }, - parse: function (value) { + } + parse (value) { return cint(this.eval_expression(value), null); } -}); +}; diff --git a/frappe/public/js/frappe/form/controls/link.js b/frappe/public/js/frappe/form/controls/link.js index c32c99f0ed..af92f3b7a9 100644 --- a/frappe/public/js/frappe/form/controls/link.js +++ b/frappe/public/js/frappe/form/controls/link.js @@ -8,9 +8,9 @@ import Awesomplete from 'awesomplete'; frappe.ui.form.recent_link_validations = {}; -frappe.ui.form.ControlLink = frappe.ui.form.ControlData.extend({ - trigger_change_on_input_event: false, - make_input: function() { +frappe.ui.form.ControlLink = class ControlLink extends frappe.ui.form.ControlData { + static trigger_change_on_input_event = false + make_input() { var me = this; $(`