From 435bbe2665a447048058660e86deb6ed2005c635 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Feb 2021 14:31:46 +0530 Subject: [PATCH 0001/1519] wip: refactor website routing and rendering --- frappe/tests/test_website_new.py | 20 ++ frappe/utils/boilerplate.py | 1 - frappe/website/serve.py | 276 ++++++++++++++++++++++++++ frappe/www/_test/static-file-test.png | Bin 0 -> 440 bytes 4 files changed, 296 insertions(+), 1 deletion(-) create mode 100644 frappe/tests/test_website_new.py create mode 100644 frappe/website/serve.py create mode 100644 frappe/www/_test/static-file-test.png diff --git a/frappe/tests/test_website_new.py b/frappe/tests/test_website_new.py new file mode 100644 index 0000000000..aa9e77d5ba --- /dev/null +++ b/frappe/tests/test_website_new.py @@ -0,0 +1,20 @@ +from __future__ import unicode_literals + +import unittest + +import frappe +from frappe.website import serve +from frappe.website.utils import get_home_page +from frappe.utils import set_request + +class TestWebsite(unittest.TestCase): + def test_static_page(self): + set_request(method='GET', path='/_test/static-file-test.png') + response = serve.StaticPage().get() + self.assertEquals(response.status_code, 200) + + def test_error_page(self): + set_request(method='GET', path='/error') + response = serve.TemplatePage().get() + self.assertEquals(response.status_code, 200) + print(response.get_data()) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 69d5726c34..e613c4d810 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -330,7 +330,6 @@ Configuration for docs """ # source_link = "https://github.com/[org_name]/{app_name}" -# docs_base_url = "https://[org_name].github.io/{app_name}" # headline = "App that does everything" # sub_heading = "Yes, you got that right the first time, everything" diff --git a/frappe/website/serve.py b/frappe/website/serve.py new file mode 100644 index 0000000000..3f3e1d4571 --- /dev/null +++ b/frappe/website/serve.py @@ -0,0 +1,276 @@ +import frappe +import os, mimetypes + +from werkzeug.wrappers import Response +from werkzeug.wsgi import wrap_file + +from frappe.website.render import (resolve_path, build_response) +from frappe.website.redirect import resolve_redirect +from frappe.website.router import get_start_folders +from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, + get_toc, get_next_link) +from frappe.website.doctype.website_settings.website_settings import get_website_settings + +def render(path=None, http_status_code=None): + """render html page""" + if not path: + path = frappe.local.request.path + + try: + path = path.strip('/ ') + resolve_redirect(path) + path = resolve_path(path) + data = None + + response = StaticPage(path).get() + if not response: + response = TemplatePage(path).get() + if not response: + response = DocTypePage(path).get() + if not response: + response = TemplatePage('404').get() + except frappe.PermissionError as e: + response = TemplatePage('403').get() + except: + response = TemplatePage('error').get() + + return response + +class WebPage(object): + def __init__(self, path=None): + self.headers = None + self.status_code = 200 + if not path: + path = frappe.local.request.path + self.path = path.strip('/ ') + + def get(self): + if self.validate(): + return self.render() + + def validate(self): + pass + + def render(self): + pass + +class StaticPage(WebPage): + def validate(self): + if ('.' not in self.path): + return False + extn = self.path.rsplit('.', 1)[-1] + if extn in ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json'): + return False + + if self.find_path_in_apps(): + return True + + return False + + def find_path_in_apps(self): + for app in frappe.get_installed_apps(): + file_path = frappe.get_app_path(app, 'www') + '/' + self.path + if os.path.exists(file_path): + self.file_path = file_path + return True + return False + + def render(self): + try: + f = open(self.file_path, 'rb') + except IOError: + raise NotFound + + response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True) + response.mimetype = mimetypes.guess_type(self.file_path)[0] or 'application/octet-stream' + return response + +class TemplatePage(WebPage): + def validate(self): + for app in frappe.get_installed_apps(frappe_last=True): + if self.find_page_in_app(app): + return True + + def find_page_in_app(self, app): + ''' + Searches for file matching the path in the /www and /templates/pages folders + ''' + app_path = frappe.get_app_path(app) + folders = get_start_folders() + + for dirname in folders: + search_path = os.path.join(app_path, dirname, self.path) + for p in self.get_index_path_options(search_path): + file_path = frappe.as_unicode(p) + if os.path.exists(file_path) and not os.path.isdir(file_path): + self.app = app + self.app_path = app_path + self.dirname = dirname + self.file_path = file_path + self.template_path = os.path.relpath(file_path, self.app_path) + return True + + def get_index_path_options(self, search_path): + return ( + search_path, + search_path + '.html', + search_path + '.md', + search_path + '/index.html', + search_path + '/index.md') + + def render(self): + return build_response(self.path, self.get_html(), self.status_code, self.headers) + + def get_html(self): + # context object should be separate from self for security + # because it will be accessed via the user defined template + self.context = frappe._dict() + + self.set_pymodule() + self.setup_template() + + if self.pymodule_name: + self.update_context() + + if self.source: + html = frappe.render_template(self.source, self.context) + + elif self.template_path: + html = self.render_template() + + html = self.update_toc(html) + + return html + + def set_pymodule(self): + ''' + A template may have a python module with a `get_context` method along with it in the + same folder. Also the hyphens will be coverted to underscore for python module names. + This method sets the pymodule_name if it exists. + ''' + self.basepath = self.template_path.rsplit('.', 1)[0] + self.pymodule_name = None + + # replace - with _ in the internal modules names + self.pymodule_path = os.path.join(self.basepath.replace("-", "_") + ".py") + + if os.path.exists(os.path.join(self.app_path, self.pymodule_path)): + self.pymodule_name = self.app + "." + self.pymodule_path.replace(os.path.sep, ".")[:-3] + + def setup_template(self): + '''Setup template source, frontmatter and markdown conversion''' + self.source = self.get_raw_template() + + if self.template_path.endswith(('.md', '.html')): + self.extract_frontmatter() + + self.convert_from_markdown() + + if self.extends_template(): + self.context.base_template_path = self.context.base_template_path or 'templates/base.html' + else: + self.source = None # clear the source + + # TODO: setup index.txt ? + + def update_context(self): + self.set_page_properties() + self.context.update(get_website_settings(self.context)) + self.context.update(frappe.local.conf.get("website_context") or {}) + + self.pymodule = frappe.get_module(self.pymodule_name) + + if self.pymodule: + self.set_pymodule_properties() + + data = self.run_pymodule_method('get_context') + # some methods may return a "context" object + if data: self.context.update(data) + + # TODO: self.context.children = self.run_pymodule_method('get_children') + + self.context.developer_mode = frappe.conf.developer_mode + + def set_pymodule_properties(self): + for prop in ("base_template_path", "template", "no_cache", "sitemap", + "condition_field"): + if hasattr(self.pymodule, prop): + self.context[prop] = getattr(self.pymodule, prop) + + def set_page_properties(self): + self.context.template = self.template_path + + def run_pymodule_method(self, method): + if hasattr(self.pymodule, method): + try: + return getattr(self.pymodule, method)(self) + except (frappe.PermissionError, frappe.DoesNotExistError, frappe.Redirect): + raise + except: + if not frappe.flags.in_migrate: + frappe.errprint(frappe.utils.get_traceback()) + + def render_template(self): + if self.path.endswith('min.js'): + # directly serve min.js pages using the jloader to find it in various apps + # (can be used as static?) + html = self.get_raw_template() + else: + html = frappe.get_template(self.template_path).render(self.context) + + def extends_template(self): + return (self.template_path.endswith(('.html', '.md', )) + and ('{%- extends' in self.source + or '{% extends' in self.source)) + + def get_raw_template(self): + return frappe.get_jloader().get_source(frappe.get_jenv(), self.template_path)[0] + + def load_colocated_files(self): + '''load co-located css/js files with the same name''' + js_path = self.basepath + '.js' + if os.path.exists(js_path) and '{% block script %}' not in self.source: + self.colocated_js = self.get_colocated_file(js_path) + + css_path = self.basepath + '.css' + if os.path.exists(css_path) and '{% block style %}' not in self.source: + self.colocated_css = self.get_colocated_file(css_path) + + def get_colocated_file(self, path): + with io.open(path, 'r', encoding = 'utf-8') as f: + return f.read() + + def extract_frontmatter(self): + try: + # values will be used to update page_info + res = get_frontmatter(self.source) + if res['attributes']: + self.context.update(res['attributes']) + self.source = res['body'] + except Exception: + pass + + def convert_from_markdown(self): + if self.template_path.endswith('.md'): + self.source = frappe.utils.md_to_html(self.source) + self.page_toc_html = self.toc_html + + if not self.show_sidebar: + self.source = '
' + self.source + '
' + + def update_toc(self, html): + if '{index}' in html: + html = html.replace('{index}', get_toc(self.path)) + + if '{next}' in html: + html = html.replace('{next}', get_next_link(self.path)) + + return html + + +class DocTypePage(WebPage): + pass + +class WebFormPage(WebPage): + pass + diff --git a/frappe/www/_test/static-file-test.png b/frappe/www/_test/static-file-test.png new file mode 100644 index 0000000000000000000000000000000000000000..b51db82f82b906b30609f807f0f663cac40d20b4 GIT binary patch literal 440 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q4M;wBd$a>caTa()7Beu2se&-0XOPMVpde#$ zkh>GZx^prwfgF}}M_)$E)e-c@Na=xA}jv*C{Z|`n2ZE+NFc(}bULexYtxXVk! zRa1H)JCmwK`xQRZ9Zdhl)Xnb@xa7e_h#Kc{rb11QMP%$ zyna9bX2;pHxqo~9%j-KE^?Uy3M6(kqS{SBbSa7?V|4TdH>w?cef9;X4JIhPRIT!|D tb@a_URnxz=-&b0D_xf+-FaWXL-%6{zP`s|39McHmdb;|#taD0e0su)Qf|39L literal 0 HcmV?d00001 From 3f38c3300462dfcda96638c0597216613bf21f19 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 5 Feb 2021 15:54:23 +0530 Subject: [PATCH 0002/1519] fix: status_code, login page works --- frappe/app.py | 8 ++++++-- frappe/tests/test_website_new.py | 17 ++++++++++++++++- frappe/website/serve.py | 18 ++++++++++-------- frappe/www/error.py | 2 ++ 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/frappe/app.py b/frappe/app.py index adf2bfa8c9..9495268f00 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -18,7 +18,8 @@ import frappe.handler import frappe.auth import frappe.api import frappe.utils.response -import frappe.website.render +import frappe.website.serve +import frappe.website.page from frappe.utils import get_site_name, sanitize_html from frappe.middlewares import StaticDataMiddleware from frappe.utils.error import make_error_snapshot @@ -73,7 +74,10 @@ def application(request): response = frappe.utils.response.download_private_file(request.path) elif request.method in ('GET', 'HEAD', 'POST'): - response = frappe.website.render.render() + if frappe.conf.flag_new_website: + response = frappe.website.serve.render() + else: + response = frappe.website.render.render() else: raise NotFound diff --git a/frappe/tests/test_website_new.py b/frappe/tests/test_website_new.py index aa9e77d5ba..34786611d6 100644 --- a/frappe/tests/test_website_new.py +++ b/frappe/tests/test_website_new.py @@ -8,6 +8,12 @@ from frappe.website.utils import get_home_page from frappe.utils import set_request class TestWebsite(unittest.TestCase): + def setUp(self): + frappe.set_user('Guest') + + def tearDown(self): + frappe.set_user('Administrator') + def test_static_page(self): set_request(method='GET', path='/_test/static-file-test.png') response = serve.StaticPage().get() @@ -16,5 +22,14 @@ class TestWebsite(unittest.TestCase): def test_error_page(self): set_request(method='GET', path='/error') response = serve.TemplatePage().get() + self.assertEquals(response.status_code, 500) + + def test_login(self): + set_request(method='GET', path='/login') + response = serve.TemplatePage().get() self.assertEquals(response.status_code, 200) - print(response.get_data()) + + html = frappe.safe_decode(response.get_data()) + + self.assertTrue('// login.js' in html) + self.assertTrue('' in html) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 3f3e1d4571..a0710b9988 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -22,6 +22,8 @@ def render(path=None, http_status_code=None): path = resolve_path(path) data = None + # there is no way to determine the type of the page based on the route + # so evaluate each type of page sequentially response = StaticPage(path).get() if not response: response = TemplatePage(path).get() @@ -93,7 +95,8 @@ class TemplatePage(WebPage): def find_page_in_app(self, app): ''' - Searches for file matching the path in the /www and /templates/pages folders + Searches for file matching the path in the /www + and /templates/pages folders ''' app_path = frappe.get_app_path(app) folders = get_start_folders() @@ -128,9 +131,7 @@ class TemplatePage(WebPage): self.set_pymodule() self.setup_template() - - if self.pymodule_name: - self.update_context() + self.update_context() if self.source: html = frappe.render_template(self.source, self.context) @@ -178,18 +179,19 @@ class TemplatePage(WebPage): self.context.update(get_website_settings(self.context)) self.context.update(frappe.local.conf.get("website_context") or {}) - self.pymodule = frappe.get_module(self.pymodule_name) - - if self.pymodule: + if self.pymodule_name: + self.pymodule = frappe.get_module(self.pymodule_name) self.set_pymodule_properties() data = self.run_pymodule_method('get_context') + # some methods may return a "context" object if data: self.context.update(data) # TODO: self.context.children = self.run_pymodule_method('get_children') self.context.developer_mode = frappe.conf.developer_mode + self.status_code = self.context.http_status_code or 200 def set_pymodule_properties(self): for prop in ("base_template_path", "template", "no_cache", "sitemap", @@ -203,7 +205,7 @@ class TemplatePage(WebPage): def run_pymodule_method(self, method): if hasattr(self.pymodule, method): try: - return getattr(self.pymodule, method)(self) + return getattr(self.pymodule, method)(self.context) except (frappe.PermissionError, frappe.DoesNotExistError, frappe.Redirect): raise except: diff --git a/frappe/www/error.py b/frappe/www/error.py index 161038373d..9274fe7c26 100644 --- a/frappe/www/error.py +++ b/frappe/www/error.py @@ -8,5 +8,7 @@ no_cache = 1 def get_context(context): if frappe.flags.in_migrate: return + context.http_status_code = 500 + print(frappe.get_traceback().encode("utf-8")) return {"error": frappe.get_traceback().replace("<", "<").replace(">", ">") } From 4369b8c0dc3d88c3d37af7ead06a4b35e4812778 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 12 Feb 2021 10:02:10 +0530 Subject: [PATCH 0003/1519] fix(rendering): add doctype generate pages --- frappe/app.py | 7 +- frappe/sessions.py | 3 +- frappe/tests/test_website_new.py | 20 ++- frappe/website/context.py | 2 +- frappe/website/render.py | 7 + frappe/website/serve.py | 231 ++++++++++++++++++++++++++++--- frappe/www/404.py | 2 + 7 files changed, 241 insertions(+), 31 deletions(-) diff --git a/frappe/app.py b/frappe/app.py index 9495268f00..52a8d2fe1c 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -18,8 +18,6 @@ import frappe.handler import frappe.auth import frappe.api import frappe.utils.response -import frappe.website.serve -import frappe.website.page from frappe.utils import get_site_name, sanitize_html from frappe.middlewares import StaticDataMiddleware from frappe.utils.error import make_error_snapshot @@ -74,10 +72,7 @@ def application(request): response = frappe.utils.response.download_private_file(request.path) elif request.method in ('GET', 'HEAD', 'POST'): - if frappe.conf.flag_new_website: - response = frappe.website.serve.render() - else: - response = frappe.website.render.render() + response = frappe.website.render.render() else: raise NotFound diff --git a/frappe/sessions.py b/frappe/sessions.py index 1ca1d4ee6f..dddeb6f37f 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -169,7 +169,8 @@ def get_csrf_token(): def generate_csrf_token(): frappe.local.session.data.csrf_token = frappe.generate_hash() - frappe.local.session_obj.update(force=True) + if not frappe.flags.in_test: + frappe.local.session_obj.update(force=True) class Session: def __init__(self, user, resume=False, full_name=None, user_type=None): diff --git a/frappe/tests/test_website_new.py b/frappe/tests/test_website_new.py index 34786611d6..3d4c2a69ef 100644 --- a/frappe/tests/test_website_new.py +++ b/frappe/tests/test_website_new.py @@ -6,7 +6,6 @@ import frappe from frappe.website import serve from frappe.website.utils import get_home_page from frappe.utils import set_request - class TestWebsite(unittest.TestCase): def setUp(self): frappe.set_user('Guest') @@ -21,15 +20,30 @@ class TestWebsite(unittest.TestCase): def test_error_page(self): set_request(method='GET', path='/error') - response = serve.TemplatePage().get() + response = serve.get_response() self.assertEquals(response.status_code, 500) def test_login(self): set_request(method='GET', path='/login') - response = serve.TemplatePage().get() + response = serve.get_response() self.assertEquals(response.status_code, 200) html = frappe.safe_decode(response.get_data()) self.assertTrue('// login.js' in html) self.assertTrue('' in html) + + def test_app(self): + frappe.set_user('Administrator') + set_request(method='GET', path='/app') + response = serve.get_response() + self.assertEquals(response.status_code, 200) + + html = frappe.safe_decode(response.get_data()) + self.assertTrue('window.app = true;' in html) + frappe.local.session_obj = None + + def test_not_found(self): + set_request(method='GET', path='/_test/missing') + response = serve.get_response() + self.assertEquals(response.status_code, 404) diff --git a/frappe/website/context.py b/frappe/website/context.py index 4236971aec..abda2e3f4f 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -243,7 +243,7 @@ def add_metatags(context): tags["og:title"] = tags["twitter:title"] = title tags["twitter:card"] = "summary" - if "description" not in tags and context.description: + if not tags.get('description') and context.description: tags["description"] = context.description description = tags.get("description") diff --git a/frappe/website/render.py b/frappe/website/render.py index 2f8bc59d6d..ce9647c62a 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -26,6 +26,13 @@ from frappe.translate import guess_language class PageNotFoundError(Exception): pass def render(path=None, http_status_code=None): + if frappe.conf.flag_new_website: + from frappe.website.serve import get_response + return get_response() + else: + return render(path, http_status_code) + +def _render(path=None, http_status_code=None): """render html page""" if not path: path = frappe.local.request.path diff --git a/frappe/website/serve.py b/frappe/website/serve.py index a0710b9988..ec54e8c149 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -6,12 +6,13 @@ from werkzeug.wsgi import wrap_file from frappe.website.render import (resolve_path, build_response) from frappe.website.redirect import resolve_redirect -from frappe.website.router import get_start_folders +from frappe.website.router import (get_start_folders, get_doctypes_with_web_view, + get_page_info_from_web_page_with_dynamic_routes) from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, get_toc, get_next_link) from frappe.website.doctype.website_settings.website_settings import get_website_settings -def render(path=None, http_status_code=None): +def get_response(path=None, http_status_code=None): """render html page""" if not path: path = frappe.local.request.path @@ -87,7 +88,120 @@ class StaticPage(WebPage): response.mimetype = mimetypes.guess_type(self.file_path)[0] or 'application/octet-stream' return response -class TemplatePage(WebPage): +class BaseTemplatePage(WebPage): + def init_context(self): + self.context = frappe._dict() + self.context.update(get_website_settings(self.context)) + self.context.update(frappe.local.conf.get("website_context") or {}) + + def add_csrf_token(self, html): + if frappe.local.session: + return html.replace("", ''.format( + frappe.local.session.data.csrf_token)) + else: + return html + + def post_process_context(self): + self.add_metatags() + # add_sidebar_and_breadcrumbs(context) + + self.set_base_template_if_missing() + self.set_title_with_prefix() + self.update_website_context() + + # set using frappe.respond_as_web_page + if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): + context.update(frappe.local.response.context) + + # to be able to inspect the context dict + # Use the macro "inspect" from macros.html + self.context._context_dict = self.context + + def set_base_template_if_missing(self): + if not self.context.base_template_path: + app_base = frappe.get_hooks("base_template") + self.context.base_template_path = app_base[-1] if app_base else "templates/base.html" + + def set_title_with_prefix(self): + if (self.context.title_prefix and self.context.title + and not self.context.title.startswith(self.context.title_prefix)): + self.context.title = '{0} - {1}'.format(self.context.title_prefix, self.context.title) + + def update_website_context(self): + # apply context from hooks + update_website_context = frappe.get_hooks('update_website_context') + for method in update_website_context: + values = frappe.get_attr(method)(self.context) + if values: + self.context.update(values) + + def add_metatags(self): + self.tags = frappe._dict(self.context.get("metatags") or {}) + self.init_metatags_from_context() + self.set_opengraph_tags() + self.set_twitter_tags() + self.set_meta_published_on() + self.set_metatags_from_website_route_meta() + + self.context.metatags = self.tags + + def init_metatags_from_context(self): + for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): + if not key in self.tags and self.context.get(key): + self.tags[key] = self.context[key] + + if not self.tags.get('title'): self.tags['title'] = self.context.get('name') + + if self.tags.get('image'): + self.tags['image'] = frappe.utils.get_url(self.tags['image']) + + self.tags["language"] = frappe.local.lang or "en" + + def set_opengraph_tags(self): + if "og:type" not in self.tags: + self.tags["og:type"] = "article" + + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['og:' + key] = self.tags.get(key) + + def set_twitter_tags(self): + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['twitter:' + key] = self.tags.get(key) + + if self.tags.get('image'): + self.tags['twitter:card'] = "summary_large_image" + else: + self.tags["twitter:card"] = "summary" + + def set_meta_published_on(self): + if "published_on" in self.tags: + self.tags["datePublished"] = self.tags["published_on"] + del self.tags["published_on"] + + def set_metatags_from_website_route_meta(self): + ''' + Get meta tags from Website Route meta + they can override the defaults set above + ''' + route = self.context.path + if route == '': + # homepage + route = frappe.db.get_single_value('Website Settings', 'home_page') + + route_exists = (route + and not route.endswith(('.js', '.css')) + and frappe.db.exists('Website Route Meta', route)) + + if route_exists: + website_route_meta = frappe.get_doc('Website Route Meta', route) + for meta_tag in website_route_meta.meta_tags: + d = meta_tag.get_meta_dict() + self.tags.update(d) + + +class TemplatePage(BaseTemplatePage): def validate(self): for app in frappe.get_installed_apps(frappe_last=True): if self.find_page_in_app(app): @@ -127,19 +241,16 @@ class TemplatePage(WebPage): def get_html(self): # context object should be separate from self for security # because it will be accessed via the user defined template - self.context = frappe._dict() + self.init_context() self.set_pymodule() self.setup_template() self.update_context() - - if self.source: - html = frappe.render_template(self.source, self.context) - - elif self.template_path: - html = self.render_template() + self.post_process_context() + html = self.render_template() html = self.update_toc(html) + html = self.add_csrf_token(html) return html @@ -176,8 +287,6 @@ class TemplatePage(WebPage): def update_context(self): self.set_page_properties() - self.context.update(get_website_settings(self.context)) - self.context.update(frappe.local.conf.get("website_context") or {}) if self.pymodule_name: self.pymodule = frappe.get_module(self.pymodule_name) @@ -213,12 +322,15 @@ class TemplatePage(WebPage): frappe.errprint(frappe.utils.get_traceback()) def render_template(self): - if self.path.endswith('min.js'): - # directly serve min.js pages using the jloader to find it in various apps - # (can be used as static?) - html = self.get_raw_template() - else: - html = frappe.get_template(self.template_path).render(self.context) + if self.source: + html = frappe.render_template(self.source, self.context) + elif self.template_path: + if self.path.endswith('min.js'): + html = self.get_raw_template() # static + else: + html = frappe.get_template(self.template_path).render(self.context) + + return html def extends_template(self): return (self.template_path.endswith(('.html', '.md', )) @@ -270,8 +382,87 @@ class TemplatePage(WebPage): return html -class DocTypePage(WebPage): - pass +class DocTypePage(BaseTemplatePage): + def validate(self): + ''' + Find a document with matching `route` from all doctypes with `has_web_view`=1 + ''' + if self.search_in_doctypes_with_web_view(): + return True + + if self.search_web_page_dynamic_routes(): + return True + + return False + + def search_in_doctypes_with_web_view(self): + for doctype in get_doctypes_with_web_view(): + filters = dict(route=self.path) + meta = frappe.get_meta(doctype) + condition_field = self.get_condition_field(meta) + + if condition_field: + filters[condition_field] = 1 + + try: + self.docname = frappe.db.get_value(doctype, filters, 'name') + if self.docname: + self.doctype = doctype + self.meta = meta + return True + except Exception as e: + if not frappe.db.is_missing_column(e): raise e + + def search_web_page_dynamic_routes(self): + d = get_page_info_from_web_page_with_dynamic_routes(self.path) + if d: + self.doctype = 'Web Page' + self.docname = d.name + self.meta = frappe.get_meta(self.doctype) + return True + else: + return False + + def render(self): + self.doc = frappe.get_doc(self.doctype, self.docname) + self.init_context() + self.update_context() + self.post_process_context() + + html = frappe.get_template(self.context.template_path).render(self.context) + html = self.add_csrf_token(html) + + return build_response(self.path, html, self.status_code, self.headers) + + def update_context(self): + self.context.doc = self.doc + self.context.update(self.context.doc.as_dict()) + self.context.update(self.context.doc.get_website_properties()) + + if not self.context.template_path: + self.context.template_path = self.context.doc.meta.get_web_template() + + if hasattr(self.doc, "get_context"): + ret = self.doc.get_context(self.context) + + if ret: + self.context.update(ret) + + for prop in ("no_cache", "sitemap"): + if not prop in self.context: + self.context[prop] = getattr(self.doc, prop, False) + + def get_condition_field(self, meta): + condition_field = None + if meta.is_published_field: + condition_field = meta.is_published_field + elif not meta.custom: + controller = get_controller(doctype) + condition_field = controller.website.condition_field + + return condition_field + + class WebFormPage(WebPage): pass diff --git a/frappe/www/404.py b/frappe/www/404.py index c9de234743..e02e1c3929 100644 --- a/frappe/www/404.py +++ b/frappe/www/404.py @@ -2,3 +2,5 @@ # MIT License. See license.txt from __future__ import unicode_literals +def get_context(context): + context.http_status_code = 404 From 46dc5af29a81bbe00b022e30e096add46ecb88dd Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 15 Feb 2021 12:55:47 +0530 Subject: [PATCH 0004/1519] fix(list): make list pages work --- frappe/website/doctype/blog_post/blog_post.py | 5 --- frappe/website/render.py | 5 +-- frappe/website/router.py | 2 +- frappe/website/serve.py | 34 +++++++++++++------ 4 files changed, 27 insertions(+), 19 deletions(-) diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 28549225be..e7c2772c69 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -13,11 +13,6 @@ from frappe.website.utils import (find_first_image, get_html_content_based_on_ty get_comment_list) class BlogPost(WebsiteGenerator): - website = frappe._dict( - route = 'blog', - order_by = "published_on desc" - ) - def make_route(self): if not self.route: return frappe.db.get_value('Blog Category', self.blog_category, diff --git a/frappe/website/render.py b/frappe/website/render.py index ce9647c62a..21d5dda8d5 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -26,11 +26,12 @@ from frappe.translate import guess_language class PageNotFoundError(Exception): pass def render(path=None, http_status_code=None): - if frappe.conf.flag_new_website: + # temp feature flag + if True or frappe.conf.flag_new_website: from frappe.website.serve import get_response return get_response() else: - return render(path, http_status_code) + return _render(path, http_status_code) def _render(path=None, http_status_code=None): """render html page""" diff --git a/frappe/website/router.py b/frappe/website/router.py index 946c83811a..5244c57ba8 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -441,4 +441,4 @@ def get_doctypes_with_web_view(): return frappe.cache().get_value('doctypes_with_web_view', _get) def get_start_folders(): - return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') \ No newline at end of file + return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') diff --git a/frappe/website/serve.py b/frappe/website/serve.py index ec54e8c149..6784dbefd9 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -29,7 +29,9 @@ def get_response(path=None, http_status_code=None): if not response: response = TemplatePage(path).get() if not response: - response = DocTypePage(path).get() + response = ListPage(path).get() + if not response: + response = DocumentPage(path).get() if not response: response = TemplatePage('404').get() except frappe.PermissionError as e: @@ -117,6 +119,11 @@ class BaseTemplatePage(WebPage): # Use the macro "inspect" from macros.html self.context._context_dict = self.context + # context sends us a new template path + if self.context.template: + self.template_path = self.context.template + + def set_base_template_if_missing(self): if not self.context.base_template_path: app_base = frappe.get_hooks("base_template") @@ -200,7 +207,6 @@ class BaseTemplatePage(WebPage): d = meta_tag.get_meta_dict() self.tags.update(d) - class TemplatePage(BaseTemplatePage): def validate(self): for app in frappe.get_installed_apps(frappe_last=True): @@ -222,8 +228,6 @@ class TemplatePage(BaseTemplatePage): if os.path.exists(file_path) and not os.path.isdir(file_path): self.app = app self.app_path = app_path - self.dirname = dirname - self.file_path = file_path self.template_path = os.path.relpath(file_path, self.app_path) return True @@ -244,9 +248,9 @@ class TemplatePage(BaseTemplatePage): self.init_context() self.set_pymodule() - self.setup_template() self.update_context() self.post_process_context() + self.setup_template() html = self.render_template() html = self.update_toc(html) @@ -380,9 +384,18 @@ class TemplatePage(BaseTemplatePage): html = html.replace('{next}', get_next_link(self.path)) return html - - -class DocTypePage(BaseTemplatePage): +class ListPage(TemplatePage): + def validate(self): + if frappe.db.get_value('DocType', self.path): + self.app = 'frappe' + self.app_path = frappe.get_app_path('frappe') + self.doctype = self.path + self.path = 'list' + self.template_path = 'www/list.html' + frappe.local.form_dict.doctype = self.doctype + return True + return False +class DocumentPage(BaseTemplatePage): def validate(self): ''' Find a document with matching `route` from all doctypes with `has_web_view`=1 @@ -462,8 +475,7 @@ class DocTypePage(BaseTemplatePage): return condition_field - - +class PrintPage(TemplatePage): + pass class WebFormPage(WebPage): pass - From 75ba0ca6a9be2f8a1d43529ff8a28a43efc42457 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 15 Feb 2021 13:49:38 +0530 Subject: [PATCH 0005/1519] fix(minor): website/serve.py --- frappe/website/serve.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 6784dbefd9..8f686144f1 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -113,7 +113,7 @@ class BaseTemplatePage(WebPage): # set using frappe.respond_as_web_page if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): - context.update(frappe.local.response.context) + self.context.update(frappe.local.response.context) # to be able to inspect the context dict # Use the macro "inspect" from macros.html @@ -384,6 +384,7 @@ class TemplatePage(BaseTemplatePage): html = html.replace('{next}', get_next_link(self.path)) return html + class ListPage(TemplatePage): def validate(self): if frappe.db.get_value('DocType', self.path): @@ -395,6 +396,7 @@ class ListPage(TemplatePage): frappe.local.form_dict.doctype = self.doctype return True return False + class DocumentPage(BaseTemplatePage): def validate(self): ''' @@ -477,5 +479,6 @@ class DocumentPage(BaseTemplatePage): class PrintPage(TemplatePage): pass + class WebFormPage(WebPage): pass From e79e1420612b814f1e65ce9b4021d0c31f00d00a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 15 Feb 2021 17:43:17 +0530 Subject: [PATCH 0006/1519] fix(minor): fix some tests and merge old and new website tests --- .../print_settings/print_settings.json | 4 +- frappe/tests/test_website.py | 46 ++++++++++- frappe/tests/test_website_new.py | 49 ------------ frappe/website/render.py | 2 +- frappe/website/serve.py | 80 ++++++++++++++----- frappe/www/message.py | 8 +- 6 files changed, 113 insertions(+), 76 deletions(-) delete mode 100644 frappe/tests/test_website_new.py diff --git a/frappe/printing/doctype/print_settings/print_settings.json b/frappe/printing/doctype/print_settings/print_settings.json index d64cb4c6d3..31962be050 100644 --- a/frappe/printing/doctype/print_settings/print_settings.json +++ b/frappe/printing/doctype/print_settings/print_settings.json @@ -148,7 +148,7 @@ "label": "Print Style" }, { - "default": "Modern", + "default": "Redesign", "fieldname": "print_style", "fieldtype": "Link", "in_list_view": 1, @@ -183,7 +183,7 @@ "index_web_pages_for_search": 1, "issingle": 1, "links": [], - "modified": "2020-10-22 23:42:09.471022", + "modified": "2021-02-15 14:16:18.474254", "modified_by": "Administrator", "module": "Printing", "name": "Print Settings", diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index c5da2bdfb7..91e08db457 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -4,13 +4,19 @@ import unittest import frappe from frappe.website import render +from frappe.website import serve from frappe.website.utils import get_home_page from frappe.utils import set_request - class TestWebsite(unittest.TestCase): + def setUp(self): + frappe.set_user('Guest') + + def tearDown(self): + frappe.set_user('Administrator') def test_home_page_for_role(self): + frappe.set_user('Administrator') frappe.delete_doc_if_exists('User', 'test-user-for-home-page@example.com') frappe.delete_doc_if_exists('Role', 'home-page-test') frappe.delete_doc_if_exists('Web Page', 'home-page-test') @@ -44,7 +50,6 @@ class TestWebsite(unittest.TestCase): self.assertEqual(get_home_page(), 'test-portal-home') def test_page_load(self): - frappe.set_user('Guest') set_request(method='POST', path='login') response = render.render() @@ -54,10 +59,47 @@ class TestWebsite(unittest.TestCase): self.assertTrue('// login.js' in html) self.assertTrue('' in html) + + def test_static_page(self): + set_request(method='GET', path='/_test/static-file-test.png') + response = serve.get_response() + self.assertEquals(response.status_code, 200) + + def test_error_page(self): + set_request(method='GET', path='/error') + response = serve.get_response() + self.assertEquals(response.status_code, 500) + + def test_login(self): + set_request(method='GET', path='/login') + response = serve.get_response() + self.assertEquals(response.status_code, 200) + + html = frappe.safe_decode(response.get_data()) + + self.assertTrue('// login.js' in html) + self.assertTrue('' in html) + + def test_app(self): frappe.set_user('Administrator') + set_request(method='GET', path='/app') + response = serve.get_response() + self.assertEquals(response.status_code, 200) + + html = frappe.safe_decode(response.get_data()) + self.assertTrue('window.app = true;' in html) + frappe.local.session_obj = None + + def test_not_found(self): + set_request(method='GET', path='/_test/missing') + response = serve.get_response() + self.assertEquals(response.status_code, 404) + def test_redirect(self): import frappe.hooks + frappe.set_user('Administrator') + frappe.hooks.website_redirects = [ dict(source=r'/testfrom', target=r'://testto1'), dict(source=r'/testfromregex.*', target=r'://testto2'), diff --git a/frappe/tests/test_website_new.py b/frappe/tests/test_website_new.py deleted file mode 100644 index 3d4c2a69ef..0000000000 --- a/frappe/tests/test_website_new.py +++ /dev/null @@ -1,49 +0,0 @@ -from __future__ import unicode_literals - -import unittest - -import frappe -from frappe.website import serve -from frappe.website.utils import get_home_page -from frappe.utils import set_request -class TestWebsite(unittest.TestCase): - def setUp(self): - frappe.set_user('Guest') - - def tearDown(self): - frappe.set_user('Administrator') - - def test_static_page(self): - set_request(method='GET', path='/_test/static-file-test.png') - response = serve.StaticPage().get() - self.assertEquals(response.status_code, 200) - - def test_error_page(self): - set_request(method='GET', path='/error') - response = serve.get_response() - self.assertEquals(response.status_code, 500) - - def test_login(self): - set_request(method='GET', path='/login') - response = serve.get_response() - self.assertEquals(response.status_code, 200) - - html = frappe.safe_decode(response.get_data()) - - self.assertTrue('// login.js' in html) - self.assertTrue('' in html) - - def test_app(self): - frappe.set_user('Administrator') - set_request(method='GET', path='/app') - response = serve.get_response() - self.assertEquals(response.status_code, 200) - - html = frappe.safe_decode(response.get_data()) - self.assertTrue('window.app = true;' in html) - frappe.local.session_obj = None - - def test_not_found(self): - set_request(method='GET', path='/_test/missing') - response = serve.get_response() - self.assertEquals(response.status_code, 404) diff --git a/frappe/website/render.py b/frappe/website/render.py index 21d5dda8d5..65f871b8a0 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -29,7 +29,7 @@ def render(path=None, http_status_code=None): # temp feature flag if True or frappe.conf.flag_new_website: from frappe.website.serve import get_response - return get_response() + return get_response(path, http_status_code) else: return _render(path, http_status_code) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 8f686144f1..927909e75f 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -25,26 +25,34 @@ def get_response(path=None, http_status_code=None): # there is no way to determine the type of the page based on the route # so evaluate each type of page sequentially - response = StaticPage(path).get() + response = StaticPage(path, http_status_code).get() if not response: - response = TemplatePage(path).get() + response = TemplatePage(path, http_status_code).get() if not response: - response = ListPage(path).get() + response = ListPage(path, http_status_code).get() if not response: - response = DocumentPage(path).get() + response = DocumentPage(path, http_status_code).get() if not response: - response = TemplatePage('404').get() + response = PrintPage(path, http_status_code).get() + if not response: + response = TemplatePage('404', 404).get() + except frappe.Redirect: + return build_response(path, "", 301, { + "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), + "Cache-Control": "no-store, no-cache, must-revalidate" + }) except frappe.PermissionError as e: - response = TemplatePage('403').get() - except: - response = TemplatePage('error').get() + frappe.local.message = cstr(e) + response = NotPermittedPage(path, http_status_code).get() + except Exception as e: + response = TemplatePage('error', getattr(e, 'http_status_code', 500) or http_status_code).get() return response class WebPage(object): - def __init__(self, path=None): + def __init__(self, path=None, http_status_code=200): self.headers = None - self.status_code = 200 + self.http_status_code = http_status_code if not path: path = frappe.local.request.path self.path = path.strip('/ ') @@ -240,7 +248,7 @@ class TemplatePage(BaseTemplatePage): search_path + '/index.md') def render(self): - return build_response(self.path, self.get_html(), self.status_code, self.headers) + return build_response(self.path, self.get_html(), self.http_status_code, self.headers) def get_html(self): # context object should be separate from self for security @@ -304,7 +312,8 @@ class TemplatePage(BaseTemplatePage): # TODO: self.context.children = self.run_pymodule_method('get_children') self.context.developer_mode = frappe.conf.developer_mode - self.status_code = self.context.http_status_code or 200 + if self.context.http_status_code: + self.http_status_code = self.context.http_status_code def set_pymodule_properties(self): for prop in ("base_template_path", "template", "no_cache", "sitemap", @@ -385,18 +394,50 @@ class TemplatePage(BaseTemplatePage): return html + def set_standard_path(self, path): + self.app = 'frappe' + self.app_path = frappe.get_app_path('frappe') + self.path = path + self.template_path = 'www/{path}.html'.format(path=path) + + class ListPage(TemplatePage): def validate(self): if frappe.db.get_value('DocType', self.path): - self.app = 'frappe' - self.app_path = frappe.get_app_path('frappe') - self.doctype = self.path - self.path = 'list' - self.template_path = 'www/list.html' - frappe.local.form_dict.doctype = self.doctype + frappe.local.form_dict.doctype = self.path + self.set_standard_path('list') return True return False +class PrintPage(TemplatePage): + ''' + default path returns a printable object (based on permission) + /Quotation/Q-0001 + ''' + def validate(self): + parts = self.path.split('/', 1) + if len(parts)==2: + if (frappe.db.get_value('DocType', parts[0]) + and frappe.db.get_value(parts[0], parts[1])): + frappe.form_dict.doctype = parts[0] + frappe.form_dict.name = parts[1] + self.set_standard_path('printview') + return True + + return False + +class NotPermittedPage(TemplatePage): + def validate(self): + frappe.local.message_title = _("Not Permitted") + frappe.local.response['context'] = dict( + indicator_color = 'red', + primary_action = '/login', + primary_label = _('Login'), + fullpage=True + ) + self.set_standard_path('message') + return True + class DocumentPage(BaseTemplatePage): def validate(self): ''' @@ -477,8 +518,5 @@ class DocumentPage(BaseTemplatePage): return condition_field -class PrintPage(TemplatePage): - pass - class WebFormPage(WebPage): pass diff --git a/frappe/www/message.py b/frappe/www/message.py index ea45b9c4b5..d650170073 100644 --- a/frappe/www/message.py +++ b/frappe/www/message.py @@ -9,7 +9,7 @@ from frappe.utils import strip_html_tags no_cache = 1 def get_context(context): - message_context = {} + message_context = frappe._dict() if hasattr(frappe.local, "message"): message_context["header"] = frappe.local.message_title message_context["title"] = strip_html_tags(frappe.local.message_title) @@ -26,4 +26,10 @@ def get_context(context): if message.get('http_status_code'): frappe.local.response['http_status_code'] = message['http_status_code'] + if not message_context.title: + message_context.title = frappe.form_dict.title + + if not message_context.message: + message_context.message = frappe.form_dict.message + return message_context From b699d92f5ee57d54918221fb9d74c54ca4cfe24a Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Mon, 15 Feb 2021 18:05:44 +0530 Subject: [PATCH 0007/1519] fix(minor): http_status_code --- frappe/website/serve.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 927909e75f..b635d9615b 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -12,7 +12,7 @@ from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, get_toc, get_next_link) from frappe.website.doctype.website_settings.website_settings import get_website_settings -def get_response(path=None, http_status_code=None): +def get_response(path=None, http_status_code=200): """render html page""" if not path: path = frappe.local.request.path @@ -45,14 +45,14 @@ def get_response(path=None, http_status_code=None): frappe.local.message = cstr(e) response = NotPermittedPage(path, http_status_code).get() except Exception as e: - response = TemplatePage('error', getattr(e, 'http_status_code', 500) or http_status_code).get() + response = TemplatePage('error', getattr(e, 'http_status_code', None) or http_status_code).get() return response class WebPage(object): - def __init__(self, path=None, http_status_code=200): + def __init__(self, path=None, http_status_code=None): self.headers = None - self.http_status_code = http_status_code + self.http_status_code = http_status_code or 200 if not path: path = frappe.local.request.path self.path = path.strip('/ ') @@ -488,7 +488,7 @@ class DocumentPage(BaseTemplatePage): html = frappe.get_template(self.context.template_path).render(self.context) html = self.add_csrf_token(html) - return build_response(self.path, html, self.status_code, self.headers) + return build_response(self.path, html, self.http_status_code or 200, self.headers) def update_context(self): self.context.doc = self.doc From 30659b9ee28e034c6eef7ba682eea5b302b6fb6b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 11 Mar 2021 10:29:12 +0530 Subject: [PATCH 0008/1519] feat: Option to consider query string while writing website redirect - if match_with_query_string is true in a website redirect rule, system will try to match the regex with the result of route + query_string --- frappe/tests/test_website.py | 20 +++++++++++++------- frappe/website/redirect.py | 12 ++++++++---- frappe/website/serve.py | 28 ++++++++++++++++++---------- 3 files changed, 39 insertions(+), 21 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 91e08db457..ce165e36d9 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -51,7 +51,7 @@ class TestWebsite(unittest.TestCase): def test_page_load(self): set_request(method='POST', path='login') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 200) @@ -103,7 +103,8 @@ class TestWebsite(unittest.TestCase): frappe.hooks.website_redirects = [ dict(source=r'/testfrom', target=r'://testto1'), dict(source=r'/testfromregex.*', target=r'://testto2'), - dict(source=r'/testsub/(.*)', target=r'://testto3/\1') + dict(source=r'/testsub/(.*)', target=r'://testto3/\1'), + dict(source=r'/courses/course\?course=(.*)', target=r'/courses/\1', match_with_query_string=True), ] website_settings = frappe.get_doc('Website Settings') @@ -117,28 +118,33 @@ class TestWebsite(unittest.TestCase): frappe.cache().delete_key('website_redirects') set_request(method='GET', path='/testfrom') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 301) self.assertEquals(response.headers.get('Location'), r'://testto1') set_request(method='GET', path='/testfromregex/test') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 301) self.assertEquals(response.headers.get('Location'), r'://testto2') set_request(method='GET', path='/testsub/me') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 301) self.assertEquals(response.headers.get('Location'), r'://testto3/me') set_request(method='GET', path='/test404') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 404) set_request(method='GET', path='/testsource') - response = render.render() + response = serve.get_response() self.assertEquals(response.status_code, 301) self.assertEquals(response.headers.get('Location'), '/testtarget') + set_request(method='GET', path='/courses/course?course=data') + response = serve.get_response() + self.assertEquals(response.status_code, 301) + self.assertEquals(response.headers.get('Location'), '/courses/data') + delattr(frappe.hooks, 'website_redirects') frappe.cache().delete_key('app_hooks') diff --git a/frappe/website/redirect.py b/frappe/website/redirect.py index 73e3c21727..e66c0a3b7b 100644 --- a/frappe/website/redirect.py +++ b/frappe/website/redirect.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import re, frappe -def resolve_redirect(path): +def resolve_redirect(path, query_string=None): ''' Resolve redirects from hooks @@ -33,9 +33,13 @@ def resolve_redirect(path): for rule in redirects: pattern = rule['source'].strip('/ ') + '$' - if re.match(pattern, path): - redirect_to = re.sub(pattern, rule['target'], path) + path_to_match = path + if rule.get('match_with_query_string'): + path_to_match = path + '?' + frappe.safe_decode(query_string) + + if re.match(pattern, path_to_match): + redirect_to = re.sub(pattern, rule['target'], path_to_match) frappe.flags.redirect_location = redirect_to - frappe.cache().hset('website_redirects', path, redirect_to) + frappe.cache().hset('website_redirects', path_to_match, redirect_to) raise frappe.Redirect diff --git a/frappe/website/serve.py b/frappe/website/serve.py index b635d9615b..11e950573e 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,25 +1,33 @@ -import frappe -import os, mimetypes +import mimetypes +import os from werkzeug.wrappers import Response from werkzeug.wsgi import wrap_file -from frappe.website.render import (resolve_path, build_response) +import frappe +from frappe import _ +from frappe.utils import cint, cstr +from frappe.model.document import get_controller +from frappe.website.doctype.website_settings.website_settings import \ + get_website_settings from frappe.website.redirect import resolve_redirect -from frappe.website.router import (get_start_folders, get_doctypes_with_web_view, - get_page_info_from_web_page_with_dynamic_routes) -from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, - get_toc, get_next_link) -from frappe.website.doctype.website_settings.website_settings import get_website_settings +from frappe.website.render import build_response, resolve_path +from frappe.website.router import (get_doctypes_with_web_view, + get_page_info_from_web_page_with_dynamic_routes, get_start_folders) +from frappe.website.utils import (can_cache, delete_page_cache, get_home_page, + get_next_link, get_toc) + def get_response(path=None, http_status_code=200): """render html page""" + query_string = None if not path: path = frappe.local.request.path + query_string = frappe.local.request.query_string try: path = path.strip('/ ') - resolve_redirect(path) + resolve_redirect(path, query_string) path = resolve_path(path) data = None @@ -513,7 +521,7 @@ class DocumentPage(BaseTemplatePage): if meta.is_published_field: condition_field = meta.is_published_field elif not meta.custom: - controller = get_controller(doctype) + controller = get_controller(meta.doctype) condition_field = controller.website.condition_field return condition_field From 39da825592429ab933e65368ef30d39de7a9208e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 12 Mar 2021 11:42:24 +0530 Subject: [PATCH 0009/1519] refactor: Move page controllers to separate files - Make template page work --- .../page_controllers/base_template_page.py | 128 +++++ .../website/page_controllers/document_page.py | 88 ++++ frappe/website/page_controllers/list_page.py | 10 + .../page_controllers/not_permitted_page.py | 15 + frappe/website/page_controllers/print_page.py | 19 + .../website/page_controllers/static_page.py | 40 ++ .../website/page_controllers/template_page.py | 276 ++++++++++ frappe/website/page_controllers/web_form.py | 4 + frappe/website/page_controllers/web_page.py | 21 + frappe/website/serve.py | 496 +----------------- 10 files changed, 610 insertions(+), 487 deletions(-) create mode 100644 frappe/website/page_controllers/base_template_page.py create mode 100644 frappe/website/page_controllers/document_page.py create mode 100644 frappe/website/page_controllers/list_page.py create mode 100644 frappe/website/page_controllers/not_permitted_page.py create mode 100644 frappe/website/page_controllers/print_page.py create mode 100644 frappe/website/page_controllers/static_page.py create mode 100644 frappe/website/page_controllers/template_page.py create mode 100644 frappe/website/page_controllers/web_form.py create mode 100644 frappe/website/page_controllers/web_page.py diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py new file mode 100644 index 0000000000..10e2375356 --- /dev/null +++ b/frappe/website/page_controllers/base_template_page.py @@ -0,0 +1,128 @@ +import frappe +from frappe import _ +from frappe.website.context import add_sidebar_and_breadcrumbs +from frappe.website.doctype.website_settings.website_settings import \ + get_website_settings +from frappe.website.page_controllers.web_page import WebPage + + +class BaseTemplatePage(WebPage): + def init_context(self): + self.context = frappe._dict() + self.context.update(get_website_settings(self.context)) + self.context.update(frappe.local.conf.get("website_context") or {}) + + def add_csrf_token(self, html): + if frappe.local.session: + return html.replace("", ''.format( + frappe.local.session.data.csrf_token)) + else: + return html + + def post_process_context(self): + self.set_missing_values() + self.add_metatags() + self.add_sidebar_and_breadcrumbs() + + self.set_base_template_if_missing() + self.set_title_with_prefix() + self.update_website_context() + + # set using frappe.respond_as_web_page + if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): + self.context.update(frappe.local.response.context) + + # to be able to inspect the context dict + # Use the macro "inspect" from macros.html + self.context._context_dict = self.context + + # context sends us a new template path + if self.context.template: + self.template_path = self.context.template + + + def set_base_template_if_missing(self): + if not self.context.base_template_path: + app_base = frappe.get_hooks("base_template") + self.context.base_template_path = app_base[-1] if app_base else "templates/base.html" + + def set_title_with_prefix(self): + if (self.context.title_prefix and self.context.title + and not self.context.title.startswith(self.context.title_prefix)): + self.context.title = '{0} - {1}'.format(self.context.title_prefix, self.context.title) + + def update_website_context(self): + # apply context from hooks + update_website_context = frappe.get_hooks('update_website_context') + for method in update_website_context: + values = frappe.get_attr(method)(self.context) + if values: + self.context.update(values) + + def add_metatags(self): + self.tags = frappe._dict(self.context.get("metatags") or {}) + self.init_metatags_from_context() + self.set_opengraph_tags() + self.set_twitter_tags() + self.set_meta_published_on() + self.set_metatags_from_website_route_meta() + + self.context.metatags = self.tags + + def add_sidebar_and_breadcrumbs(self): + add_sidebar_and_breadcrumbs(self.context) + + def init_metatags_from_context(self): + for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): + if not key in self.tags and self.context.get(key): + self.tags[key] = self.context[key] + + if not self.tags.get('title'): self.tags['title'] = self.context.get('name') + + if self.tags.get('image'): + self.tags['image'] = frappe.utils.get_url(self.tags['image']) + + self.tags["language"] = frappe.local.lang or "en" + + def set_opengraph_tags(self): + if "og:type" not in self.tags: + self.tags["og:type"] = "article" + + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['og:' + key] = self.tags.get(key) + + def set_twitter_tags(self): + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['twitter:' + key] = self.tags.get(key) + + if self.tags.get('image'): + self.tags['twitter:card'] = "summary_large_image" + else: + self.tags["twitter:card"] = "summary" + + def set_meta_published_on(self): + if "published_on" in self.tags: + self.tags["datePublished"] = self.tags["published_on"] + del self.tags["published_on"] + + def set_metatags_from_website_route_meta(self): + ''' + Get meta tags from Website Route meta + they can override the defaults set above + ''' + route = self.context.path + if route == '': + # homepage + route = frappe.db.get_single_value('Website Settings', 'home_page') + + route_exists = (route + and not route.endswith(('.js', '.css')) + and frappe.db.exists('Website Route Meta', route)) + + if route_exists: + website_route_meta = frappe.get_doc('Website Route Meta', route) + for meta_tag in website_route_meta.meta_tags: + d = meta_tag.get_meta_dict() + self.tags.update(d) diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_controllers/document_page.py new file mode 100644 index 0000000000..bb00d78c0c --- /dev/null +++ b/frappe/website/page_controllers/document_page.py @@ -0,0 +1,88 @@ +import frappe +from frappe import _ +from frappe.model.document import get_controller +from frappe.website.page_controllers.base_template_page import BaseTemplatePage +from frappe.website.render import build_response +from frappe.website.router import (get_doctypes_with_web_view, + get_page_info_from_web_page_with_dynamic_routes) + + +class DocumentPage(BaseTemplatePage): + def validate(self): + ''' + Find a document with matching `route` from all doctypes with `has_web_view`=1 + ''' + if self.search_in_doctypes_with_web_view(): + return True + + if self.search_web_page_dynamic_routes(): + return True + + return False + + def search_in_doctypes_with_web_view(self): + for doctype in get_doctypes_with_web_view(): + filters = dict(route=self.path) + meta = frappe.get_meta(doctype) + condition_field = self.get_condition_field(meta) + + if condition_field: + filters[condition_field] = 1 + + try: + self.docname = frappe.db.get_value(doctype, filters, 'name') + if self.docname: + self.doctype = doctype + self.meta = meta + return True + except Exception as e: + if not frappe.db.is_missing_column(e): raise e + + def search_web_page_dynamic_routes(self): + d = get_page_info_from_web_page_with_dynamic_routes(self.path) + if d: + self.doctype = 'Web Page' + self.docname = d.name + self.meta = frappe.get_meta(self.doctype) + return True + else: + return False + + def render(self): + self.doc = frappe.get_doc(self.doctype, self.docname) + self.init_context() + self.update_context() + self.post_process_context() + + html = frappe.get_template(self.context.template_path).render(self.context) + html = self.add_csrf_token(html) + + return build_response(self.path, html, self.http_status_code or 200, self.headers) + + def update_context(self): + self.context.doc = self.doc + self.context.update(self.context.doc.as_dict()) + self.context.update(self.context.doc.get_website_properties()) + + if not self.context.template_path: + self.context.template_path = self.context.doc.meta.get_web_template() + + if hasattr(self.doc, "get_context"): + ret = self.doc.get_context(self.context) + + if ret: + self.context.update(ret) + + for prop in ("no_cache", "sitemap"): + if not prop in self.context: + self.context[prop] = getattr(self.doc, prop, False) + + def get_condition_field(self, meta): + condition_field = None + if meta.is_published_field: + condition_field = meta.is_published_field + elif not meta.custom: + controller = get_controller(meta.doctype) + condition_field = controller.website.condition_field + + return condition_field diff --git a/frappe/website/page_controllers/list_page.py b/frappe/website/page_controllers/list_page.py new file mode 100644 index 0000000000..2cb6ed5f26 --- /dev/null +++ b/frappe/website/page_controllers/list_page.py @@ -0,0 +1,10 @@ +import frappe +from frappe.website.page_controllers.template_page import TemplatePage + +class ListPage(TemplatePage): + def validate(self): + if frappe.db.get_value('DocType', self.path): + frappe.local.form_dict.doctype = self.path + self.set_standard_path('list') + return True + return False diff --git a/frappe/website/page_controllers/not_permitted_page.py b/frappe/website/page_controllers/not_permitted_page.py new file mode 100644 index 0000000000..e0cd6bf970 --- /dev/null +++ b/frappe/website/page_controllers/not_permitted_page.py @@ -0,0 +1,15 @@ +import frappe +from frappe import _ +from frappe.website.page_controllers.template_page import TemplatePage + +class NotPermittedPage(TemplatePage): + def validate(self): + frappe.local.message_title = _("Not Permitted") + frappe.local.response['context'] = dict( + indicator_color = 'red', + primary_action = '/login', + primary_label = _('Login'), + fullpage=True + ) + self.set_standard_path('message') + return True diff --git a/frappe/website/page_controllers/print_page.py b/frappe/website/page_controllers/print_page.py new file mode 100644 index 0000000000..6daea7fcbc --- /dev/null +++ b/frappe/website/page_controllers/print_page.py @@ -0,0 +1,19 @@ +import frappe +from frappe.website.page_controllers.template_page import TemplatePage + +class PrintPage(TemplatePage): + ''' + default path returns a printable object (based on permission) + /Quotation/Q-0001 + ''' + def validate(self): + parts = self.path.split('/', 1) + if len(parts)==2: + if (frappe.db.get_value('DocType', parts[0]) + and frappe.db.get_value(parts[0], parts[1])): + frappe.form_dict.doctype = parts[0] + frappe.form_dict.name = parts[1] + self.set_standard_path('printview') + return True + + return False diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_controllers/static_page.py new file mode 100644 index 0000000000..4b57c3ec42 --- /dev/null +++ b/frappe/website/page_controllers/static_page.py @@ -0,0 +1,40 @@ +import mimetypes +import os + +from werkzeug.wrappers import Response +from werkzeug.wsgi import wrap_file + +import frappe +from frappe.website.page_controllers.web_page import WebPage + + +class StaticPage(WebPage): + def validate(self): + if ('.' not in self.path): + return False + extn = self.path.rsplit('.', 1)[-1] + if extn in ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json'): + return False + + if self.find_path_in_apps(): + return True + + return False + + def find_path_in_apps(self): + for app in frappe.get_installed_apps(): + file_path = frappe.get_app_path(app, 'www') + '/' + self.path + if os.path.exists(file_path): + self.file_path = file_path + return True + return False + + def render(self): + try: + f = open(self.file_path, 'rb') + except IOError: + raise frappe.exceptions.NotFound + + response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True) + response.mimetype = mimetypes.guess_type(self.file_path)[0] or 'application/octet-stream' + return response diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py new file mode 100644 index 0000000000..46e6e6a57e --- /dev/null +++ b/frappe/website/page_controllers/template_page.py @@ -0,0 +1,276 @@ +import io +import os + +import frappe +from frappe import _ +from frappe.website.page_controllers.base_template_page import BaseTemplatePage +from frappe.website.render import build_response +from frappe.website.utils import (extract_comment_tag, extract_title, + get_next_link, get_toc) + + +class TemplatePage(BaseTemplatePage): + def validate(self): + for app in frappe.get_installed_apps(frappe_last=True): + if self.find_page_in_app(app): + return True + + def find_page_in_app(self, app): + ''' + Searches for file matching the path in the /www + and /templates/pages folders + ''' + app_path = frappe.get_app_path(app) + folders = get_start_folders() + + for dirname in folders: + search_path = os.path.join(app_path, dirname, self.path) + for p in self.get_index_path_options(search_path): + file_path = frappe.as_unicode(p) + if os.path.exists(file_path) and not os.path.isdir(file_path): + self.app = app + self.app_path = app_path + self.template_path = os.path.relpath(file_path, self.app_path) + return True + + def get_index_path_options(self, search_path): + return ( + search_path, + search_path + '.html', + search_path + '.md', + search_path + '/index.html', + search_path + '/index.md') + + def render(self): + return build_response(self.path, self.get_html(), self.http_status_code, self.headers) + + def get_html(self): + # context object should be separate from self for security + # because it will be accessed via the user defined template + self.init_context() + + self.set_pymodule() + self.setup_template() + self.update_context() + self.post_process_context() + html = self.render_template() + + html = self.update_toc(html) + html = self.add_csrf_token(html) + + return html + + def set_pymodule(self): + ''' + A template may have a python module with a `get_context` method along with it in the + same folder. Also the hyphens will be coverted to underscore for python module names. + This method sets the pymodule_name if it exists. + ''' + self.basepath = self.template_path.rsplit('.', 1)[0] + self.pymodule_name = None + + # replace - with _ in the internal modules names + self.pymodule_path = os.path.join(self.basepath.replace("-", "_") + ".py") + + if os.path.exists(os.path.join(self.app_path, self.pymodule_path)): + self.pymodule_name = self.app + "." + self.pymodule_path.replace(os.path.sep, ".")[:-3] + + def setup_template(self): + '''Setup template source, frontmatter and markdown conversion''' + self.source = self.get_raw_template() + + if self.template_path.endswith(('.md', '.html')): + self.extract_frontmatter() + + self.convert_from_markdown() + + if self.extends_template(): + self.context.base_template_path = self.context.base_template_path or 'templates/base.html' + + + # TODO: setup index.txt ? + + def update_context(self): + self.set_page_properties() + self.set_properties_from_source() + self.load_colocated_files() + self.context.build_version = frappe.utils.get_build_version() + + if self.pymodule_name: + self.pymodule = frappe.get_module(self.pymodule_name) + self.set_pymodule_properties() + + data = self.run_pymodule_method('get_context') + + # some methods may return a "context" object + if data: self.context.update(data) + + # TODO: self.context.children = self.run_pymodule_method('get_children') + + self.context.developer_mode = frappe.conf.developer_mode + if self.context.http_status_code: + self.http_status_code = self.context.http_status_code + + def set_pymodule_properties(self): + for prop in ("base_template_path", "template", "no_cache", "sitemap", + "condition_field"): + if hasattr(self.pymodule, prop): + self.context[prop] = getattr(self.pymodule, prop) + + def set_page_properties(self): + self.context.template = self.template_path + self.context.base_template = self.context.base_template or 'templates/web.html' + + def set_properties_from_source(self): + if not self.source: + return + context = self.context + if not context.title: + context.title = extract_title(self.source, self.path) + + base_template = extract_comment_tag(self.source, 'base_template') + if base_template: + context.base_template = base_template + + if (context.base_template + and "{%- extends" not in self.source + and "{% extends" not in self.source + and "" not in self.source): + self.source = '''{{% extends "{0}" %}} + {{% block page_content %}}{1}{{% endblock %}}'''.format(context.base_template, self.source) + + if "" in self.source: + context.no_breadcrumbs = 1 + + if "" in self.source: + context.show_sidebar = 1 + + if "" in self.source: + context.add_breadcrumbs = 1 + + if "" in self.source: + context.no_header = 1 + + if "" in self.source: + context.add_next_prev_links = 1 + + if "" in self.source: + context.no_cache = 1 + + if "" in self.source: + context.sitemap = 0 + + if "" in self.source: + context.sitemap = 1 + + def run_pymodule_method(self, method): + if hasattr(self.pymodule, method): + try: + return getattr(self.pymodule, method)(self.context) + except (frappe.PermissionError, frappe.DoesNotExistError, frappe.Redirect): + raise + except: + if not frappe.flags.in_migrate: + frappe.errprint(frappe.utils.get_traceback()) + + def render_template(self): + if self.source: + html = frappe.render_template(self.source, self.context) + elif self.template_path: + if self.path.endswith('min.js'): + html = self.get_raw_template() # static + else: + html = frappe.get_template(self.template_path).render(self.context) + + return html + + def extends_template(self): + return (self.template_path.endswith(('.html', '.md', )) + and ('{%- extends' in self.source + or '{% extends' in self.source)) + + def get_raw_template(self): + return frappe.get_jloader().get_source(frappe.get_jenv(), self.template_path)[0] + + def load_colocated_files(self): + '''load co-located css/js files with the same name''' + js_path = self.basepath + '.js' + if os.path.exists(js_path) and '{% block script %}' not in self.source: + self.context.colocated_js = self.get_colocated_file(js_path) + + css_path = self.basepath + '.css' + if os.path.exists(css_path) and '{% block style %}' not in self.source: + self.context.colocated_css = self.get_colocated_file(css_path) + + def get_colocated_file(self, path): + with io.open(path, 'r', encoding = 'utf-8') as f: + return f.read() + + def extract_frontmatter(self): + try: + # values will be used to update self + res = get_frontmatter(self.source) + if res['attributes']: + self.context.update(res['attributes']) + self.source = res['body'] + except Exception: + pass + + def convert_from_markdown(self): + if self.template_path.endswith('.md'): + self.source = frappe.utils.md_to_html(self.source) + self.page_toc_html = self.source.toc_html + + if not self.context.show_sidebar: + self.source = '
' + self.source + '
' + + def update_toc(self, html): + if '{index}' in html: + html = html.replace('{index}', get_toc(self.path)) + + if '{next}' in html: + html = html.replace('{next}', get_next_link(self.path)) + + return html + + def set_standard_path(self, path): + self.app = 'frappe' + self.app_path = frappe.get_app_path('frappe') + self.path = path + self.template_path = 'www/{path}.html'.format(path=path) + + def set_missing_values(self): + if not "url_prefix" in self.context: + self.context.url_prefix = "" + + if self.context.url_prefix and self.context.url_prefix[-1]!='/': + self.context.url_prefix += '/' + + # for backward compatibility + self.context.docs_base_url = '/docs' + self.context.path = self.path + + +def get_start_folders(): + return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') + +def get_frontmatter(string): + """ + Reference: https://github.com/jonbeebe/frontmatter + """ + import re + + import yaml + + fmatter = "" + body = "" + result = re.compile(r'^\s*(?:---|\+\+\+)(.*?)(?:---|\+\+\+)\s*(.+)$', re.S | re.M).search(string) + + if result: + fmatter = result.group(1) + body = result.group(2) + + return { + "attributes": yaml.safe_load(fmatter), + "body": body, + } diff --git a/frappe/website/page_controllers/web_form.py b/frappe/website/page_controllers/web_form.py new file mode 100644 index 0000000000..030e8bb3bc --- /dev/null +++ b/frappe/website/page_controllers/web_form.py @@ -0,0 +1,4 @@ +from frappe.website.page_controllers.web_page import WebPage + +class WebFormPage(WebPage): + pass diff --git a/frappe/website/page_controllers/web_page.py b/frappe/website/page_controllers/web_page.py new file mode 100644 index 0000000000..d4af2860f8 --- /dev/null +++ b/frappe/website/page_controllers/web_page.py @@ -0,0 +1,21 @@ +import frappe +from frappe import _ + +class WebPage(object): + def __init__(self, path=None, http_status_code=None): + self.headers = None + self.http_status_code = http_status_code or 200 + if not path: + path = frappe.local.request.path + self.path = path.strip('/ ') + + def get(self): + if self.validate(): + return self.render() + + def validate(self): + pass + + def render(self): + pass + diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 11e950573e..10eddfc641 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,22 +1,16 @@ -import mimetypes -import os - -from werkzeug.wrappers import Response -from werkzeug.wsgi import wrap_file - import frappe from frappe import _ -from frappe.utils import cint, cstr -from frappe.model.document import get_controller -from frappe.website.doctype.website_settings.website_settings import \ - get_website_settings +from frappe.utils import cstr + +from frappe.website.page_controllers.document_page import DocumentPage +from frappe.website.page_controllers.list_page import ListPage +from frappe.website.page_controllers.not_permitted_page import NotPermittedPage +from frappe.website.page_controllers.print_page import PrintPage +from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_controllers.static_page import StaticPage + from frappe.website.redirect import resolve_redirect from frappe.website.render import build_response, resolve_path -from frappe.website.router import (get_doctypes_with_web_view, - get_page_info_from_web_page_with_dynamic_routes, get_start_folders) -from frappe.website.utils import (can_cache, delete_page_cache, get_home_page, - get_next_link, get_toc) - def get_response(path=None, http_status_code=200): """render html page""" @@ -56,475 +50,3 @@ def get_response(path=None, http_status_code=200): response = TemplatePage('error', getattr(e, 'http_status_code', None) or http_status_code).get() return response - -class WebPage(object): - def __init__(self, path=None, http_status_code=None): - self.headers = None - self.http_status_code = http_status_code or 200 - if not path: - path = frappe.local.request.path - self.path = path.strip('/ ') - - def get(self): - if self.validate(): - return self.render() - - def validate(self): - pass - - def render(self): - pass - -class StaticPage(WebPage): - def validate(self): - if ('.' not in self.path): - return False - extn = self.path.rsplit('.', 1)[-1] - if extn in ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json'): - return False - - if self.find_path_in_apps(): - return True - - return False - - def find_path_in_apps(self): - for app in frappe.get_installed_apps(): - file_path = frappe.get_app_path(app, 'www') + '/' + self.path - if os.path.exists(file_path): - self.file_path = file_path - return True - return False - - def render(self): - try: - f = open(self.file_path, 'rb') - except IOError: - raise NotFound - - response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True) - response.mimetype = mimetypes.guess_type(self.file_path)[0] or 'application/octet-stream' - return response - -class BaseTemplatePage(WebPage): - def init_context(self): - self.context = frappe._dict() - self.context.update(get_website_settings(self.context)) - self.context.update(frappe.local.conf.get("website_context") or {}) - - def add_csrf_token(self, html): - if frappe.local.session: - return html.replace("", ''.format( - frappe.local.session.data.csrf_token)) - else: - return html - - def post_process_context(self): - self.add_metatags() - # add_sidebar_and_breadcrumbs(context) - - self.set_base_template_if_missing() - self.set_title_with_prefix() - self.update_website_context() - - # set using frappe.respond_as_web_page - if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): - self.context.update(frappe.local.response.context) - - # to be able to inspect the context dict - # Use the macro "inspect" from macros.html - self.context._context_dict = self.context - - # context sends us a new template path - if self.context.template: - self.template_path = self.context.template - - - def set_base_template_if_missing(self): - if not self.context.base_template_path: - app_base = frappe.get_hooks("base_template") - self.context.base_template_path = app_base[-1] if app_base else "templates/base.html" - - def set_title_with_prefix(self): - if (self.context.title_prefix and self.context.title - and not self.context.title.startswith(self.context.title_prefix)): - self.context.title = '{0} - {1}'.format(self.context.title_prefix, self.context.title) - - def update_website_context(self): - # apply context from hooks - update_website_context = frappe.get_hooks('update_website_context') - for method in update_website_context: - values = frappe.get_attr(method)(self.context) - if values: - self.context.update(values) - - def add_metatags(self): - self.tags = frappe._dict(self.context.get("metatags") or {}) - self.init_metatags_from_context() - self.set_opengraph_tags() - self.set_twitter_tags() - self.set_meta_published_on() - self.set_metatags_from_website_route_meta() - - self.context.metatags = self.tags - - def init_metatags_from_context(self): - for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): - if not key in self.tags and self.context.get(key): - self.tags[key] = self.context[key] - - if not self.tags.get('title'): self.tags['title'] = self.context.get('name') - - if self.tags.get('image'): - self.tags['image'] = frappe.utils.get_url(self.tags['image']) - - self.tags["language"] = frappe.local.lang or "en" - - def set_opengraph_tags(self): - if "og:type" not in self.tags: - self.tags["og:type"] = "article" - - for key in ('title', 'description', 'image', 'author', 'url'): - if self.tags.get(key): - self.tags['og:' + key] = self.tags.get(key) - - def set_twitter_tags(self): - for key in ('title', 'description', 'image', 'author', 'url'): - if self.tags.get(key): - self.tags['twitter:' + key] = self.tags.get(key) - - if self.tags.get('image'): - self.tags['twitter:card'] = "summary_large_image" - else: - self.tags["twitter:card"] = "summary" - - def set_meta_published_on(self): - if "published_on" in self.tags: - self.tags["datePublished"] = self.tags["published_on"] - del self.tags["published_on"] - - def set_metatags_from_website_route_meta(self): - ''' - Get meta tags from Website Route meta - they can override the defaults set above - ''' - route = self.context.path - if route == '': - # homepage - route = frappe.db.get_single_value('Website Settings', 'home_page') - - route_exists = (route - and not route.endswith(('.js', '.css')) - and frappe.db.exists('Website Route Meta', route)) - - if route_exists: - website_route_meta = frappe.get_doc('Website Route Meta', route) - for meta_tag in website_route_meta.meta_tags: - d = meta_tag.get_meta_dict() - self.tags.update(d) - -class TemplatePage(BaseTemplatePage): - def validate(self): - for app in frappe.get_installed_apps(frappe_last=True): - if self.find_page_in_app(app): - return True - - def find_page_in_app(self, app): - ''' - Searches for file matching the path in the /www - and /templates/pages folders - ''' - app_path = frappe.get_app_path(app) - folders = get_start_folders() - - for dirname in folders: - search_path = os.path.join(app_path, dirname, self.path) - for p in self.get_index_path_options(search_path): - file_path = frappe.as_unicode(p) - if os.path.exists(file_path) and not os.path.isdir(file_path): - self.app = app - self.app_path = app_path - self.template_path = os.path.relpath(file_path, self.app_path) - return True - - def get_index_path_options(self, search_path): - return ( - search_path, - search_path + '.html', - search_path + '.md', - search_path + '/index.html', - search_path + '/index.md') - - def render(self): - return build_response(self.path, self.get_html(), self.http_status_code, self.headers) - - def get_html(self): - # context object should be separate from self for security - # because it will be accessed via the user defined template - self.init_context() - - self.set_pymodule() - self.update_context() - self.post_process_context() - self.setup_template() - html = self.render_template() - - html = self.update_toc(html) - html = self.add_csrf_token(html) - - return html - - def set_pymodule(self): - ''' - A template may have a python module with a `get_context` method along with it in the - same folder. Also the hyphens will be coverted to underscore for python module names. - This method sets the pymodule_name if it exists. - ''' - self.basepath = self.template_path.rsplit('.', 1)[0] - self.pymodule_name = None - - # replace - with _ in the internal modules names - self.pymodule_path = os.path.join(self.basepath.replace("-", "_") + ".py") - - if os.path.exists(os.path.join(self.app_path, self.pymodule_path)): - self.pymodule_name = self.app + "." + self.pymodule_path.replace(os.path.sep, ".")[:-3] - - def setup_template(self): - '''Setup template source, frontmatter and markdown conversion''' - self.source = self.get_raw_template() - - if self.template_path.endswith(('.md', '.html')): - self.extract_frontmatter() - - self.convert_from_markdown() - - if self.extends_template(): - self.context.base_template_path = self.context.base_template_path or 'templates/base.html' - else: - self.source = None # clear the source - - # TODO: setup index.txt ? - - def update_context(self): - self.set_page_properties() - - if self.pymodule_name: - self.pymodule = frappe.get_module(self.pymodule_name) - self.set_pymodule_properties() - - data = self.run_pymodule_method('get_context') - - # some methods may return a "context" object - if data: self.context.update(data) - - # TODO: self.context.children = self.run_pymodule_method('get_children') - - self.context.developer_mode = frappe.conf.developer_mode - if self.context.http_status_code: - self.http_status_code = self.context.http_status_code - - def set_pymodule_properties(self): - for prop in ("base_template_path", "template", "no_cache", "sitemap", - "condition_field"): - if hasattr(self.pymodule, prop): - self.context[prop] = getattr(self.pymodule, prop) - - def set_page_properties(self): - self.context.template = self.template_path - - def run_pymodule_method(self, method): - if hasattr(self.pymodule, method): - try: - return getattr(self.pymodule, method)(self.context) - except (frappe.PermissionError, frappe.DoesNotExistError, frappe.Redirect): - raise - except: - if not frappe.flags.in_migrate: - frappe.errprint(frappe.utils.get_traceback()) - - def render_template(self): - if self.source: - html = frappe.render_template(self.source, self.context) - elif self.template_path: - if self.path.endswith('min.js'): - html = self.get_raw_template() # static - else: - html = frappe.get_template(self.template_path).render(self.context) - - return html - - def extends_template(self): - return (self.template_path.endswith(('.html', '.md', )) - and ('{%- extends' in self.source - or '{% extends' in self.source)) - - def get_raw_template(self): - return frappe.get_jloader().get_source(frappe.get_jenv(), self.template_path)[0] - - def load_colocated_files(self): - '''load co-located css/js files with the same name''' - js_path = self.basepath + '.js' - if os.path.exists(js_path) and '{% block script %}' not in self.source: - self.colocated_js = self.get_colocated_file(js_path) - - css_path = self.basepath + '.css' - if os.path.exists(css_path) and '{% block style %}' not in self.source: - self.colocated_css = self.get_colocated_file(css_path) - - def get_colocated_file(self, path): - with io.open(path, 'r', encoding = 'utf-8') as f: - return f.read() - - def extract_frontmatter(self): - try: - # values will be used to update page_info - res = get_frontmatter(self.source) - if res['attributes']: - self.context.update(res['attributes']) - self.source = res['body'] - except Exception: - pass - - def convert_from_markdown(self): - if self.template_path.endswith('.md'): - self.source = frappe.utils.md_to_html(self.source) - self.page_toc_html = self.toc_html - - if not self.show_sidebar: - self.source = '
' + self.source + '
' - - def update_toc(self, html): - if '{index}' in html: - html = html.replace('{index}', get_toc(self.path)) - - if '{next}' in html: - html = html.replace('{next}', get_next_link(self.path)) - - return html - - def set_standard_path(self, path): - self.app = 'frappe' - self.app_path = frappe.get_app_path('frappe') - self.path = path - self.template_path = 'www/{path}.html'.format(path=path) - - -class ListPage(TemplatePage): - def validate(self): - if frappe.db.get_value('DocType', self.path): - frappe.local.form_dict.doctype = self.path - self.set_standard_path('list') - return True - return False - -class PrintPage(TemplatePage): - ''' - default path returns a printable object (based on permission) - /Quotation/Q-0001 - ''' - def validate(self): - parts = self.path.split('/', 1) - if len(parts)==2: - if (frappe.db.get_value('DocType', parts[0]) - and frappe.db.get_value(parts[0], parts[1])): - frappe.form_dict.doctype = parts[0] - frappe.form_dict.name = parts[1] - self.set_standard_path('printview') - return True - - return False - -class NotPermittedPage(TemplatePage): - def validate(self): - frappe.local.message_title = _("Not Permitted") - frappe.local.response['context'] = dict( - indicator_color = 'red', - primary_action = '/login', - primary_label = _('Login'), - fullpage=True - ) - self.set_standard_path('message') - return True - -class DocumentPage(BaseTemplatePage): - def validate(self): - ''' - Find a document with matching `route` from all doctypes with `has_web_view`=1 - ''' - if self.search_in_doctypes_with_web_view(): - return True - - if self.search_web_page_dynamic_routes(): - return True - - return False - - def search_in_doctypes_with_web_view(self): - for doctype in get_doctypes_with_web_view(): - filters = dict(route=self.path) - meta = frappe.get_meta(doctype) - condition_field = self.get_condition_field(meta) - - if condition_field: - filters[condition_field] = 1 - - try: - self.docname = frappe.db.get_value(doctype, filters, 'name') - if self.docname: - self.doctype = doctype - self.meta = meta - return True - except Exception as e: - if not frappe.db.is_missing_column(e): raise e - - def search_web_page_dynamic_routes(self): - d = get_page_info_from_web_page_with_dynamic_routes(self.path) - if d: - self.doctype = 'Web Page' - self.docname = d.name - self.meta = frappe.get_meta(self.doctype) - return True - else: - return False - - def render(self): - self.doc = frappe.get_doc(self.doctype, self.docname) - self.init_context() - self.update_context() - self.post_process_context() - - html = frappe.get_template(self.context.template_path).render(self.context) - html = self.add_csrf_token(html) - - return build_response(self.path, html, self.http_status_code or 200, self.headers) - - def update_context(self): - self.context.doc = self.doc - self.context.update(self.context.doc.as_dict()) - self.context.update(self.context.doc.get_website_properties()) - - if not self.context.template_path: - self.context.template_path = self.context.doc.meta.get_web_template() - - if hasattr(self.doc, "get_context"): - ret = self.doc.get_context(self.context) - - if ret: - self.context.update(ret) - - for prop in ("no_cache", "sitemap"): - if not prop in self.context: - self.context[prop] = getattr(self.doc, prop, False) - - def get_condition_field(self, meta): - condition_field = None - if meta.is_published_field: - condition_field = meta.is_published_field - elif not meta.custom: - controller = get_controller(meta.doctype) - condition_field = controller.website.condition_field - - return condition_field - -class WebFormPage(WebPage): - pass From ce3771ab74ab739d18960c50e1dd3826f5ffb4b1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 12 Mar 2021 13:26:38 +0530 Subject: [PATCH 0010/1519] refactor: Move code to appropriate file add_sidebar_and_breadcrumbs belongs to TemplatePage --- .../page_controllers/base_template_page.py | 12 +++--------- frappe/website/page_controllers/template_page.py | 15 +++++++++++++-- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index 10e2375356..8a5ec992cc 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -1,6 +1,7 @@ +import os + import frappe from frappe import _ -from frappe.website.context import add_sidebar_and_breadcrumbs from frappe.website.doctype.website_settings.website_settings import \ get_website_settings from frappe.website.page_controllers.web_page import WebPage @@ -15,15 +16,12 @@ class BaseTemplatePage(WebPage): def add_csrf_token(self, html): if frappe.local.session: return html.replace("", ''.format( - frappe.local.session.data.csrf_token)) + frappe.local.session.data.csrf_token)) else: return html def post_process_context(self): - self.set_missing_values() self.add_metatags() - self.add_sidebar_and_breadcrumbs() - self.set_base_template_if_missing() self.set_title_with_prefix() self.update_website_context() @@ -40,7 +38,6 @@ class BaseTemplatePage(WebPage): if self.context.template: self.template_path = self.context.template - def set_base_template_if_missing(self): if not self.context.base_template_path: app_base = frappe.get_hooks("base_template") @@ -69,9 +66,6 @@ class BaseTemplatePage(WebPage): self.context.metatags = self.tags - def add_sidebar_and_breadcrumbs(self): - add_sidebar_and_breadcrumbs(self.context) - def init_metatags_from_context(self): for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): if not key in self.tags and self.context.get(key): diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 46e6e6a57e..cfb2d2f310 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -4,6 +4,7 @@ import os import frappe from frappe import _ from frappe.website.page_controllers.base_template_page import BaseTemplatePage +from frappe.website.context import add_sidebar_and_breadcrumbs from frappe.website.render import build_response from frappe.website.utils import (extract_comment_tag, extract_title, get_next_link, get_toc) @@ -60,6 +61,14 @@ class TemplatePage(BaseTemplatePage): return html + def post_process_context(self): + self.add_sidebar_and_breadcrumbs() + self.set_missing_values() + super(TemplatePage, self).post_process_context() + + def add_sidebar_and_breadcrumbs(self): + add_sidebar_and_breadcrumbs(self.context) + def set_pymodule(self): ''' A template may have a python module with a `get_context` method along with it in the @@ -85,7 +94,7 @@ class TemplatePage(BaseTemplatePage): self.convert_from_markdown() if self.extends_template(): - self.context.base_template_path = self.context.base_template_path or 'templates/base.html' + self.context.base_template_path = self.context.base_template_path # TODO: setup index.txt ? @@ -246,9 +255,11 @@ class TemplatePage(BaseTemplatePage): if self.context.url_prefix and self.context.url_prefix[-1]!='/': self.context.url_prefix += '/' + self.context.path = self.path + self.context.pathname = frappe.local.path + # for backward compatibility self.context.docs_base_url = '/docs' - self.context.path = self.path def get_start_folders(): From c6cc70e7dfa2dddcde55acae1ffc21c3ba169a45 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 15 Mar 2021 10:13:40 +0530 Subject: [PATCH 0011/1519] fix: Document Page --- frappe/website/page_controllers/document_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_controllers/document_page.py index bb00d78c0c..f13ea0c724 100644 --- a/frappe/website/page_controllers/document_page.py +++ b/frappe/website/page_controllers/document_page.py @@ -82,7 +82,7 @@ class DocumentPage(BaseTemplatePage): if meta.is_published_field: condition_field = meta.is_published_field elif not meta.custom: - controller = get_controller(meta.doctype) + controller = get_controller(meta.name) condition_field = controller.website.condition_field return condition_field From a5f274b5a3dbb72e109184b7a3c56b2a1dac13b4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 15 Mar 2021 10:15:27 +0530 Subject: [PATCH 0012/1519] fix: Enable WebForm page --- frappe/website/serve.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 10eddfc641..ea27b07859 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -8,6 +8,7 @@ from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.print_page import PrintPage from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.static_page import StaticPage +from frappe.website.page_controllers.web_form import WebFormPage from frappe.website.redirect import resolve_redirect from frappe.website.render import build_response, resolve_path @@ -23,7 +24,6 @@ def get_response(path=None, http_status_code=200): path = path.strip('/ ') resolve_redirect(path, query_string) path = resolve_path(path) - data = None # there is no way to determine the type of the page based on the route # so evaluate each type of page sequentially @@ -32,6 +32,8 @@ def get_response(path=None, http_status_code=200): response = TemplatePage(path, http_status_code).get() if not response: response = ListPage(path, http_status_code).get() + if not response: + response = WebFormPage(path, http_status_code).get() if not response: response = DocumentPage(path, http_status_code).get() if not response: From 25a4eb07575094766111c5cca9b46f79dd1ed59f Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Mar 2021 19:25:41 +0200 Subject: [PATCH 0013/1519] feat: google drive picker --- .../google_settings/google_settings.json | 12 ++- .../google_settings/test_google_settings.py | 10 +++ frappe/public/icons/social/google_drive.svg | 1 + .../js/frappe/file_uploader/FileUploader.vue | 46 ++++++++++- frappe/public/js/integrations/google_drive.js | 81 +++++++++++++++++++ 5 files changed, 145 insertions(+), 5 deletions(-) create mode 100644 frappe/integrations/doctype/google_settings/test_google_settings.py create mode 100644 frappe/public/icons/social/google_drive.svg create mode 100644 frappe/public/js/integrations/google_drive.js diff --git a/frappe/integrations/doctype/google_settings/google_settings.json b/frappe/integrations/doctype/google_settings/google_settings.json index 086c56c020..6a4f181f2d 100644 --- a/frappe/integrations/doctype/google_settings/google_settings.json +++ b/frappe/integrations/doctype/google_settings/google_settings.json @@ -1,4 +1,5 @@ { + "actions": [], "creation": "2019-06-14 00:08:37.255003", "doctype": "DocType", "engine": "InnoDB", @@ -8,7 +9,8 @@ "client_id", "client_secret", "sb_01", - "api_key" + "api_key", + "app_id" ], "fields": [ { @@ -46,10 +48,16 @@ "fieldname": "sb_01", "fieldtype": "Section Break", "label": "API Key" + }, + { + "fieldname": "app_id", + "fieldtype": "Data", + "label": "App ID" } ], "issingle": 1, - "modified": "2019-08-06 22:37:41.699703", + "links": [], + "modified": "2021-03-28 22:24:05.963403", "modified_by": "Administrator", "module": "Integrations", "name": "Google Settings", diff --git a/frappe/integrations/doctype/google_settings/test_google_settings.py b/frappe/integrations/doctype/google_settings/test_google_settings.py new file mode 100644 index 0000000000..476e772b58 --- /dev/null +++ b/frappe/integrations/doctype/google_settings/test_google_settings.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2021, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestGoogleSettings(unittest.TestCase): + pass diff --git a/frappe/public/icons/social/google_drive.svg b/frappe/public/icons/social/google_drive.svg new file mode 100644 index 0000000000..d43b4d3dbd --- /dev/null +++ b/frappe/public/icons/social/google_drive.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index d0b09c7593..61b87606a5 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -63,6 +63,12 @@
{{ __('Camera') }}
+
{{ upload_notes }} @@ -116,6 +122,7 @@ import FilePreview from './FilePreview.vue'; import FileBrowser from './FileBrowser.vue'; import WebLink from './WebLink.vue'; +import GoogleDrive from '../../integrations/google_drive'; export default { name: 'FileUploader', @@ -173,8 +180,16 @@ export default { currently_uploading: -1, show_file_browser: false, show_web_link: false, + allow_take_photo: false, + allow_google_drive: false } }, + created() { + this.allow_take_photo = window.navigator.mediaDevices; + frappe.db.get_single_value("Google Settings", "enable").then(resp => { + this.allow_google_drive = Boolean(resp); + }); + }, watch: { files(newvalue, oldvalue) { if (!this.allow_multiple && newvalue.length > 1) { @@ -187,9 +202,6 @@ export default { return this.files.length > 0 && this.files.every( file => file.total !== 0 && file.progress === file.total); - }, - allow_take_photo() { - return window.navigator.mediaDevices; } }, methods: { @@ -408,6 +420,10 @@ export default { form_data.append('file_url', file.file_url); } + if (file.file_name) { + form_data.append('file_name', file.file_name); + } + if (this.doctype && this.docname) { form_data.append('doctype', this.doctype); form_data.append('docname', this.docname); @@ -437,6 +453,30 @@ export default { ); }); }, + show_google_drive_picker() { + frappe.db.get_value("Google Settings", "Google Settings", ["client_id", "api_key", "app_id"]).then(resp => { + let dialog = cur_dialog; + dialog.hide(); + let google_drive = new GoogleDrive({ + pickerCallback: data => this.google_drive_callback(data, dialog), + developerKey: resp.message.api_key, + clientId: resp.message.client_id, + appId: resp.message.app_id + }); + google_drive.loadPicker(); + }); + }, + google_drive_callback(data, dialog) { + if (data.action == google.picker.Action.PICKED) { + // debugger; + this.upload_file({ + file_url: data.docs[0].url, + file_name: data.docs[0].name + }); + } else if (data.action == google.picker.Action.CANCEL) { + dialog.show(); + } + }, url_to_file(url, filename, mime_type) { return fetch(url) .then(res => res.arrayBuffer()) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js new file mode 100644 index 0000000000..9c6aea5375 --- /dev/null +++ b/frappe/public/js/integrations/google_drive.js @@ -0,0 +1,81 @@ +export default class GoogleDrive { + constructor({ + pickerCallback, + developerKey, + clientId, + appId + } = {}) { + console.log('GoogleDrive constructor'); + this.pickerCallback = pickerCallback; + this.pickerApiLoaded = false; + this.scope = ['https://www.googleapis.com/auth/drive.file']; + this.developerKey = developerKey; + this.clientId = clientId; + this.appId = appId; + } + + loadPicker() { + // load the google API library + $.ajax({ + method: "GET", + url: "https://apis.google.com/js/api.js", + dataType: "script", + cache: true, + context: this + }).done(function() { + this.loadGapi(); + }.bind(this)); + } + + loadGapi() { + // load auth and picker libraries + if (!frappe.boot.user.google_drive_token) { + gapi.load('auth', function() { + console.log('gapi.load("auth") callback'); + this.onAuthApiLoad(); + }.bind(this)); + } + + gapi.load('picker', function() { + console.log('gapi.load("picker") callback'); + this.onPickerApiLoad(); + }.bind(this)); + } + + onAuthApiLoad() { + gapi.auth.authorize({ + 'client_id': this.clientId, + 'scope': this.scope, + 'immediate': false + }, function(authResult) { + this.handleAuthResult(authResult); + }.bind(this)); + } + + handleAuthResult(authResult) { + if (authResult && !authResult.error) { + frappe.boot.user.google_drive_token = authResult.access_token; + this.createPicker(); + } + } + + onPickerApiLoad() { + this.pickerApiLoaded = true; + this.createPicker(); + } + + createPicker() { + // Create and render a Picker object for searching images. + if (this.pickerApiLoaded && frappe.boot.user.google_drive_token) { + var view = new google.picker.View(google.picker.ViewId.DOCS); + var picker = new google.picker.PickerBuilder() + .setAppId(this.appId) + .setOAuthToken(frappe.boot.user.google_drive_token) + .addView(view) + .setDeveloperKey(this.developerKey) + .setCallback(this.pickerCallback) + .build(); + picker.setVisible(true); + } + } +} From 7d333dbf703001c50dc80aa0a28477b741e9b51f Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Mar 2021 21:09:06 +0200 Subject: [PATCH 0014/1519] fix: scope for google picker --- frappe/public/js/integrations/google_drive.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js index 9c6aea5375..1c7e4dda21 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive.js @@ -8,7 +8,7 @@ export default class GoogleDrive { console.log('GoogleDrive constructor'); this.pickerCallback = pickerCallback; this.pickerApiLoaded = false; - this.scope = ['https://www.googleapis.com/auth/drive.file']; + this.scope = ['https://www.googleapis.com/auth/drive.readonly']; this.developerKey = developerKey; this.clientId = clientId; this.appId = appId; From c44cecae5db1ef7231b742ca84ade406224e17d6 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Mar 2021 21:11:26 +0200 Subject: [PATCH 0015/1519] fix: remove log statements --- frappe/public/js/integrations/google_drive.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js index 1c7e4dda21..e7093fb29a 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive.js @@ -5,7 +5,6 @@ export default class GoogleDrive { clientId, appId } = {}) { - console.log('GoogleDrive constructor'); this.pickerCallback = pickerCallback; this.pickerApiLoaded = false; this.scope = ['https://www.googleapis.com/auth/drive.readonly']; @@ -31,13 +30,11 @@ export default class GoogleDrive { // load auth and picker libraries if (!frappe.boot.user.google_drive_token) { gapi.load('auth', function() { - console.log('gapi.load("auth") callback'); this.onAuthApiLoad(); }.bind(this)); } gapi.load('picker', function() { - console.log('gapi.load("picker") callback'); this.onPickerApiLoad(); }.bind(this)); } From f9dbbf69e0e89e3f36ac821994cfccb6a576f32d Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Mar 2021 21:22:13 +0200 Subject: [PATCH 0016/1519] feat: better home view for google drive picker --- frappe/public/js/integrations/google_drive.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js index e7093fb29a..6b9ee9d0ff 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive.js @@ -64,7 +64,10 @@ export default class GoogleDrive { createPicker() { // Create and render a Picker object for searching images. if (this.pickerApiLoaded && frappe.boot.user.google_drive_token) { - var view = new google.picker.View(google.picker.ViewId.DOCS); + var view = new google.picker.DocsView(google.picker.ViewId.DOCS) + .setParent('root') // show the root folder by default + .setIncludeFolders(true); // also show folders, not just files + var picker = new google.picker.PickerBuilder() .setAppId(this.appId) .setOAuthToken(frappe.boot.user.google_drive_token) From 11f4edf051bf9842e58228faae2d2a349d2e763d Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 29 Mar 2021 21:22:37 +0200 Subject: [PATCH 0017/1519] feat: localize google drive picker --- frappe/public/js/integrations/google_drive.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js index 6b9ee9d0ff..076178046e 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive.js @@ -70,11 +70,13 @@ export default class GoogleDrive { var picker = new google.picker.PickerBuilder() .setAppId(this.appId) + .setDeveloperKey(this.developerKey) .setOAuthToken(frappe.boot.user.google_drive_token) .addView(view) - .setDeveloperKey(this.developerKey) + .setLocale(frappe.boot.lang) .setCallback(this.pickerCallback) .build(); + picker.setVisible(true); } } From 741011085b6ba3cccc86ba3514d9deff4eb82b54 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 30 Mar 2021 00:49:02 +0200 Subject: [PATCH 0018/1519] refactor: bind this --- frappe/public/js/integrations/google_drive.js | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive.js index 076178046e..06d9cbbe54 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive.js @@ -5,9 +5,9 @@ export default class GoogleDrive { clientId, appId } = {}) { - this.pickerCallback = pickerCallback; - this.pickerApiLoaded = false; this.scope = ['https://www.googleapis.com/auth/drive.readonly']; + this.pickerApiLoaded = false; + this.pickerCallback = pickerCallback; this.developerKey = developerKey; this.clientId = clientId; this.appId = appId; @@ -19,24 +19,17 @@ export default class GoogleDrive { method: "GET", url: "https://apis.google.com/js/api.js", dataType: "script", - cache: true, - context: this - }).done(function() { - this.loadGapi(); - }.bind(this)); + cache: true + }).done(this.loadGapi.bind(this)); } loadGapi() { // load auth and picker libraries if (!frappe.boot.user.google_drive_token) { - gapi.load('auth', function() { - this.onAuthApiLoad(); - }.bind(this)); + gapi.load('auth', this.onAuthApiLoad.bind(this)); } - gapi.load('picker', function() { - this.onPickerApiLoad(); - }.bind(this)); + gapi.load('picker', this.onPickerApiLoad.bind(this)); } onAuthApiLoad() { @@ -44,9 +37,7 @@ export default class GoogleDrive { 'client_id': this.clientId, 'scope': this.scope, 'immediate': false - }, function(authResult) { - this.handleAuthResult(authResult); - }.bind(this)); + }, this.handleAuthResult.bind(this)); } handleAuthResult(authResult) { From a018e7b4458c028ebed29d8e889ae72f086d0479 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 30 Mar 2021 01:28:12 +0200 Subject: [PATCH 0019/1519] refactor: rename GoogleDrive -> GoogleDrivePicker --- frappe/public/js/frappe/file_uploader/FileUploader.vue | 4 ++-- .../integrations/{google_drive.js => google_drive_picker.js} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename frappe/public/js/integrations/{google_drive.js => google_drive_picker.js} (98%) diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index 61b87606a5..154d4e0ea1 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -122,7 +122,7 @@ import FilePreview from './FilePreview.vue'; import FileBrowser from './FileBrowser.vue'; import WebLink from './WebLink.vue'; -import GoogleDrive from '../../integrations/google_drive'; +import GoogleDrivePicker from '../../integrations/google_drive_picker'; export default { name: 'FileUploader', @@ -457,7 +457,7 @@ export default { frappe.db.get_value("Google Settings", "Google Settings", ["client_id", "api_key", "app_id"]).then(resp => { let dialog = cur_dialog; dialog.hide(); - let google_drive = new GoogleDrive({ + let google_drive = new GoogleDrivePicker({ pickerCallback: data => this.google_drive_callback(data, dialog), developerKey: resp.message.api_key, clientId: resp.message.client_id, diff --git a/frappe/public/js/integrations/google_drive.js b/frappe/public/js/integrations/google_drive_picker.js similarity index 98% rename from frappe/public/js/integrations/google_drive.js rename to frappe/public/js/integrations/google_drive_picker.js index 06d9cbbe54..7ce9810f72 100644 --- a/frappe/public/js/integrations/google_drive.js +++ b/frappe/public/js/integrations/google_drive_picker.js @@ -1,4 +1,4 @@ -export default class GoogleDrive { +export default class GoogleDrivePicker { constructor({ pickerCallback, developerKey, From 144608241e9825af20c88b122a70f29d22aa5a41 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 30 Mar 2021 02:20:11 +0200 Subject: [PATCH 0020/1519] refactor: save one API call --- .../google_settings/google_settings.py | 22 +++++++++++++-- .../js/frappe/file_uploader/FileUploader.vue | 28 +++++++++---------- .../js/integrations/google_drive_picker.js | 8 ++++-- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/frappe/integrations/doctype/google_settings/google_settings.py b/frappe/integrations/doctype/google_settings/google_settings.py index ecc975235a..bd0e845977 100644 --- a/frappe/integrations/doctype/google_settings/google_settings.py +++ b/frappe/integrations/doctype/google_settings/google_settings.py @@ -3,11 +3,29 @@ # For license information, please see license.txt from __future__ import unicode_literals -# import frappe +import frappe from frappe.model.document import Document class GoogleSettings(Document): pass def get_auth_url(): - return "https://www.googleapis.com/oauth2/v4/token" \ No newline at end of file + return "https://www.googleapis.com/oauth2/v4/token" + + +@frappe.whitelist(allow_guest=True) +def get_file_picker_settings(): + """Return all the data FileUploader needs to start the Google Drive Picker.""" + if frappe.session.user == 'Guest': + return {'enabled': False} + + google_settings = frappe.get_single("Google Settings") + if not google_settings.enable: + return {'enabled': False} + + return { + 'enabled': True, + 'appId': google_settings.app_id, + 'developerKey': google_settings.api_key, + 'clientId': google_settings.client_id + } diff --git a/frappe/public/js/frappe/file_uploader/FileUploader.vue b/frappe/public/js/frappe/file_uploader/FileUploader.vue index 154d4e0ea1..64365cfc11 100644 --- a/frappe/public/js/frappe/file_uploader/FileUploader.vue +++ b/frappe/public/js/frappe/file_uploader/FileUploader.vue @@ -63,7 +63,7 @@
{{ __('Camera') }}
- \ - ')); - // add event handler for submit button - verify_token(); + $('.login-content').empty(); + $('.login-content:visible').append($('
').attr({ 'id': 'twofactor_div' }).html('{{ _("Verification") }}{{ _("Verify") }}')); + // add event handler for submit button + verify_token(); } var continue_otp_app = function (setup, qrcode) { From 2b51641799c60ae9b16a1d29e4306d6c35e66070 Mon Sep 17 00:00:00 2001 From: conncampbell Date: Mon, 10 May 2021 16:14:51 -0600 Subject: [PATCH 0043/1519] fix: changed translate entries to javascript rather than python to resolve semgrep linter translate checks --- frappe/templates/includes/login/login.js | 56 ++++++++++++++---------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 93bf95bdb7..4bc17cb14b 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -21,7 +21,7 @@ login.bind_events = function () { args.pwd = $("#login_password").val(); args.device = "desktop"; if (!args.usr || !args.pwd) { - frappe.msgprint('{{ _("Both login and password required") }}'); + frappe.msgprint(__("Both login and password required")); return false; } login.call(args); @@ -36,7 +36,7 @@ login.bind_events = function () { args.redirect_to = frappe.utils.sanitise_redirect(frappe.utils.get_url_arg("redirect-to")); args.full_name = frappe.utils.xss_sanitise(($("#signup_fullname").val() || "").trim()); if (!args.email || !validate_email(args.email) || !args.full_name) { - login.set_status('{{ _("Valid email and name required") }}', 'red'); + login.set_status(__("Valid email and name required"), 'red'); return false; } login.call(args); @@ -49,7 +49,7 @@ login.bind_events = function () { args.cmd = "frappe.core.doctype.user.user.reset_password"; args.user = ($("#forgot_email").val() || "").trim(); if (!args.user) { - login.set_status('{{ _("Valid Login id required.") }}', 'red'); + login.set_status(__("Valid Login id required."), 'red'); return false; } login.call(args); @@ -60,10 +60,10 @@ login.bind_events = function () { var input = $($(this).attr("toggle")); if (input.attr("type") == "password") { input.attr("type", "text"); - $(this).text('{{ _("Hide") }}') + $(this).text(__("Hide")) } else { input.attr("type", "password"); - $(this).text('{{ _("Show") }}') + $(this).text(__("Show")) } }); @@ -75,7 +75,7 @@ login.bind_events = function () { args.pwd = $("#login_password").val(); args.device = "desktop"; if (!args.usr || !args.pwd) { - login.set_status('{{ _("Both login and password required") }}', 'red'); + login.set_status(__("Both login and password required"), 'red'); return false; } login.call(args); @@ -136,7 +136,7 @@ login.signup = function () { // Login login.call = function (args, callback) { - login.set_status('{{ _("Verifying...") }}', 'blue'); + login.set_status(__("Verifying..."), 'blue'); return frappe.call({ type: "POST", @@ -194,7 +194,7 @@ login.login_handlers = (function () { var login_handlers = { 200: function (data) { if (data.message == 'Logged In') { - login.set_status('{{ _("Success") }}', 'green'); + login.set_status(__("Success"), 'green'); window.location.href = frappe.utils.sanitise_redirect(frappe.utils.get_url_arg("redirect-to")) || data.home_page; } else if (data.message == 'Password Reset') { window.location.href = frappe.utils.sanitise_redirect(data.redirect_to); @@ -218,13 +218,13 @@ login.login_handlers = (function () { } } else if (window.location.hash === '#forgot') { if (data.message === 'not found') { - login.set_status('{{ _("Not a valid user") }}', 'red'); + login.set_status(__("Not a valid user"), 'red'); } else if (data.message == 'not allowed') { - login.set_status('{{ _("Not Allowed") }}', 'red'); + login.set_status(__("Not Allowed"), 'red'); } else if (data.message == 'disabled') { - login.set_status('{{ _("Not Allowed: Disabled User") }}', 'red'); + login.set_status(__("Not Allowed: Disabled User"), 'red'); } else { - login.set_status('{{ _("Instructions Emailed") }}', 'green'); + login.set_status(__("Instructions Emailed"), 'green'); } @@ -232,7 +232,7 @@ login.login_handlers = (function () { if (cint(data.message[0]) == 0) { login.set_status(data.message[1], 'red'); } else { - login.set_status('{{ _("Success") }}', 'green'); + login.set_status(__("Success"), 'green'); frappe.msgprint(data.message[1]) } //login.set_status(__(data.message), 'green'); @@ -240,7 +240,7 @@ login.login_handlers = (function () { //OTP verification if (data.verification && data.message != 'Logged In') { - login.set_status('{{ _("Success") }}', 'green'); + login.set_status(__("Success"), 'green'); document.cookie = "tmp_id=" + data.tmp_id; @@ -253,8 +253,8 @@ login.login_handlers = (function () { } } }, - 401: get_error_handler('{{ _("Invalid Login. Try again.") }}'), - 417: get_error_handler('{{ _("Oops! Something went wrong") }}') + 401: get_error_handler(__("Invalid Login. Try again.")), + 417: get_error_handler(__("Oops! Something went wrong")) }; return login_handlers; @@ -282,7 +282,7 @@ var verify_token = function (event) { args.otp = $("#login_token").val(); args.tmp_id = frappe.get_cookie('tmp_id'); if (!args.otp) { - frappe.msgprint('{{ _("Login token required") }}'); + frappe.msgprint(__("Login token required")); return false; } login.call(args); @@ -292,9 +292,17 @@ var verify_token = function (event) { var request_otp = function (r) { $('.login-content').empty(); - $('.login-content:visible').append($('
').attr({ 'id': 'twofactor_div' }).html('{{ _("Verification") }}{{ _("Verify") }}')); - // add event handler for submit button - verify_token(); + $('.login-content:visible').append($('
').attr({ 'id': 'twofactor_div' }).html( + '
\ +
\ + {{ _("Verification") }}\ +
\ +
\ + \ + \ +
')); + // add event handler for submit button + verify_token(); } var continue_otp_app = function (setup, qrcode) { @@ -302,11 +310,11 @@ var continue_otp_app = function (setup, qrcode) { var qrcode_div = $('
'); if (setup) { - direction = $('
').attr('id', 'qr_info').text('{{ _("Enter Code displayed in OTP App.") }}'); + direction = $('
').attr('id', 'qr_info').text(__("Enter Code displayed in OTP App.")); qrcode_div.append(direction); $('#otp_div').prepend(qrcode_div); } else { - direction = $('
').attr('id', 'qr_info').text('{{ _("OTP setup using OTP App was not completed. Please contact Administrator.") }}'); + direction = $('
').attr('id', 'qr_info').text(__("OTP setup using OTP App was not completed. Please contact Administrator.")); qrcode_div.append(direction); $('#otp_div').prepend(qrcode_div); } @@ -320,7 +328,7 @@ var continue_sms = function (setup, prompt) { sms_div.append(prompt) $('#otp_div').prepend(sms_div); } else { - direction = $('
').attr('id', 'qr_info').text(prompt || '{{ _("SMS was not sent. Please contact Administrator.") }}'); + direction = $('
').attr('id', 'qr_info').text(prompt || __("SMS was not sent. Please contact Administrator.")); sms_div.append(direction); $('#otp_div').prepend(sms_div) } @@ -334,7 +342,7 @@ var continue_email = function (setup, prompt) { email_div.append(prompt) $('#otp_div').prepend(email_div); } else { - var direction = $('
').attr('id', 'qr_info').text(prompt || '{{ _("Verification code email not sent. Please contact Administrator.") }}'); + var direction = $('
').attr('id', 'qr_info').text(prompt || __("Verification code email not sent. Please contact Administrator.")); email_div.append(direction); $('#otp_div').prepend(email_div); } From e101105bce30b7eae0a4f3371566ba4e85e0606a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 11 May 2021 10:41:18 +0530 Subject: [PATCH 0044/1519] refactor: Import get_response instead of using serve.get_response --- frappe/tests/test_website.py | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 97e00b9268..5221cbe6b7 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -3,8 +3,7 @@ from __future__ import unicode_literals import unittest import frappe -from frappe.website import render -from frappe.website import serve +from frappe.website.serve import get_response from frappe.website.utils import get_home_page from frappe.utils import set_request @@ -51,7 +50,7 @@ class TestWebsite(unittest.TestCase): def test_page_load(self): set_request(method='POST', path='login') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 200) @@ -62,17 +61,17 @@ class TestWebsite(unittest.TestCase): def test_static_page(self): set_request(method='GET', path='/_test/static-file-test.png') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 200) def test_error_page(self): set_request(method='GET', path='/error') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 500) def test_login(self): set_request(method='GET', path='/login') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) @@ -83,7 +82,7 @@ class TestWebsite(unittest.TestCase): def test_app(self): frappe.set_user('Administrator') set_request(method='GET', path='/app') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 200) html = frappe.safe_decode(response.get_data()) @@ -92,7 +91,7 @@ class TestWebsite(unittest.TestCase): def test_not_found(self): set_request(method='GET', path='/_test/missing') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 404) @@ -118,31 +117,31 @@ class TestWebsite(unittest.TestCase): frappe.cache().delete_key('website_redirects') set_request(method='GET', path='/testfrom') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 301) self.assertEqual(response.headers.get('Location'), r'://testto1') set_request(method='GET', path='/testfromregex/test') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 301) self.assertEqual(response.headers.get('Location'), r'://testto2') set_request(method='GET', path='/testsub/me') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 301) self.assertEqual(response.headers.get('Location'), r'://testto3/me') set_request(method='GET', path='/test404') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 404) set_request(method='GET', path='/testsource') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 301) self.assertEqual(response.headers.get('Location'), '/testtarget') set_request(method='GET', path='/courses/course?course=data') - response = serve.get_response() + response = get_response() self.assertEqual(response.status_code, 301) self.assertEqual(response.headers.get('Location'), '/courses/data') From 5c92e8a12962a4c8acd9037c81ae81433357b56f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 11 May 2021 16:43:22 +0530 Subject: [PATCH 0045/1519] feat: Add class for standard pages (Error & NotFound) --- frappe/website/page_controllers/error_page.py | 9 +++++++++ frappe/website/page_controllers/not_found_page.py | 9 +++++++++ frappe/website/page_controllers/not_permitted_page.py | 4 ++++ 3 files changed, 22 insertions(+) create mode 100644 frappe/website/page_controllers/error_page.py create mode 100644 frappe/website/page_controllers/not_found_page.py diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_controllers/error_page.py new file mode 100644 index 0000000000..caa72b015d --- /dev/null +++ b/frappe/website/page_controllers/error_page.py @@ -0,0 +1,9 @@ +from frappe import _ +from frappe.website.page_controllers.not_found_page import NotFoundPage +from frappe.website.page_controllers.template_page import TemplatePage + +class ErrorPage(TemplatePage): + def __init__(self, path, http_status_code, exception): + path = 'error' + super().__init__(path=path, http_status_code=http_status_code) + self.http_status_code = getattr(exception, 'http_status_code', None) or http_status_code or 500 diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py new file mode 100644 index 0000000000..d1a1797efc --- /dev/null +++ b/frappe/website/page_controllers/not_found_page.py @@ -0,0 +1,9 @@ +from frappe import _ +from frappe.website.page_controllers.template_page import TemplatePage + +class NotFoundPage(TemplatePage): + def __init__(self, path, http_status_code): + super().__init__(path=path, http_status_code=http_status_code) + self.path = '404' + self.http_status_code = 404 + self.template_path = '404' diff --git a/frappe/website/page_controllers/not_permitted_page.py b/frappe/website/page_controllers/not_permitted_page.py index e0cd6bf970..61c6b88e09 100644 --- a/frappe/website/page_controllers/not_permitted_page.py +++ b/frappe/website/page_controllers/not_permitted_page.py @@ -3,6 +3,10 @@ from frappe import _ from frappe.website.page_controllers.template_page import TemplatePage class NotPermittedPage(TemplatePage): + def __init__(self, path, http_status_code): + super().__init__(path=path, http_status_code=http_status_code) + self.http_status_code = 403 + def validate(self): frappe.local.message_title = _("Not Permitted") frappe.local.response['context'] = dict( From 9429d06a17f6cc51716ff40e51b36150d860568f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 11 May 2021 16:44:50 +0530 Subject: [PATCH 0046/1519] refactor: Remove reduntant code - Use Error & NotFound page as required --- frappe/tests/test_website.py | 2 +- frappe/website/serve.py | 22 ++++++++-------------- frappe/www/_test/problematic_page.html | 1 + 3 files changed, 10 insertions(+), 15 deletions(-) create mode 100644 frappe/www/_test/problematic_page.html diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 5221cbe6b7..cc500d1c02 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -65,7 +65,7 @@ class TestWebsite(unittest.TestCase): self.assertEqual(response.status_code, 200) def test_error_page(self): - set_request(method='GET', path='/error') + set_request(method='GET', path='/_test/problematic_page') response = get_response() self.assertEqual(response.status_code, 500) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 1a5852d036..b6586dc1f3 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -2,7 +2,9 @@ import frappe from frappe.utils import cstr from frappe.website.page_controllers.document_page import DocumentPage +from frappe.website.page_controllers.error_page import ErrorPage from frappe.website.page_controllers.list_page import ListPage +from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.print_page import PrintPage from frappe.website.page_controllers.template_page import TemplatePage @@ -26,19 +28,11 @@ def get_response(path=None, http_status_code=200): # there is no way to determine the type of the page based on the route # so evaluate each type of page sequentially - response = StaticPage(path, http_status_code).get() - if not response: - response = TemplatePage(path, http_status_code).get() - if not response: - response = ListPage(path, http_status_code).get() - if not response: - response = WebFormPage(path, http_status_code).get() - if not response: - response = DocumentPage(path, http_status_code).get() - if not response: - response = PrintPage(path, http_status_code).get() - if not response: - response = TemplatePage('404', 404).get() + renderers = [StaticPage, TemplatePage, ListPage, WebFormPage, DocumentPage, PrintPage, NotFoundPage] + for resolver in renderers: + response = resolver(path, http_status_code).get() + if response: + break except frappe.Redirect: return build_response(path, "", 301, { "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), @@ -48,6 +42,6 @@ def get_response(path=None, http_status_code=200): frappe.local.message = cstr(e) response = NotPermittedPage(path, http_status_code).get() except Exception as e: - response = TemplatePage('error', getattr(e, 'http_status_code', None) or http_status_code).get() + response = ErrorPage(path, http_status_code, exception=e).get() return response diff --git a/frappe/www/_test/problematic_page.html b/frappe/www/_test/problematic_page.html new file mode 100644 index 0000000000..5e194421d2 --- /dev/null +++ b/frappe/www/_test/problematic_page.html @@ -0,0 +1 @@ +{% raise %} From 006f0a2bafb9945c8fdf6fcb41c015e45b5967a4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 11 May 2021 17:03:00 +0530 Subject: [PATCH 0047/1519] fix: Rename resolver to renderer --- frappe/website/page_controllers/error_page.py | 2 -- frappe/website/page_controllers/not_found_page.py | 1 - frappe/website/serve.py | 7 ++++--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_controllers/error_page.py index caa72b015d..1f54a5f38c 100644 --- a/frappe/website/page_controllers/error_page.py +++ b/frappe/website/page_controllers/error_page.py @@ -1,5 +1,3 @@ -from frappe import _ -from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.template_page import TemplatePage class ErrorPage(TemplatePage): diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py index d1a1797efc..1d15877e9d 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_controllers/not_found_page.py @@ -1,4 +1,3 @@ -from frappe import _ from frappe.website.page_controllers.template_page import TemplatePage class NotFoundPage(TemplatePage): diff --git a/frappe/website/serve.py b/frappe/website/serve.py index b6586dc1f3..eacaef96e1 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -17,6 +17,8 @@ from frappe.website.render import build_response, resolve_path def get_response(path=None, http_status_code=200): """render html page""" query_string = None + response = None + if not path: path = frappe.local.request.path query_string = frappe.local.request.query_string @@ -25,12 +27,11 @@ def get_response(path=None, http_status_code=200): path = path.strip('/ ') resolve_redirect(path, query_string) path = resolve_path(path) - # there is no way to determine the type of the page based on the route # so evaluate each type of page sequentially renderers = [StaticPage, TemplatePage, ListPage, WebFormPage, DocumentPage, PrintPage, NotFoundPage] - for resolver in renderers: - response = resolver(path, http_status_code).get() + for renderer in renderers: + response = renderer(path, http_status_code).get() if response: break except frappe.Redirect: From 4b7a1488b5b465ce2a4ba9c67c9b01b461ba6342 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 11 May 2021 17:28:16 +0530 Subject: [PATCH 0048/1519] fix: Add New Shortcut --- frappe/desk/desktop.py | 50 ++++++++++++ frappe/public/js/frappe/views/wiki.js | 34 +++++++- .../public/js/frappe/widgets/widget_group.js | 4 - frappe/public/js/frappe/wiki_blocks/blank.js | 10 +-- frappe/public/js/frappe/wiki_blocks/card.js | 21 +++-- frappe/public/js/frappe/wiki_blocks/chart.js | 15 ++-- .../public/js/frappe/wiki_blocks/paragraph.js | 10 +-- .../public/js/frappe/wiki_blocks/shortcut.js | 77 ++++++++++++------- 8 files changed, 164 insertions(+), 57 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index d1b5e27a2f..7f054d5c1f 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -537,6 +537,56 @@ def save_customization(page, config): return True +@frappe.whitelist() +def save_new_widget(page, new_widgets): + original_page = frappe.get_doc("Workspace", page) + widgets = _dict(loads(new_widgets)) + + if widgets.chart: + original_page.charts = new_widget(widgets.chart, "Workspace Chart", "charts") + if widgets.shortcut: + original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + if widgets.card: + original_page.build_links_table_from_cards(widgets.card) + + try: + original_page.save(ignore_permissions=True) + except (ValidationError, TypeError) as e: + # Create a json string to log + json_config = dumps(widgets, sort_keys=True, indent=4) + + # Error log body + log = \ + """ + page: {0} + config: {1} + exception: {2} + """.format(page, json_config, e) + frappe.log_error(log, _("Could not save customization")) + return False + + return True + +def new_widget(config, doctype, parentfield): + if not config: + return [] + prepare_widget_list = [] + for idx, widget in enumerate(config): + # Some cleanup + widget.pop("name", None) + + # New Doc + doc = frappe.new_doc(doctype) + doc.update(widget) + + # Manually Set IDX + doc.idx = idx + 1 + + # Set Parent Field + doc.parentfield = parentfield + + prepare_widget_list.append(doc) + return prepare_widget_list def prepare_widget(config, doctype, parentfield): """Create widget child table entries with parent details diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index dcfa840997..b1fe2dbdf5 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -14,6 +14,7 @@ frappe.views.Wiki = class Wiki { this.sorted_sidebar_items = []; this.tools = {} this.isReadOnly = true; + this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); } @@ -39,6 +40,10 @@ frappe.views.Wiki = class Wiki { frappe.router.route(); this.make_sidebar(root_pages); } + if (this.new_page) { + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`) + this.new_page = null; + } }) } @@ -258,6 +263,7 @@ frappe.views.Wiki = class Wiki { this.setup_customization_buttons(); this.make_sidebar_sortable(); this.make_blocks_sortable(); + // this.customize(); }) }, ); @@ -296,7 +302,8 @@ frappe.views.Wiki = class Wiki { make_blocks_sortable() { let me = this; this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { - handle: ".ce-block", + handle: ".drag-handle", + draggable: ".ce-block", animation: 150, onEnd: function (evt){ me.editor.blocks.move(evt.newIndex, evt.oldIndex); @@ -374,6 +381,8 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); } + this.make_sidebar_sortable(); + this.make_blocks_sortable(); this.dirty = false; }) } @@ -407,6 +416,17 @@ frappe.views.Wiki = class Wiki { } let me = this; this.editor.save().then((outputData) => { + let new_widgets = {}; + outputData.blocks.forEach(item => { + if (item.data.new) { + if (!new_widgets[item.type]) { + new_widgets[item.type] = [] + } + new_widgets[item.type].push(item.data.new); + delete item.data['new']; + } + }) + frappe.call({ method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", args: { @@ -419,10 +439,22 @@ frappe.views.Wiki = class Wiki { callback: function(res) { frappe.dom.unfreeze(); if (res.message) { + let cur_page = res.message; + if (!$.isEmptyObject(new_widgets)) { + frappe.call('frappe.desk.desktop.save_new_widget', { + page: me.title, + new_widgets: new_widgets + }).then(res => { + if(res.message) { + me.reload(); + } + }); + } frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.title = ''; me.parent = ''; me.sorted_sidebar_items = []; + me.new_page = cur_page; me.reload(); } } diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index d1a5e3013c..3d97a8f778 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -218,13 +218,9 @@ export class SingleWidgetGroup { } customize() { - // if (!this.hidden) this.widget_area.show(); this.widgets_list.forEach((wid) => { wid.customize(this.options); }); - - // this.options.allow_create && this.setup_new_widget(); - // this.options.allow_sorting && this.setup_sortable(); } } diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index fa1a950280..ae8a53fc33 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -15,11 +15,11 @@ export default class Blank { this.api = api; this.config = config; this.readOnly = readOnly; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; } render() { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 12061e2d02..a859b04439 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -16,11 +16,12 @@ export default class Card { this.config = config; this.readOnly = readOnly; this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; } render() { @@ -135,15 +136,16 @@ export default class Card { }); this.wrapper.innerHTML = ''; this.sections = {}; + card.in_customize_mode = !this.readOnly; let cards = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", columns: 3, options: { allow_sorting: this.allow_customization, - allow_create: false, - allow_delete: false, - allow_hiding: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, allow_edit: false, }, widgets: card @@ -151,5 +153,8 @@ export default class Card { this.sections["cards"] = cards; this.wrapper.setAttribute("card_name", card_name); + if (!this.readOnly) { + this.sections["cards"].customize(); + } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 054e8d1c12..f8c97852fa 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -16,11 +16,12 @@ export default class Chart { this.config = config; this.readOnly = readOnly; this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; } render() { @@ -135,6 +136,7 @@ export default class Chart { }); this.wrapper.innerHTML = ''; this.sections = {}; + chart.in_customize_mode = !this.readOnly; this.sections["charts"] = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "chart", @@ -152,5 +154,8 @@ export default class Chart { widgets: chart }); this.wrapper.setAttribute("chart_name", chart_name) + if (!this.readOnly) { + this.sections["charts"].customize(); + } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 0cab2b9373..570a04e661 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -23,11 +23,11 @@ export default class Paragraph { this._preserveBlank = config.preserveBlank !== undefined ? config.preserveBlank : false; this.data = data; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; } onKeyUp(e) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 0cb8de6ef8..1a3d2ae970 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Shortcut { static get toolbox() { return { @@ -15,28 +16,25 @@ export default class Shortcut { this.api = api; this.config = config; this.readOnly = readOnly; - this.sections = {}; - this.col = this.data.col ? this.data.col : "12", - this.pt = this.data.pt ? this.data.pt : "0", - this.pr = this.data.pr ? this.data.pr : "0", - this.pb = this.data.pb ? this.data.pb : "0", - this.pl = this.data.pl ? this.data.pl : "0" + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + } } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Shortcut Name", - fieldname: "shortcut_name", - options: this.config.page_data.shortcuts.items.map(({ label }) => label), - change: function() { - if (this.value) { - me._make_shortcuts(this.value); - } - } - }]); + this._new_shortcut(); + if (this.data && this.data.shortcut_name) { this._make_shortcuts(this.data.shortcut_name) } @@ -50,7 +48,8 @@ export default class Shortcut { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_shortcut_widget } } @@ -63,6 +62,30 @@ export default class Shortcut { e.classList.add("pl-" + this.pl) } + _new_shortcut() { + const dialog_class = get_dialog_constructor('shortcut'); + this.dialog = new dialog_class({ + label: this.label, + type: 'shortcut', + primary_action: (widget) => { + widget.in_customize_mode = 1; + let wid = frappe.widget.make_widget({ + ...widget, + widget_type: 'shortcut', + container: this.wrapper, + options: this.options, + }); + wid.customize(this.options); + this.wrapper.setAttribute("shortcut_name", wid.label); + this.new_shortcut_widget = wid.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.shortcut_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12, t = "col-12", @@ -134,20 +157,16 @@ export default class Shortcut { return obj.label == shortcut_name }); this.wrapper.innerHTML = ''; - this.sections = {}; - this.sections["shortcuts"] = new frappe.widget.SingleWidgetGroup({ + shortcut.in_customize_mode = !this.readOnly; + let shortcut_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "shortcut", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - }, + options: this.options, widgets: shortcut }); this.wrapper.setAttribute("shortcut_name", shortcut_name); + if (!this.readOnly) { + shortcut_widget.customize(); + } } } \ No newline at end of file From 80db1a715a8de19fdcd65a0b5b33aa178d79253f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 13:23:47 +0530 Subject: [PATCH 0049/1519] fix: Add New Card --- frappe/desk/desktop.py | 4 +- frappe/desk/doctype/workspace/workspace.py | 29 ++++++ .../public/js/frappe/widgets/widget_dialog.js | 93 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/card.js | 65 +++++++------ 4 files changed, 163 insertions(+), 28 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 7f054d5c1f..c096f50b78 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -543,11 +543,11 @@ def save_new_widget(page, new_widgets): widgets = _dict(loads(new_widgets)) if widgets.chart: - original_page.charts = new_widget(widgets.chart, "Workspace Chart", "charts") + original_page.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - original_page.build_links_table_from_cards(widgets.card) + original_page.build_links_table_from_card(widgets.card) try: original_page.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0934138821..20c9240188 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -100,6 +100,35 @@ class Workspace(Document): "is_query_report": link.get('is_query_report') }) + def build_links_table_from_card(self, config): + # Empty links table + # self.links = [] + # order = config.get('order') + # widgets = config.get('widgets') + + for idx, card in enumerate(config): + # card = widgets[name].copy() + links = loads(card.get('links')) + + self.append('links', { + "label": card.get('label'), + "type": "Card Break", + "icon": card.get('icon'), + "hidden": card.get('hidden') or False + }) + + for link in links: + self.append('links', { + "label": link.get('label'), + "type": "Link", + "link_type": link.get('link_type'), + "link_to": link.get('link_to'), + "onboard": link.get('onboard'), + "only_for": link.get('only_for'), + "dependencies": link.get('dependencies'), + "is_query_report": link.get('is_query_report') + }) + def disable_saving_as_standard(): return frappe.flags.in_install or \ diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index eefb78c29a..5bcaaf9e3e 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -124,6 +124,98 @@ class ChartDialog extends WidgetDialog { } } +class CardDialog extends WidgetDialog { + constructor(opts) { + super(opts); + } + + get_fields() { + let me = this; + return [ + { + fieldtype: "Data", + fieldname: "label", + label: "Label", + }, + { + fieldname: 'links', + fieldtype: 'Table', + label: __('Card Links'), + editable_grid: 1, + data: this.data || [], + get_data: () => { + return this.data || []; + }, + fields: [ + { + fieldname: "label", + fieldtype: "Data", + in_list_view: 1, + label: "Label" + }, + { + fieldname: "icon", + fieldtype: "Data", + label: "Icon" + }, + { + fieldname: "link_type", + fieldtype: "Select", + in_list_view: 1, + label: "Link Type", + options: ["DocType", "Page", "Report"], + onchange: (e) => { + me.link_to = e.currentTarget.value; + } + }, + { + fieldname: "link_to", + fieldtype: "Dynamic Link", + in_list_view: 1, + label: "Link To", + options: "link_type", + get_options: () => { + return me.link_to; + } + }, + { + fieldname: "column_break_7", + fieldtype: "Column Break" + }, + { + fieldname: "dependencies", + fieldtype: "Data", + label: "Dependencies" + }, + { + fieldname: "only_for", + fieldtype: "Link", + label: "Only for ", + options: "Country" + }, + { + default: "0", + fieldname: "onboard", + fieldtype: "Check", + label: "Onboard" + }, + { + default: "0", + fieldname: "is_query_report", + fieldtype: "Check", + label: "Is Query Report" + } + ], + }, + ]; + } + + process_data(data) { + data.label = data.label ? data.label : data.chart_name; + return data; + } +} + class ShortcutDialog extends WidgetDialog { constructor(opts) { super(opts); @@ -437,6 +529,7 @@ export default function get_dialog_constructor(type) { chart: ChartDialog, shortcut: ShortcutDialog, number_card: NumberCardDialog, + card: CardDialog, }; return widget_map[type] || WidgetDialog; diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index a859b04439..cc79a57c3e 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Card { static get toolbox() { return { @@ -22,22 +23,19 @@ export default class Card { this.pb = this.data.pb ? this.data.pb : "0"; this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: false, + } } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Card Name", - fieldname: "card_name", - options: this.config.page_data.cards.items.map(({ label }) => label), - change: function() { - if (this.value) { - me._make_cards(this.value) - } - } - }]); + this._new_card(); + if (this.data && this.data.card_name) { this._make_cards(this.data.card_name) } @@ -51,7 +49,8 @@ export default class Card { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_card_widget } } @@ -64,6 +63,30 @@ export default class Card { e.classList.add("pl-" + this.pl) } + _new_card() { + const dialog_class = get_dialog_constructor('card'); + this.dialog = new dialog_class({ + label: this.label, + type: 'card', + primary_action: (widget) => { + widget.in_customize_mode = 1; + let wid = frappe.widget.make_widget({ + ...widget, + widget_type: 'links', + container: this.wrapper, + options: this.options, + }); + wid.customize(this.options); + this.wrapper.setAttribute("card_name", wid.label); + this.new_card_widget = wid.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.card_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12, t = "col-12", @@ -135,26 +158,16 @@ export default class Card { return obj.label == card_name }); this.wrapper.innerHTML = ''; - this.sections = {}; card.in_customize_mode = !this.readOnly; - let cards = new frappe.widget.SingleWidgetGroup({ + let card_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: false, - }, + options: this.options, widgets: card }); - - this.sections["cards"] = cards; this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { - this.sections["cards"].customize(); + card_widget.customize(); } } } \ No newline at end of file From 2f89787fa96a8883ee056c90c0f539b7be7ab14e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:33:12 +0530 Subject: [PATCH 0050/1519] fix: sider fix --- .../internal_wiki_page/internal_wiki_page.py | 4 +- frappe/desk/page/wiki/wiki.js | 4 +- frappe/public/js/frappe/views/wiki.js | 77 ++++++++-------- frappe/public/js/frappe/wiki_blocks/blank.js | 34 +++---- frappe/public/js/frappe/wiki_blocks/blocks.js | 4 +- frappe/public/js/frappe/wiki_blocks/card.js | 40 ++++----- frappe/public/js/frappe/wiki_blocks/chart.js | 42 ++++----- .../public/js/frappe/wiki_blocks/paragraph.js | 48 +++++----- .../public/js/frappe/wiki_blocks/shortcut.js | 40 ++++----- .../js/frappe/wiki_blocks/spacing_tune.js | 88 +++++++++---------- frappe/public/scss/desk/wiki.scss | 49 +++++------ 11 files changed, 213 insertions(+), 217 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 9e291ed265..6e695ef516 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -3,8 +3,8 @@ # For license information, please see license.txt from __future__ import unicode_literals -import frappe, json -from frappe import _ +import frappe +import json from frappe.model.document import Document class InternalWikiPage(Document): diff --git a/frappe/desk/page/wiki/wiki.js b/frappe/desk/page/wiki/wiki.js index 81ff2a7fa2..6ac8bc89cb 100644 --- a/frappe/desk/page/wiki/wiki.js +++ b/frappe/desk/page/wiki/wiki.js @@ -1,4 +1,4 @@ -frappe.provide('frappe.views') +frappe.provide('frappe.views'); frappe.pages['wiki'].on_page_load = function(wrapper) { frappe.ui.make_app_page({ @@ -12,4 +12,4 @@ frappe.pages['wiki'].on_page_load = function(wrapper) { $(wrapper).bind('show', function () { frappe.wiki.show(); }); -} +}; diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index b1fe2dbdf5..a7c41b66bc 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -12,7 +12,7 @@ frappe.views.Wiki = class Wiki { this.sections = {}; this.sidebar_items = {}; this.sorted_sidebar_items = []; - this.tools = {} + this.tools = {}; this.isReadOnly = true; this.new_page = null; this.prepare_container(); @@ -31,9 +31,9 @@ frappe.views.Wiki = class Wiki { setup_wiki_pages() { this.get_pages().then(() => { - if(this.all_pages) { + if (this.all_pages) { frappe.wiki_pages = {}; - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of this.all_pages || []) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } @@ -41,10 +41,10 @@ frappe.views.Wiki = class Wiki { this.make_sidebar(root_pages); } if (this.new_page) { - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`) + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } - }) + }); } get_pages() { @@ -55,7 +55,7 @@ frappe.views.Wiki = class Wiki { make_sidebar(items) { if (this.sidebar.find('.standard-sidebar-section')[0]) { - this.sidebar.find('.standard-sidebar-section')[0].remove() + this.sidebar.find('.standard-sidebar-section')[0].remove(); } let sidebar_section = $(`
`); @@ -95,25 +95,25 @@ frappe.views.Wiki = class Wiki {
`); - } + }; const make_sidebar_child_item = item => { let $child_item = get_child_item(item); - $child_item.appendTo(child_item_section) + $child_item.appendTo(child_item_section); this.sidebar_items[item.name] = $child_item; - } + }; let $item = get_sidebar_item(item); let drop_icon = $item.find('.drop-icon').get(0); let child_item_section = $item.find('.sidebar-child-item').get(0); - if(this.all_pages.some(e => e.parent_page == item.name)) { + if (this.all_pages.some(e => e.parent_page == item.name)) { drop_icon.classList.remove('hidden'); drop_icon.addEventListener('click', () => { child_item_section.classList.toggle("hidden"); }); } - let child_items = this.all_pages.filter(page => page.parent_page == item.name) + let child_items = this.all_pages.filter(page => page.parent_page == item.name); child_items.forEach(item => make_sidebar_child_item(item)); $item.appendTo(sidebar_section); @@ -138,7 +138,7 @@ frappe.views.Wiki = class Wiki { this.show_page(page); this.get_content(page).then(() => { this.get_data(page).then(() => { - if(this.content){ + if (this.content) { this.tools = { header: { class: Header, @@ -176,22 +176,22 @@ frappe.views.Wiki = class Wiki { }, blank: frappe.wiki_block.blocks['blank'], spacingTune: frappe.wiki_block.tunes['spacing_tune'], - } - if(this.editor) { + }; + if (this.editor) { this.editor.isReady.then(() => { this.editor.configuration.tools.chart.config.page_data = this.page_data; this.editor.configuration.tools.shortcut.config.page_data = this.page_data; this.editor.configuration.tools.card.config.page_data = this.page_data; this.editor.render({ blocks: JSON.parse(this.content) || [] - }) - }) + }); + }); } else { this.initialize_editorjs(JSON.parse(this.content)); } } - }) - }) + }); + }); } get_content(page) { @@ -257,14 +257,14 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); this.editor.isReady - .then(() => { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); - this.setup_customization_buttons(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - // this.customize(); - }) + .then(() => { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({blocks: JSON.parse(this.content)}); + this.setup_customization_buttons(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + // this.customize(); + }); }, ); @@ -279,14 +279,14 @@ frappe.views.Wiki = class Wiki { handle: ".standard-sidebar-item-container", draggable: ".standard-sidebar-item-container", animation: 150, - onEnd: function (evt){ + onEnd: function (evt) { let new_sb_items = []; - let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null) + let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of evt.srcElement.childNodes) { new_sb_items.push({ name: page.attributes['item-name'].value, sequence_id: parseInt(page.attributes['item-sequence'].value) - }) + }); } me.sorted_sidebar_items = []; new_sb_items.forEach((old, index) => { @@ -305,7 +305,7 @@ frappe.views.Wiki = class Wiki { handle: ".drag-handle", draggable: ".ce-block", animation: 150, - onEnd: function (evt){ + onEnd: function (evt) { me.editor.blocks.move(evt.newIndex, evt.oldIndex); }, setData: function (dataTransfer, dragEl) { @@ -377,14 +377,14 @@ frappe.views.Wiki = class Wiki { } ] }).then(() => { - if(this.editor.configuration.readOnly) { + if (this.editor.configuration.readOnly) { this.isReadOnly = false; this.editor.readOnly.toggle(); } this.make_sidebar_sortable(); this.make_blocks_sortable(); this.dirty = false; - }) + }); } }); d.show(); @@ -394,7 +394,7 @@ frappe.views.Wiki = class Wiki { this.dirty = false; const data = { blocks: blocks || [] - } + }; this.editor = new EditorJS({ tools: this.tools, autofocus: false, @@ -421,11 +421,11 @@ frappe.views.Wiki = class Wiki { if (item.data.new) { if (!new_widgets[item.type]) { new_widgets[item.type] = [] - } + }; new_widgets[item.type].push(item.data.new); delete item.data['new']; } - }) + }); frappe.call({ method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", @@ -445,7 +445,7 @@ frappe.views.Wiki = class Wiki { page: me.title, new_widgets: new_widgets }).then(res => { - if(res.message) { + if (res.message) { me.reload(); } }); @@ -460,7 +460,8 @@ frappe.views.Wiki = class Wiki { } }); }).catch((error) => { - console.log('Saving failed: ', error); + error; + // console.log('Saving failed: ', error); }); } @@ -468,4 +469,4 @@ frappe.views.Wiki = class Wiki { this.setup_wiki_pages(); this.dirty = false; } -} +}; diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index ae8a53fc33..f32007de6c 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -10,7 +10,7 @@ export default class Blank { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -39,22 +39,22 @@ export default class Blank { pr: this._getPadding("r"), pb: this._getPadding("b"), pl: this._getPadding("l") - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -67,13 +67,13 @@ export default class Blank { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js index 1b556eeaee..239127a674 100644 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ b/frappe/public/js/frappe/wiki_blocks/blocks.js @@ -19,5 +19,5 @@ frappe.wiki_block.blocks = { }; frappe.wiki_block.tunes = { - spacing_tune : SpacingTune -} \ No newline at end of file + spacing_tune: SpacingTune +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index cc79a57c3e..dd457fea4c 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,7 +11,7 @@ export default class Card { return true; } - constructor({data, api, config, readOnly, block}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -29,7 +29,7 @@ export default class Card { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: false, - } + }; } render() { @@ -37,7 +37,7 @@ export default class Card { this._new_card(); if (this.data && this.data.card_name) { - this._make_cards(this.data.card_name) + this._make_cards(this.data.card_name); } return this.wrapper; } @@ -51,16 +51,16 @@ export default class Card { pb: this._getPadding("b"), pl: this._getPadding("l"), new: this.new_card_widget - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _new_card() { @@ -88,9 +88,9 @@ export default class Card { } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -103,13 +103,13 @@ export default class Card { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -155,7 +155,7 @@ export default class Card { _make_cards(card_name) { let card = this.config.page_data.cards.items.find(obj => { - return obj.label == card_name + return obj.label == card_name; }); this.wrapper.innerHTML = ''; card.in_customize_mode = !this.readOnly; diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index f8c97852fa..5acaa81627 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -10,7 +10,7 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -34,12 +34,12 @@ export default class Chart { options: this.config.page_data.charts.items.map(({ chart_name }) => chart_name), change: function() { if (this.value) { - me._make_charts(this.value) + me._make_charts(this.value); } } }]); if (this.data && this.data.chart_name) { - this._make_charts(this.data.chart_name) + this._make_charts(this.data.chart_name); } return this.wrapper; } @@ -52,22 +52,22 @@ export default class Chart { pr: this._getPadding("r"), pb: this._getPadding("b"), pl: this._getPadding("l") - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -80,13 +80,13 @@ export default class Chart { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -132,7 +132,7 @@ export default class Chart { _make_charts(chart_name) { let chart = this.config.page_data.charts.items.find(obj => { - return obj.chart_name == chart_name + return obj.chart_name == chart_name; }); this.wrapper.innerHTML = ''; this.sections = {}; @@ -153,7 +153,7 @@ export default class Chart { }, widgets: chart }); - this.wrapper.setAttribute("chart_name", chart_name) + this.wrapper.setAttribute("chart_name", chart_name); if (!this.readOnly) { this.sections["charts"].customize(); } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 570a04e661..affc2b436d 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -62,7 +62,7 @@ export default class Paragraph { merge(data) { let newData = { - text : this.data.text + data.text + text: this.data.text + data.text }; this.data = newData; @@ -70,7 +70,7 @@ export default class Paragraph { validate(savedData) { if (savedData.text.trim() === '' && !this._preserveBlank) { - return false; + return false; } return true; @@ -89,17 +89,17 @@ export default class Paragraph { rendered() { var e = this._element.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _getCol() { - var e = 12, - t = "col-12", - n = this._element.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this._element.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -112,13 +112,13 @@ export default class Paragraph { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this._element.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this._element.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -156,7 +156,7 @@ export default class Paragraph { onPaste(event) { const data = { - text: event.detail.data.innerHTML + text: event.detail.data.innerHTML }; this.data = data; @@ -164,16 +164,16 @@ export default class Paragraph { static get conversionConfig() { return { - export: 'text', // to convert Paragraph to other block, use 'text' property of saved data - import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data + export: 'text', // to convert Paragraph to other block, use 'text' property of saved data + import: 'text' // to covert other block's exported string to Paragraph, fill 'text' property of tool data }; } static get sanitize() { return { - text: { - br: true, - } + text: { + br: true, + } }; } @@ -197,7 +197,7 @@ export default class Paragraph { static get pasteConfig() { return { - tags: [ 'P' ] + tags: [ 'P' ] }; } diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 1a3d2ae970..7bcebb478a 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,7 +11,7 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly}){ + constructor({data, api, config, readOnly}) { this.data = data; this.api = api; this.config = config; @@ -28,7 +28,7 @@ export default class Shortcut { allow_delete: this.allow_customization, allow_hiding: false, allow_edit: true, - } + }; } render() { @@ -36,7 +36,7 @@ export default class Shortcut { this._new_shortcut(); if (this.data && this.data.shortcut_name) { - this._make_shortcuts(this.data.shortcut_name) + this._make_shortcuts(this.data.shortcut_name); } return this.wrapper; } @@ -50,16 +50,16 @@ export default class Shortcut { pb: this._getPadding("b"), pl: this._getPadding("l"), new: this.new_shortcut_widget - } + }; } rendered() { var e = this.wrapper.parentNode.parentNode; - e.classList.add("col-" + this.col) - e.classList.add("pt-" + this.pt) - e.classList.add("pr-" + this.pr) - e.classList.add("pb-" + this.pb) - e.classList.add("pl-" + this.pl) + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); } _new_shortcut() { @@ -87,9 +87,9 @@ export default class Shortcut { } _getCol() { - var e = 12, - t = "col-12", - n = this.wrapper.parentNode.parentNode, + var e = 12; + t = "col-12"; + n = this.wrapper.parentNode.parentNode; r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -102,13 +102,13 @@ export default class Shortcut { } _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l", - t = 0, - n = "p" + e + "-0", - r = this.wrapper.parentNode.parentNode, - a = new RegExp(/\pl-.+?\b/, "g"), - i = new RegExp(/\pr-.+?\b/, "g"), - o = new RegExp(/\pt-.+?\b/, "g"), + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + t = 0; + n = "p" + e + "-0"; + r = this.wrapper.parentNode.parentNode; + a = new RegExp(/\pl-.+?\b/, "g"); + i = new RegExp(/\pr-.+?\b/, "g"); + o = new RegExp(/\pt-.+?\b/, "g"); c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { @@ -154,7 +154,7 @@ export default class Shortcut { _make_shortcuts(shortcut_name) { let shortcut = this.config.page_data.shortcuts.items.find(obj => { - return obj.label == shortcut_name + return obj.label == shortcut_name; }); this.wrapper.innerHTML = ''; shortcut.in_customize_mode = !this.readOnly; diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js index 494ba2e97a..ee76503097 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js +++ b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js @@ -71,7 +71,7 @@ export default class SpacingTune { } let currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -82,13 +82,13 @@ export default class SpacingTune { let colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(colClass)){ + if (cn.match(colClass)) { className = cn; } }); let parts = className.split('-'); let width = parseInt(parts[1]); - if(width >= 2){ + if (width >= 2) { currentBlockElement.classList.remove('col-'+width); width = width - 1; currentBlockElement.classList.add('col-'+width); @@ -104,7 +104,7 @@ export default class SpacingTune { } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -115,23 +115,23 @@ export default class SpacingTune { const colClass = new RegExp(/\bcol-.+?\b/, 'g'); if (currentBlockElement.className.match(colClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(colClass)){ - className = cn; - } + if (cn.match(colClass)) { + className = cn; + } }); let parts = className.split('-'); let width = parseInt(parts[1]); - if(width <= 11){ - currentBlockElement.classList.remove('col-'+width); - width = width + 1; + if (width <= 11) { + currentBlockElement.classList.remove('col-'+width); + width = width + 1; currentBlockElement.classList.add('col-'+width); - } + } } } showPadding(event, button) { let me = this; - if(button.classList.contains('cdx-settings-button--active')){ + if (button.classList.contains('cdx-settings-button--active')) { this.sidebar.remove(); button.classList.remove('cdx-settings-button--active'); } else { @@ -290,12 +290,12 @@ export default class SpacingTune { increasePaddingLeft(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -306,13 +306,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pl-'+padding); padding = padding + 1; currentBlockElement.classList.add('pl-'+padding); @@ -324,12 +324,12 @@ export default class SpacingTune { decreasePaddingLeft(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -340,13 +340,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pl-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pl-'+padding); padding = padding - 1; currentBlockElement.classList.add('pl-'+padding); @@ -357,12 +357,12 @@ export default class SpacingTune { increasePaddingRight(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -373,13 +373,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pr-'+padding); padding = padding + 1; currentBlockElement.classList.add('pr-'+padding); @@ -390,12 +390,12 @@ export default class SpacingTune { decreasePaddingRight(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -406,13 +406,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pr-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pr-'+padding); padding = padding - 1; currentBlockElement.classList.add('pr-'+padding); @@ -423,12 +423,12 @@ export default class SpacingTune { increasePaddingTop(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -439,13 +439,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pt-'+padding); padding = padding + 1; currentBlockElement.classList.add('pt-'+padding); @@ -456,12 +456,12 @@ export default class SpacingTune { decreasePaddingTop(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -472,13 +472,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pt-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pt-'+padding); padding = padding - 1; currentBlockElement.classList.add('pt-'+padding); @@ -489,12 +489,12 @@ export default class SpacingTune { increasePaddingBottom(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -505,13 +505,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding <= 4){ + if (padding <= 4) { currentBlockElement.classList.remove('pb-'+padding); padding = padding + 1; currentBlockElement.classList.add('pb-'+padding); @@ -522,12 +522,12 @@ export default class SpacingTune { decreasePaddingBottom(event, button) { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); - if(currentBlockIndex < 0){ + if (currentBlockIndex < 0) { return; } const currentBlock = this.api.blocks.getBlockByIndex(currentBlockIndex); - if (!currentBlock){ + if (!currentBlock) { return; } @@ -538,13 +538,13 @@ export default class SpacingTune { const paddingClass = new RegExp(/\pb-.+?\b/, 'g'); if (currentBlockElement.className.match(paddingClass)) { currentBlockElement.classList.forEach( cn => { - if(cn.match(paddingClass)){ + if (cn.match(paddingClass)) { className = cn; } }); let parts = className.split('-'); let padding = parseInt(parts[1]); - if(padding >= 1){ + if (padding >= 1) { currentBlockElement.classList.remove('pb-'+padding); padding = padding - 1; currentBlockElement.classList.add('pb-'+padding); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index a04fb1e501..8c464a7a48 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -11,6 +11,28 @@ } } } + + .standard-sidebar-item { + justify-content: space-between; + } + + .sidebar-child-item-container { + margin-left: 10px; + + .standard-sidebar-item { + justify-content: start; + } + } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + flex: 1; + } } .ce-header { @@ -124,31 +146,4 @@ height: 145px; box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); border-radius: 0 4px 4px 0;z-index: 0; -} - - -[data-page-route="wiki"] { - - .standard-sidebar-item { - justify-content: space-between; - } - - .sidebar-child-item-container { - margin-left: 10px; - - .standard-sidebar-item { - justify-content: start; - } - } - - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - flex: 1; - } - } \ No newline at end of file From 85f849d3e9d7303815a760a2296bf2374098e738 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:39:11 +0530 Subject: [PATCH 0051/1519] fix: sider fix --- frappe/public/js/frappe/wiki_blocks/blank.js | 20 +++++++++---------- frappe/public/js/frappe/wiki_blocks/card.js | 20 +++++++++---------- frappe/public/js/frappe/wiki_blocks/chart.js | 20 +++++++++---------- .../public/js/frappe/wiki_blocks/paragraph.js | 20 +++++++++---------- .../public/js/frappe/wiki_blocks/shortcut.js | 20 +++++++++---------- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index f32007de6c..f23f2f6225 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -53,9 +53,9 @@ export default class Blank { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -68,13 +68,13 @@ export default class Blank { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index dd457fea4c..3e7fd54dfd 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -89,9 +89,9 @@ export default class Card { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -104,13 +104,13 @@ export default class Card { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 5acaa81627..1d637ef5b6 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -66,9 +66,9 @@ export default class Chart { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -81,13 +81,13 @@ export default class Chart { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index affc2b436d..e80d300ec3 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -98,9 +98,9 @@ export default class Paragraph { _getCol() { var e = 12; - t = "col-12"; - n = this._element.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this._element.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -113,13 +113,13 @@ export default class Paragraph { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this._element.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this._element.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 7bcebb478a..53b5a5eed5 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -88,9 +88,9 @@ export default class Shortcut { _getCol() { var e = 12; - t = "col-12"; - n = this.wrapper.parentNode.parentNode; - r = new RegExp(/\bcol-.+?\b/, "g"); + var t = "col-12"; + var n = this.wrapper.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { e.match(r) && (t = e); @@ -103,13 +103,13 @@ export default class Shortcut { _getPadding() { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - t = 0; - n = "p" + e + "-0"; - r = this.wrapper.parentNode.parentNode; - a = new RegExp(/\pl-.+?\b/, "g"); - i = new RegExp(/\pr-.+?\b/, "g"); - o = new RegExp(/\pt-.+?\b/, "g"); - c = new RegExp(/\pb-.+?\b/, "g"); + var t = 0; + var n = "p" + e + "-0"; + var r = this.wrapper.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); if ("l" == e) { if (r.className.match(a)) { r.classList.forEach(function (e) { From 31e087d1a9b1f90a5bb9b737ca51f078e8dc3f58 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 14:58:41 +0530 Subject: [PATCH 0052/1519] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 6 +-- frappe/public/js/frappe/wiki_blocks/blank.js | 2 +- .../js/frappe/wiki_blocks/spacing_tune.js | 44 +++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index a7c41b66bc..ec4f2a49e8 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -308,7 +308,7 @@ frappe.views.Wiki = class Wiki { onEnd: function (evt) { me.editor.blocks.move(evt.newIndex, evt.oldIndex); }, - setData: function (dataTransfer, dragEl) { + setData: function () { //Do Nothing } }); @@ -420,8 +420,8 @@ frappe.views.Wiki = class Wiki { outputData.blocks.forEach(item => { if (item.data.new) { if (!new_widgets[item.type]) { - new_widgets[item.type] = [] - }; + new_widgets[item.type] = []; + } new_widgets[item.type].push(item.data.new); delete item.data['new']; } diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/blank.js index f23f2f6225..761bd2d9e9 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/blank.js @@ -32,7 +32,7 @@ export default class Blank { return this.wrapper; } - save(blockContent) { + save() { return { col: this._getCol(), pt: this._getPadding("t"), diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js index ee76503097..1cf6891071 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js +++ b/frappe/public/js/frappe/wiki_blocks/spacing_tune.js @@ -37,7 +37,7 @@ export default class SpacingTune { this.api.listeners.on( paddingButton, 'click', - (event) => me.showPadding(event, paddingButton), + () => me.showPadding(paddingButton), false ); @@ -46,7 +46,7 @@ export default class SpacingTune { this.api.listeners.on( decreaseWidthButton, 'click', - (event) => me.decreaseWidth(event, decreaseWidthButton), + () => me.decreaseWidth(), false ); @@ -55,7 +55,7 @@ export default class SpacingTune { this.api.listeners.on( increaseWidthButton, 'click', - (event) => me.increaseWidth(event, increaseWidthButton), + () => me.increaseWidth(), false ); @@ -63,7 +63,7 @@ export default class SpacingTune { return layoutWrapper; } - decreaseWidth(event, button) { + decreaseWidth() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -96,7 +96,7 @@ export default class SpacingTune { } } - increaseWidth(event, button) { + increaseWidth() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -129,7 +129,7 @@ export default class SpacingTune { } } - showPadding(event, button) { + showPadding(button) { let me = this; if (button.classList.contains('cdx-settings-button--active')) { this.sidebar.remove(); @@ -195,7 +195,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingLeft, 'click', - (event) => me.increasePaddingLeft(event, increasePaddingLeft), + () => me.increasePaddingLeft(), false ); sidebarWrapper.appendChild(increasePaddingLeft); @@ -206,7 +206,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingLeft, 'click', - (event) => me.decreasePaddingLeft(event, decreasePaddingLeft), + () => me.decreasePaddingLeft(), false ); sidebarWrapper.appendChild(decreasePaddingLeft); @@ -219,7 +219,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingRight, 'click', - (event) => me.increasePaddingRight(event, increasePaddingRight), + () => me.increasePaddingRight(), false ); sidebarWrapper.appendChild(increasePaddingRight); @@ -230,7 +230,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingRight, 'click', - (event) => me.decreasePaddingRight(event, decreasePaddingRight), + () => me.decreasePaddingRight(), false ); sidebarWrapper.appendChild(decreasePaddingRight); @@ -243,7 +243,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingTop, 'click', - (event) => me.increasePaddingTop(event, increasePaddingTop), + () => me.increasePaddingTop(), false ); sidebarWrapper.appendChild(increasePaddingTop); @@ -254,7 +254,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingTop, 'click', - (event) => me.decreasePaddingTop(event, decreasePaddingTop), + () => me.decreasePaddingTop(), false ); sidebarWrapper.appendChild(decreasePaddingTop); @@ -267,7 +267,7 @@ export default class SpacingTune { this.api.listeners.on( increasePaddingBottom, 'click', - (event) => me.increasePaddingBottom(event, increasePaddingBottom), + () => me.increasePaddingBottom(), false ); sidebarWrapper.appendChild(increasePaddingBottom); @@ -278,7 +278,7 @@ export default class SpacingTune { this.api.listeners.on( decreasePaddingBottom, 'click', - (event) => me.decreasePaddingBottom(event, decreasePaddingBottom), + () => me.decreasePaddingBottom(), false ); sidebarWrapper.appendChild(decreasePaddingBottom); @@ -287,7 +287,7 @@ export default class SpacingTune { } } - increasePaddingLeft(event, button) { + increasePaddingLeft() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -321,7 +321,7 @@ export default class SpacingTune { } - decreasePaddingLeft(event, button) { + decreasePaddingLeft() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -354,7 +354,7 @@ export default class SpacingTune { } } - increasePaddingRight(event, button) { + increasePaddingRight() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -387,7 +387,7 @@ export default class SpacingTune { } } - decreasePaddingRight(event, button) { + decreasePaddingRight() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -420,7 +420,7 @@ export default class SpacingTune { } } - increasePaddingTop(event, button) { + increasePaddingTop() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -453,7 +453,7 @@ export default class SpacingTune { } } - decreasePaddingTop(event, button) { + decreasePaddingTop() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -486,7 +486,7 @@ export default class SpacingTune { } } - increasePaddingBottom(event, button) { + increasePaddingBottom() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { @@ -519,7 +519,7 @@ export default class SpacingTune { } } - decreasePaddingBottom(event, button) { + decreasePaddingBottom() { const currentBlockIndex = this.api.blocks.getCurrentBlockIndex(); if (currentBlockIndex < 0) { From 788c511274eda1e9ac452e739a83ecc16f4cdf98 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 12 May 2021 17:47:55 +0530 Subject: [PATCH 0053/1519] fix: Delete Card and Shortcut --- frappe/public/js/frappe/widgets/widget_group.js | 13 ++++++++----- frappe/public/js/frappe/wiki_blocks/card.js | 10 +++++++--- frappe/public/js/frappe/wiki_blocks/shortcut.js | 12 ++++++++---- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 3d97a8f778..2b85359330 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -205,18 +205,21 @@ export class SingleWidgetGroup { widget_type: this.type, container: this.container, height: this.height || null, - options: { - ...this.options, - on_delete: (name) => this.on_delete(name), - }, }); - + widget_object.options = { + ...this.options, + on_delete: (name) => this.on_delete(name) + }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; return widget_object; } + on_delete(name, setup_new) { + this.api.blocks.delete(); + } + customize() { this.widgets_list.forEach((wid) => { wid.customize(this.options); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 3e7fd54dfd..f06e4754e0 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -73,9 +73,12 @@ export default class Card { let wid = frappe.widget.make_widget({ ...widget, widget_type: 'links', - container: this.wrapper, - options: this.options, + container: this.wrapper }); + wid.options = { + ...this.options, + on_delete: () => this.api.blocks.delete() + } wid.customize(this.options); this.wrapper.setAttribute("card_name", wid.label); this.new_card_widget = wid.get_config(); @@ -163,7 +166,8 @@ export default class Card { container: this.wrapper, type: "links", options: this.options, - widgets: card + widgets: card, + api: this.api }); this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 53b5a5eed5..138ff8eac7 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -27,7 +27,7 @@ export default class Shortcut { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: true, + allow_edit: true }; } @@ -72,9 +72,12 @@ export default class Shortcut { let wid = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', - container: this.wrapper, - options: this.options, + container: this.wrapper }); + wid.options = { + ...this.options, + on_delete: () => this.api.blocks.delete(), + } wid.customize(this.options); this.wrapper.setAttribute("shortcut_name", wid.label); this.new_shortcut_widget = wid.get_config(); @@ -162,7 +165,8 @@ export default class Shortcut { container: this.wrapper, type: "shortcut", options: this.options, - widgets: shortcut + widgets: shortcut, + api: this.api }); this.wrapper.setAttribute("shortcut_name", shortcut_name); if (!this.readOnly) { From fed99bffac29ff4cb99866d6a3e3246170525916 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 13 May 2021 13:34:56 +0530 Subject: [PATCH 0054/1519] fix: Set basepath and toc data to show sidebar --- frappe/website/page_controllers/template_page.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index b050a62bad..49a811b587 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -5,6 +5,7 @@ import frappe from frappe.website.page_controllers.base_template_page import BaseTemplatePage from frappe.website.context import add_sidebar_and_breadcrumbs from frappe.website.render import build_response +from frappe.website.router import get_base_template from frappe.website.utils import (extract_comment_tag, extract_title, get_next_link, get_toc) @@ -31,6 +32,7 @@ class TemplatePage(BaseTemplatePage): self.app = app self.app_path = app_path self.template_path = os.path.relpath(file_path, self.app_path) + self.basepath = os.path.dirname(file_path) return True def get_index_path_options(self, search_path): @@ -74,7 +76,6 @@ class TemplatePage(BaseTemplatePage): same folder. Also the hyphens will be coverted to underscore for python module names. This method sets the pymodule_name if it exists. ''' - self.basepath = self.template_path.rsplit('.', 1)[0] self.pymodule_name = None # replace - with _ in the internal modules names @@ -90,6 +91,9 @@ class TemplatePage(BaseTemplatePage): self.convert_from_markdown() def update_context(self): + self.context.base_template = self.context.base_template or get_base_template(self.path) + self.context.basepath = self.basepath + self.context.path = self.path self.set_page_properties() self.set_properties_from_source() self.load_colocated_files() @@ -196,7 +200,7 @@ class TemplatePage(BaseTemplatePage): def convert_from_markdown(self): if self.template_path.endswith('.md'): self.source = frappe.utils.md_to_html(self.source) - self.page_toc_html = self.source.toc_html + self.context.page_toc_html = self.source.toc_html if not self.context.show_sidebar: self.source = '
' + self.source + '
' From dbd8b66d815c8d255fb493c97eadb68671dcb844 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 13 May 2021 14:22:26 +0530 Subject: [PATCH 0055/1519] fix: Template basepath --- frappe/website/page_controllers/template_page.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 49a811b587..4db6d17541 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -76,10 +76,11 @@ class TemplatePage(BaseTemplatePage): same folder. Also the hyphens will be coverted to underscore for python module names. This method sets the pymodule_name if it exists. ''' + template_basepath = os.path.splitext(self.template_path)[0] self.pymodule_name = None # replace - with _ in the internal modules names - self.pymodule_path = os.path.join(self.basepath.replace("-", "_") + ".py") + self.pymodule_path = os.path.join(template_basepath.replace("-", "_") + ".py") if os.path.exists(os.path.join(self.app_path, self.pymodule_path)): self.pymodule_name = self.app + "." + self.pymodule_path.replace(os.path.sep, ".")[:-3] From 24434ed9dee018f4910898979f90d596f3f64dc3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 13:26:45 +0530 Subject: [PATCH 0056/1519] refactor: Delete unused code from render.py --- frappe/website/render.py | 174 +-------------------------------------- 1 file changed, 2 insertions(+), 172 deletions(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index b7221e364c..ee80fa3b9f 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -22,112 +22,11 @@ from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, from frappe.website.router import clear_sitemap, evaluate_dynamic_routes from frappe.translate import guess_language +from frappe.website.serve import get_response class PageNotFoundError(Exception): pass def render(path=None, http_status_code=None): - # temp feature flag - if True or frappe.conf.flag_new_website: - from frappe.website.serve import get_response - return get_response(path, http_status_code) - else: - return _render(path, http_status_code) - -def _render(path=None, http_status_code=None): - """render html page""" - if not path: - path = frappe.local.request.path - - try: - path = path.strip('/ ') - raise_if_disabled(path) - resolve_redirect(path) - path = resolve_path(path) - data = None - - # if in list of already known 404s, send it - if can_cache() and frappe.cache().hget('website_404', frappe.request.url): - data = render_page('404') - http_status_code = 404 - elif is_static_file(path): - return get_static_file_response() - elif is_web_form(path): - data = render_web_form(path) - else: - try: - data = render_page_by_language(path) - except frappe.PageDoesNotExistError: - doctype, name = get_doctype_from_path(path) - if doctype and name: - path = "printview" - frappe.local.form_dict.doctype = doctype - frappe.local.form_dict.name = name - elif doctype: - path = "list" - frappe.local.form_dict.doctype = doctype - else: - # 404s are expensive, cache them! - frappe.cache().hset('website_404', frappe.request.url, True) - data = render_page('404') - http_status_code = 404 - - if not data: - try: - data = render_page(path) - except frappe.PermissionError as e: - data, http_status_code = render_403(e, path) - - except frappe.PermissionError as e: - data, http_status_code = render_403(e, path) - - except frappe.Redirect as e: - raise e - - except Exception: - path = "error" - data = render_page(path) - http_status_code = 500 - - data = add_csrf_token(data) - - except frappe.Redirect: - return build_response(path, "", 301, { - "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), - "Cache-Control": "no-store, no-cache, must-revalidate" - }) - - return build_response(path, data, http_status_code or 200) - -def is_static_file(path): - if ('.' not in path): - return False - extn = path.rsplit('.', 1)[-1] - if extn in ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json'): - return False - - for app in frappe.get_installed_apps(): - file_path = frappe.get_app_path(app, 'www') + '/' + path - if os.path.exists(file_path): - frappe.flags.file_path = file_path - return True - - return False - -def is_web_form(path): - return bool(frappe.get_all("Web Form", filters={'route': path})) - -def render_web_form(path): - data = render_page(path) - return data - -def get_static_file_response(): - try: - f = open(frappe.flags.file_path, 'rb') - except IOError: - raise NotFound - - response = Response(wrap_file(frappe.local.request.environ, f), direct_passthrough=True) - response.mimetype = mimetypes.guess_type(frappe.flags.file_path)[0] or 'application/octet-stream' - return response + return get_response(path, http_status_code) def build_response(path, data, http_status_code, headers=None): # build response @@ -168,23 +67,6 @@ def add_preload_headers(response): traceback.print_exc() -def render_page_by_language(path): - translated_languages = frappe.get_hooks("translated_languages_for_website") - user_lang = guess_language(translated_languages) - if translated_languages and user_lang in translated_languages: - try: - if path and path != "index": - lang_path = '{0}/{1}'.format(user_lang, path) - else: - lang_path = user_lang # index - - return render_page(lang_path) - except frappe.DoesNotExistError: - return render_page(path) - - else: - return render_page(path) - def render_page(path): """get page html""" out = None @@ -307,7 +189,6 @@ def set_content_type(response, data, path): def clear_cache(path=None): '''Clear website caches - :param path: (optional) for the given path''' for key in ('website_generator_routes', 'website_pages', 'website_full_index', 'sitemap_routes'): @@ -327,54 +208,3 @@ def clear_cache(path=None): for method in frappe.get_hooks("website_clear_cache"): frappe.get_attr(method)(path) - -def render_403(e, pathname): - frappe.local.message = cstr(e.message if six.PY2 else e) - frappe.local.message_title = _("Not Permitted") - frappe.local.response['context'] = dict( - indicator_color = 'red', - primary_action = '/login', - primary_label = _('Login'), - fullpage=True - ) - return render_page("message"), e.http_status_code - -def get_doctype_from_path(path): - doctypes = frappe.db.sql_list("select name from tabDocType") - - parts = path.split("/") - - doctype = parts[0] - name = parts[1] if len(parts) > 1 else None - - if doctype in doctypes: - return doctype, name - - # try scrubbed - doctype = doctype.replace("_", " ").title() - if doctype in doctypes: - return doctype, name - - return None, None - -def add_csrf_token(data): - if frappe.local.session: - return data.replace("", ''.format( - frappe.local.session.data.csrf_token)) - else: - return data - -def raise_if_disabled(path): - routes = frappe.db.get_all('Portal Menu Item', - fields=['route', 'enabled'], - filters={ - 'enabled': 0, - 'route': ['like', '%{0}'.format(path)] - } - ) - - for r in routes: - _path = r.route.lstrip('/') - if path == _path and not r.enabled: - raise frappe.PermissionError - From 4219ef98d18e1b9caf00558bf1adca96c76e3154 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 13:31:13 +0530 Subject: [PATCH 0057/1519] fix: Update renderer sequence --- frappe/website/serve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index eacaef96e1..f11ba1c4fc 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -29,7 +29,7 @@ def get_response(path=None, http_status_code=200): path = resolve_path(path) # there is no way to determine the type of the page based on the route # so evaluate each type of page sequentially - renderers = [StaticPage, TemplatePage, ListPage, WebFormPage, DocumentPage, PrintPage, NotFoundPage] + renderers = [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] for renderer in renderers: response = renderer(path, http_status_code).get() if response: From 39c1a94f896fff0e1781b8df6b60047cb8b7e286 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 13:53:04 +0530 Subject: [PATCH 0058/1519] fix: Circular import --- frappe/website/page_controllers/web_page.py | 1 + frappe/website/render.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/web_page.py b/frappe/website/page_controllers/web_page.py index 2020d491e4..4d9e642b4b 100644 --- a/frappe/website/page_controllers/web_page.py +++ b/frappe/website/page_controllers/web_page.py @@ -7,6 +7,7 @@ class WebPage(object): if not path: path = frappe.local.request.path self.path = path.strip('/ ') + self.basepath = '' def get(self): if self.validate(): diff --git a/frappe/website/render.py b/frappe/website/render.py index ee80fa3b9f..3868a91232 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -22,10 +22,10 @@ from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, from frappe.website.router import clear_sitemap, evaluate_dynamic_routes from frappe.translate import guess_language -from frappe.website.serve import get_response class PageNotFoundError(Exception): pass def render(path=None, http_status_code=None): + from frappe.website.serve import get_response return get_response(path, http_status_code) def build_response(path, data, http_status_code, headers=None): From 56ee6e449cedd64856bc9af9539006d5149266c8 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 14:17:52 +0530 Subject: [PATCH 0059/1519] refactor: Remove render method - also, move clear cache to utils.py --- frappe/utils/response.py | 3 ++- frappe/website/render.py | 33 +++++---------------------------- frappe/website/router.py | 3 --- frappe/website/utils.py | 27 ++++++++++++++++++++++++++- 4 files changed, 33 insertions(+), 33 deletions(-) diff --git a/frappe/utils/response.py b/frappe/utils/response.py index 44b037f3cc..97097ab280 100644 --- a/frappe/utils/response.py +++ b/frappe/utils/response.py @@ -217,7 +217,8 @@ def send_private_file(path): return response def handle_session_stopped(): + from frappe.website.serve import get_response frappe.respond_as_web_page(_("Updating"), _("Your system is being updated. Please refresh again after a few moments."), http_status_code=503, indicator_color='orange', fullpage = True, primary_action=None) - return frappe.website.render.render("message", http_status_code=503) + return get_response("message", http_status_code=503) diff --git a/frappe/website/render.py b/frappe/website/render.py index 3868a91232..895faa5b5f 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -6,27 +6,21 @@ import frappe from frappe import _ import frappe.sessions from frappe.utils import cstr -import os, mimetypes, json +import mimetypes, json import re -import six from six import iteritems from werkzeug.wrappers import Response from werkzeug.routing import Rule from werkzeug.wsgi import wrap_file from frappe.website.context import get_context -from frappe.website.redirect import resolve_redirect from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, get_toc, get_next_link) -from frappe.website.router import clear_sitemap, evaluate_dynamic_routes -from frappe.translate import guess_language +from frappe.website.router import evaluate_dynamic_routes class PageNotFoundError(Exception): pass -def render(path=None, http_status_code=None): - from frappe.website.serve import get_response - return get_response(path, http_status_code) def build_response(path, data, http_status_code, headers=None): # build response @@ -188,23 +182,6 @@ def set_content_type(response, data, path): return data def clear_cache(path=None): - '''Clear website caches - :param path: (optional) for the given path''' - for key in ('website_generator_routes', 'website_pages', - 'website_full_index', 'sitemap_routes'): - frappe.cache().delete_value(key) - - frappe.cache().delete_value("website_404") - if path: - frappe.cache().hdel('website_redirects', path) - delete_page_cache(path) - else: - clear_sitemap() - frappe.clear_cache("Guest") - for key in ('portal_menu_items', 'home_page', 'website_route_rules', - 'doctypes_with_web_view', 'website_redirects', 'page_context', - 'website_page'): - frappe.cache().delete_value(key) - - for method in frappe.get_hooks("website_clear_cache"): - frappe.get_attr(method)(path) + # TODO: Remove this + from frappe.website.utils import clear_cache + return clear_cache(path) diff --git a/frappe/website/router.py b/frappe/website/router.py index 1e61f6dcc3..36779923b5 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -85,9 +85,6 @@ def get_page_context_from_doctype(path): return frappe.get_doc(page_info.get("doctype"), page_info.get("name")).get_page_info() -def clear_sitemap(): - delete_page_cache("*") - def get_all_page_context_from_doctypes(): ''' Get all doctype generated routes (for sitemap.xml) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index efa15bdb14..8c75508d07 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -11,7 +11,6 @@ from six import iteritems from past.builtins import cmp from frappe.utils import md_to_html - def delete_page_cache(path): cache = frappe.cache() cache.delete_value('full_index') @@ -399,3 +398,29 @@ def get_html_content_based_on_type(doc, fieldname, content_type): content = '' return content + + +def clear_cache(path=None): + '''Clear website caches + :param path: (optional) for the given path''' + for key in ('website_generator_routes', 'website_pages', + 'website_full_index', 'sitemap_routes'): + frappe.cache().delete_value(key) + + frappe.cache().delete_value("website_404") + if path: + frappe.cache().hdel('website_redirects', path) + delete_page_cache(path) + else: + clear_sitemap() + frappe.clear_cache("Guest") + for key in ('portal_menu_items', 'home_page', 'website_route_rules', + 'doctypes_with_web_view', 'website_redirects', 'page_context', + 'website_page'): + frappe.cache().delete_value(key) + + for method in frappe.get_hooks("website_clear_cache"): + frappe.get_attr(method)(path) + +def clear_sitemap(): + delete_page_cache("*") From 9ba5bf1133b05d2435e74099227609970501c87c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 18:42:41 +0530 Subject: [PATCH 0060/1519] refactor: Move metatags related code into a separate file --- .../page_controllers/base_template_page.py | 75 ++----------------- frappe/website/website_components/metatags.py | 68 +++++++++++++++++ 2 files changed, 73 insertions(+), 70 deletions(-) create mode 100644 frappe/website/website_components/metatags.py diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index 74ca400372..c40afb7b1c 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -1,13 +1,13 @@ import frappe -from frappe.website.doctype.website_settings.website_settings import \ - get_website_settings +from frappe.website.doctype.website_settings.website_settings import get_website_settings from frappe.website.page_controllers.web_page import WebPage +from frappe.website.website_components.metatags import MetaTags class BaseTemplatePage(WebPage): def init_context(self): self.context = frappe._dict() - self.context.update(get_website_settings(self.context)) + self.context.update(get_website_settings()) self.context.update(frappe.local.conf.get("website_context") or {}) def add_csrf_token(self, html): @@ -19,7 +19,8 @@ class BaseTemplatePage(WebPage): return html def post_process_context(self): - self.add_metatags() + self.tags = MetaTags(self.path, self.context).tags + self.context.metatags = self.tags self.set_base_template_if_missing() self.set_title_with_prefix() self.update_website_context() @@ -53,69 +54,3 @@ class BaseTemplatePage(WebPage): values = frappe.get_attr(method)(self.context) if values: self.context.update(values) - - def add_metatags(self): - self.tags = frappe._dict(self.context.get("metatags") or {}) - self.init_metatags_from_context() - self.set_opengraph_tags() - self.set_twitter_tags() - self.set_meta_published_on() - self.set_metatags_from_website_route_meta() - - self.context.metatags = self.tags - - def init_metatags_from_context(self): - for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): - if key not in self.tags and self.context.get(key): - self.tags[key] = self.context[key] - - if not self.tags.get('title'): - self.tags['title'] = self.context.get('name') - - if self.tags.get('image'): - self.tags['image'] = frappe.utils.get_url(self.tags['image']) - - self.tags["language"] = frappe.local.lang or "en" - - def set_opengraph_tags(self): - if "og:type" not in self.tags: - self.tags["og:type"] = "article" - - for key in ('title', 'description', 'image', 'author', 'url'): - if self.tags.get(key): - self.tags['og:' + key] = self.tags.get(key) - - def set_twitter_tags(self): - for key in ('title', 'description', 'image', 'author', 'url'): - if self.tags.get(key): - self.tags['twitter:' + key] = self.tags.get(key) - - if self.tags.get('image'): - self.tags['twitter:card'] = "summary_large_image" - else: - self.tags["twitter:card"] = "summary" - - def set_meta_published_on(self): - if "published_on" in self.tags: - self.tags["datePublished"] = self.tags["published_on"] - del self.tags["published_on"] - - def set_metatags_from_website_route_meta(self): - ''' - Get meta tags from Website Route meta - they can override the defaults set above - ''' - route = self.path - if route == '': - # homepage - route = frappe.db.get_single_value('Website Settings', 'home_page') - - route_exists = (route - and not route.endswith(('.js', '.css')) - and frappe.db.exists('Website Route Meta', route)) - - if route_exists: - website_route_meta = frappe.get_doc('Website Route Meta', route) - for meta_tag in website_route_meta.meta_tags: - d = meta_tag.get_meta_dict() - self.tags.update(d) diff --git a/frappe/website/website_components/metatags.py b/frappe/website/website_components/metatags.py new file mode 100644 index 0000000000..045bef8fe1 --- /dev/null +++ b/frappe/website/website_components/metatags.py @@ -0,0 +1,68 @@ +import frappe + +class MetaTags(): + def __init__(self, path, context): + self.path = path + self.context = context + self.tags = frappe._dict(self.context.get("metatags") or {}) + self.init_metatags_from_context() + self.set_opengraph_tags() + self.set_twitter_tags() + self.set_meta_published_on() + self.set_metatags_from_website_route_meta() + + def init_metatags_from_context(self): + for key in ('title', 'description', 'image', 'author', 'url', 'published_on'): + if key not in self.tags and self.context.get(key): + self.tags[key] = self.context[key] + + if not self.tags.get('title'): + self.tags['title'] = self.context.get('name') + + if self.tags.get('image'): + self.tags['image'] = frappe.utils.get_url(self.tags['image']) + + self.tags["language"] = frappe.local.lang or "en" + + def set_opengraph_tags(self): + if "og:type" not in self.tags: + self.tags["og:type"] = "article" + + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['og:' + key] = self.tags.get(key) + + def set_twitter_tags(self): + for key in ('title', 'description', 'image', 'author', 'url'): + if self.tags.get(key): + self.tags['twitter:' + key] = self.tags.get(key) + + if self.tags.get('image'): + self.tags['twitter:card'] = "summary_large_image" + else: + self.tags["twitter:card"] = "summary" + + def set_meta_published_on(self): + if "published_on" in self.tags: + self.tags["datePublished"] = self.tags["published_on"] + del self.tags["published_on"] + + def set_metatags_from_website_route_meta(self): + ''' + Get meta tags from Website Route meta + they can override the defaults set above + ''' + route = self.path + if route == '': + # homepage + route = frappe.db.get_single_value('Website Settings', 'home_page') + + route_exists = (route + and not route.endswith(('.js', '.css')) + and frappe.db.exists('Website Route Meta', route)) + + if route_exists: + website_route_meta = frappe.get_doc('Website Route Meta', route) + for meta_tag in website_route_meta.meta_tags: + d = meta_tag.get_meta_dict() + self.tags.update(d) From 20bab0f631acd5dfbf3ddda250472568f057fc6a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 18:58:04 +0530 Subject: [PATCH 0061/1519] refactor: Move code to appropriate places --- frappe/utils/__init__.py | 4 +-- .../website/page_controllers/template_page.py | 36 +++---------------- frappe/website/router.py | 2 +- frappe/website/utils.py | 16 +++++++++ 4 files changed, 24 insertions(+), 34 deletions(-) diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index 43a7b82c16..845cb9be4a 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -770,9 +770,9 @@ def set_request(**kwargs): frappe.local.request = Request(builder.get_environ()) def get_html_for_route(route): - from frappe.website import render + from frappe.website.serve import get_response set_request(method='GET', path=route) - response = render.render() + response = get_response() html = frappe.safe_decode(response.get_data()) return html diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 4db6d17541..f2664fb928 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -6,9 +6,10 @@ from frappe.website.page_controllers.base_template_page import BaseTemplatePage from frappe.website.context import add_sidebar_and_breadcrumbs from frappe.website.render import build_response from frappe.website.router import get_base_template -from frappe.website.utils import (extract_comment_tag, extract_title, - get_next_link, get_toc) +from frappe.website.utils import (extract_comment_tag, + extract_title, get_next_link, get_toc, get_frontmatter) +WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") class TemplatePage(BaseTemplatePage): def validate(self): @@ -36,12 +37,7 @@ class TemplatePage(BaseTemplatePage): return True def get_index_path_options(self, search_path): - return ( - search_path, - search_path + '.html', - search_path + '.md', - search_path + '/index.html', - search_path + '/index.md') + return (f'{search_path}{d}' for d in ('', '.html', '.md', '/index.html', '/index.md')) def render(self): return build_response(self.path, self.get_html(), self.http_status_code, self.headers) @@ -115,8 +111,7 @@ class TemplatePage(BaseTemplatePage): self.http_status_code = self.context.http_status_code def set_pymodule_properties(self): - for prop in ("base_template_path", "template", "no_cache", "sitemap", - "condition_field"): + for prop in WEBPAGE_PY_MODULE_PROPERTIES: if hasattr(self.pymodule, prop): self.context[prop] = getattr(self.pymodule, prop) @@ -237,24 +232,3 @@ class TemplatePage(BaseTemplatePage): def get_start_folders(): return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') - -def get_frontmatter(string): - """ - Reference: https://github.com/jonbeebe/frontmatter - """ - import re - - import yaml - - fmatter = "" - body = "" - result = re.compile(r'^\s*(?:---|\+\+\+)(.*?)(?:---|\+\+\+)\s*(.+)$', re.S | re.M).search(string) - - if result: - fmatter = result.group(1) - body = result.group(2) - - return { - "attributes": yaml.safe_load(fmatter), - "body": body, - } diff --git a/frappe/website/router.py b/frappe/website/router.py index 36779923b5..b048fa55c0 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -9,7 +9,7 @@ import re import frappe from frappe.model.document import get_controller -from frappe.website.utils import can_cache, delete_page_cache, extract_comment_tag, extract_title +from frappe.website.utils import can_cache, extract_comment_tag, extract_title from werkzeug.routing import Map, Rule, NotFound def resolve_route(path): diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 8c75508d07..87e47571fb 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -6,6 +6,8 @@ import functools import re import os import frappe +import re +import yaml from six import iteritems from past.builtins import cmp @@ -424,3 +426,17 @@ def clear_cache(path=None): def clear_sitemap(): delete_page_cache("*") + +def get_frontmatter(string): + "Reference: https://github.com/jonbeebe/frontmatter" + frontmatter = "" + body = "" + result = re.compile(r'^\s*(?:---|\+\+\+)(.*?)(?:---|\+\+\+)\s*(.+)$', re.S | re.M).search(string) + if result: + frontmatter = result.group(1) + body = result.group(2) + + return { + "attributes": yaml.safe_load(frontmatter), + "body": body, + } From 18497989dc71d24c3e7662382fb58cc2d84c1e0a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 21:30:28 +0530 Subject: [PATCH 0062/1519] refactor: Remove render_page from render.py & replace all usages of render_page with get_response --- frappe/__init__.py | 4 +- frappe/search/website_search.py | 4 +- frappe/tests/test_recorder.py | 4 +- frappe/utils/global_search.py | 4 +- .../website/doctype/web_form/test_web_form.py | 1 - frappe/website/render.py | 50 +++---------------- frappe/website/router.py | 6 +-- 7 files changed, 19 insertions(+), 54 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 02b8d71e40..bd46f0f874 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1485,7 +1485,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, :param style: Print Format style. :param as_pdf: Return as PDF. Default False. :param password: Password to encrypt the pdf with. Default None""" - from frappe.website.render import build_page + from frappe.website.serve import get_response from frappe.utils.pdf import get_pdf local.form_dict.doctype = doctype @@ -1500,7 +1500,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, options = {'password': password} if not html: - html = build_page("printview") + html = get_response("printview") if as_pdf: return get_pdf(html, output = output, options = options) diff --git a/frappe/search/website_search.py b/frappe/search/website_search.py index 452ea2a427..ad2ebb504d 100644 --- a/frappe/search/website_search.py +++ b/frappe/search/website_search.py @@ -9,7 +9,7 @@ from whoosh.fields import ID, TEXT, Schema import frappe from frappe.search.full_text_search import FullTextSearch from frappe.utils import set_request, update_progress_bar -from frappe.website.render import render_page +from frappe.website.serve import get_response INDEX_NAME = "web_routes" @@ -61,7 +61,7 @@ class WebsiteSearch(FullTextSearch): try: set_request(method="GET", path=route) - content = render_page(route) + content = get_response(route) soup = BeautifulSoup(content, "html.parser") page_content = soup.find(class_="page_content") text_content = page_content.text if page_content else "" diff --git a/frappe/tests/test_recorder.py b/frappe/tests/test_recorder.py index 64d3c52f63..7dcccd1d71 100644 --- a/frappe/tests/test_recorder.py +++ b/frappe/tests/test_recorder.py @@ -8,7 +8,7 @@ import unittest import frappe import frappe.recorder from frappe.utils import set_request -from frappe.website.render import render_page +from frappe.website.serve import get_response import sqlparse @@ -122,5 +122,5 @@ class TestRecorder(unittest.TestCase): self.assertEqual(call['exact_copies'], query[1]) def test_error_page_rendering(self): - content = render_page("error") + content = get_response("error") self.assertIn("Error", content) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index c20f3b29d4..7541e8b31d 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -310,14 +310,14 @@ def get_routes_to_index(): def add_route_to_global_search(route): from bs4 import BeautifulSoup - from frappe.website.render import render_page + from frappe.website.serve import get_response from frappe.utils import set_request frappe.set_user('Guest') frappe.local.no_cache = True try: set_request(method='GET', path=route) - content = render_page(route) + content = get_response(route) soup = BeautifulSoup(content, 'html.parser') page_content = soup.find(class_='page_content') text_content = page_content.text if page_content else '' diff --git a/frappe/website/doctype/web_form/test_web_form.py b/frappe/website/doctype/web_form/test_web_form.py index 78f7fd6337..0e9ce7c660 100644 --- a/frappe/website/doctype/web_form/test_web_form.py +++ b/frappe/website/doctype/web_form/test_web_form.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe import unittest, json -from frappe.website.render import build_page from frappe.website.doctype.web_form.web_form import accept test_dependencies = ['Web Form'] diff --git a/frappe/website/render.py b/frappe/website/render.py index 895faa5b5f..77c1af1e87 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -1,23 +1,21 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import unicode_literals -import frappe -from frappe import _ -import frappe.sessions -from frappe.utils import cstr -import mimetypes, json +import json +import mimetypes import re from six import iteritems -from werkzeug.wrappers import Response from werkzeug.routing import Rule -from werkzeug.wsgi import wrap_file +from werkzeug.wrappers import Response +import frappe +import frappe.sessions +from frappe import _ from frappe.website.context import get_context -from frappe.website.utils import (get_home_page, can_cache, delete_page_cache, - get_toc, get_next_link) from frappe.website.router import evaluate_dynamic_routes +from frappe.website.utils import (can_cache, get_home_page, get_next_link, get_toc) + class PageNotFoundError(Exception): pass @@ -61,38 +59,6 @@ def add_preload_headers(response): traceback.print_exc() -def render_page(path): - """get page html""" - out = None - - if can_cache(): - # return rendered page - page_cache = frappe.cache().hget("website_page", path) - if page_cache and frappe.local.lang in page_cache: - out = page_cache[frappe.local.lang] - - if out: - frappe.local.response.from_cache = True - return out - - return build(path) - -def build(path): - if not frappe.db: - frappe.connect() - - try: - return build_page(path) - except frappe.DoesNotExistError: - hooks = frappe.get_hooks() - if hooks.website_catch_all: - path = hooks.website_catch_all[0] - return build_page(path) - else: - raise - except Exception: - raise - def build_page(path): if not getattr(frappe.local, "path", None): frappe.local.path = path diff --git a/frappe/website/router.py b/frappe/website/router.py index b048fa55c0..2e27b4c690 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -1,16 +1,16 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import unicode_literals - import io import os import re +from werkzeug.routing import Map, NotFound, Rule + import frappe from frappe.model.document import get_controller from frappe.website.utils import can_cache, extract_comment_tag, extract_title -from werkzeug.routing import Map, Rule, NotFound + def resolve_route(path): """Returns the page route object based on searching in pages and generators. From 080a5b3c6a1395fe085d6d7d7218449139353da9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 21:33:39 +0530 Subject: [PATCH 0063/1519] chore: Delete an unnecessary file - purifycss is no longer used. --- frappe/website/purifycss.py | 43 ------------------------------------- 1 file changed, 43 deletions(-) delete mode 100644 frappe/website/purifycss.py diff --git a/frappe/website/purifycss.py b/frappe/website/purifycss.py deleted file mode 100644 index 39e989db6e..0000000000 --- a/frappe/website/purifycss.py +++ /dev/null @@ -1,43 +0,0 @@ -from __future__ import print_function, unicode_literals -''' -Check for unused CSS Classes - -sUpdate source and target apps below and run from CLI - - bench --site [sitename] execute frappe.website.purifycss.purify.css - -''' - -import frappe, re, os - -source = frappe.get_app_path('frappe_theme', 'public', 'less', 'frappe_theme.less') -target_apps = ['erpnext_com', 'frappe_io', 'translator', 'chart_of_accounts_builder', 'frappe_theme'] - -def purifycss(): - with open(source, 'r') as f: - src = f.read() - - classes = [] - for line in src.splitlines(): - line = line.strip() - if not line: - continue - if line[0]=='@': - continue - classes.extend(re.findall('\.([^0-9][^ :&.{,(]*)', line)) - - classes = list(set(classes)) - - for app in target_apps: - for basepath, folders, files in os.walk(frappe.get_app_path(app)): - for fname in files: - if fname.endswith('.html') or fname.endswith('.md'): - #print 'checking {0}...'.format(fname) - with open(os.path.join(basepath, fname), 'r') as f: - src = f.read() - for c in classes: - if c in src: - classes.remove(c) - - for c in sorted(classes): - print(c) From c964217106538a8950961cb2a1df4445c3fb0291 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 21:40:44 +0530 Subject: [PATCH 0064/1519] style: Fix import issues --- frappe/website/render.py | 4 ---- frappe/website/utils.py | 1 - 2 files changed, 5 deletions(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index 77c1af1e87..87eddf3463 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -11,15 +11,11 @@ from werkzeug.wrappers import Response import frappe import frappe.sessions -from frappe import _ from frappe.website.context import get_context from frappe.website.router import evaluate_dynamic_routes from frappe.website.utils import (can_cache, get_home_page, get_next_link, get_toc) -class PageNotFoundError(Exception): pass - - def build_response(path, data, http_status_code, headers=None): # build response response = Response() diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 87e47571fb..a5fe9c3986 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -6,7 +6,6 @@ import functools import re import os import frappe -import re import yaml from six import iteritems From c5b981524868141f2dee58fa7fc5c24e6584bc70 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 14 May 2021 23:43:36 +0530 Subject: [PATCH 0065/1519] fix: Add get_response_content to get page content --- frappe/__init__.py | 4 ++-- frappe/search/website_search.py | 4 ++-- frappe/utils/global_search.py | 8 ++++---- frappe/website/serve.py | 4 ++++ 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index bd46f0f874..a90fd24d7b 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1485,7 +1485,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, :param style: Print Format style. :param as_pdf: Return as PDF. Default False. :param password: Password to encrypt the pdf with. Default None""" - from frappe.website.serve import get_response + from frappe.website.serve import get_response_content from frappe.utils.pdf import get_pdf local.form_dict.doctype = doctype @@ -1500,7 +1500,7 @@ def get_print(doctype=None, name=None, print_format=None, style=None, options = {'password': password} if not html: - html = get_response("printview") + html = get_response_content("printview") if as_pdf: return get_pdf(html, output = output, options = options) diff --git a/frappe/search/website_search.py b/frappe/search/website_search.py index ad2ebb504d..49bdade936 100644 --- a/frappe/search/website_search.py +++ b/frappe/search/website_search.py @@ -9,7 +9,7 @@ from whoosh.fields import ID, TEXT, Schema import frappe from frappe.search.full_text_search import FullTextSearch from frappe.utils import set_request, update_progress_bar -from frappe.website.serve import get_response +from frappe.website.serve import get_response_content INDEX_NAME = "web_routes" @@ -61,7 +61,7 @@ class WebsiteSearch(FullTextSearch): try: set_request(method="GET", path=route) - content = get_response(route) + content = get_response_content(route) soup = BeautifulSoup(content, "html.parser") page_content = soup.find(class_="page_content") text_content = page_content.text if page_content else "" diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 7541e8b31d..4c78d63918 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -310,14 +310,14 @@ def get_routes_to_index(): def add_route_to_global_search(route): from bs4 import BeautifulSoup - from frappe.website.serve import get_response + from frappe.website.serve import get_response_content from frappe.utils import set_request frappe.set_user('Guest') frappe.local.no_cache = True try: set_request(method='GET', path=route) - content = get_response(route) + content = get_response_content(route) soup = BeautifulSoup(content, 'html.parser') page_content = soup.find(class_='page_content') text_content = page_content.text if page_content else '' @@ -332,8 +332,8 @@ def add_route_to_global_search(route): route=route ) sync_value_in_queue(value) - except (frappe.PermissionError, frappe.DoesNotExistError, frappe.ValidationError, Exception): - pass + except (frappe.PermissionError, frappe.DoesNotExistError, frappe.ValidationError, Exception) as e: + raise e frappe.set_user('Administrator') diff --git a/frappe/website/serve.py b/frappe/website/serve.py index f11ba1c4fc..47ca0aa1d2 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -46,3 +46,7 @@ def get_response(path=None, http_status_code=200): response = ErrorPage(path, http_status_code, exception=e).get() return response + +def get_response_content(path=None, http_status_code=200): + response = get_response(path, http_status_code) + return response.data From 9b26307fe5e2210a6c36645e220d077c1e997090 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 May 2021 12:23:50 +0530 Subject: [PATCH 0066/1519] test: Use get_response_content to get content --- frappe/tests/test_recorder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_recorder.py b/frappe/tests/test_recorder.py index 7dcccd1d71..8a1ae36ad9 100644 --- a/frappe/tests/test_recorder.py +++ b/frappe/tests/test_recorder.py @@ -8,7 +8,7 @@ import unittest import frappe import frappe.recorder from frappe.utils import set_request -from frappe.website.serve import get_response +from frappe.website.serve import get_response_content import sqlparse @@ -122,5 +122,5 @@ class TestRecorder(unittest.TestCase): self.assertEqual(call['exact_copies'], query[1]) def test_error_page_rendering(self): - content = get_response("error") + content = get_response_content("error") self.assertIn("Error", content) From e07fb1f736e459af0668fa83e8a5c23e5793a4d4 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 17 May 2021 15:50:39 +0530 Subject: [PATCH 0067/1519] fix: Edit Shortcut --- frappe/desk/desktop.py | 6 ++++ frappe/desk/doctype/workspace/workspace.py | 5 ---- frappe/public/js/frappe/views/wiki.js | 30 +++++++++---------- .../public/js/frappe/widgets/base_widget.js | 1 + .../public/js/frappe/widgets/widget_group.js | 9 ++++-- frappe/public/js/frappe/wiki_blocks/card.js | 2 +- .../public/js/frappe/wiki_blocks/shortcut.js | 30 ++++++++++++------- 7 files changed, 49 insertions(+), 34 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index c096f50b78..2a09978744 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -4,6 +4,7 @@ from __future__ import unicode_literals import frappe +import json from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -549,6 +550,11 @@ def save_new_widget(page, new_widgets): if widgets.card: original_page.build_links_table_from_card(widgets.card) + content = frappe.db.get_value("Internal Wiki Page", page, "content") + for wid in ['shortcut']: + widd = [x['data'][ wid + '_name'] for x in json.loads(content) if x['type'] == wid] + original_page.set(wid+'s', [ele for ele in original_page.get(wid+'s') if ele.label in widd]) + try: original_page.save(ignore_permissions=True) except (ValidationError, TypeError) as e: diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 20c9240188..18aa383455 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -101,13 +101,8 @@ class Workspace(Document): }) def build_links_table_from_card(self, config): - # Empty links table - # self.links = [] - # order = config.get('order') - # widgets = config.get('widgets') for idx, card in enumerate(config): - # card = widgets[name].copy() links = loads(card.get('links')) self.append('links', { diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index ec4f2a49e8..057ae25902 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -404,6 +404,7 @@ frappe.views.Wiki = class Wiki { this.dirty = true; }, readOnly: true, + logLevel: 'ERROR' }); } @@ -440,22 +441,19 @@ frappe.views.Wiki = class Wiki { frappe.dom.unfreeze(); if (res.message) { let cur_page = res.message; - if (!$.isEmptyObject(new_widgets)) { - frappe.call('frappe.desk.desktop.save_new_widget', { - page: me.title, - new_widgets: new_widgets - }).then(res => { - if (res.message) { - me.reload(); - } - }); - } - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.title = ''; - me.parent = ''; - me.sorted_sidebar_items = []; - me.new_page = cur_page; - me.reload(); + frappe.call('frappe.desk.desktop.save_new_widget', { + page: me.title, + new_widgets: new_widgets + }).then(res => { + if (res.message) { + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.title = ''; + me.parent = ''; + me.sorted_sidebar_items = []; + me.new_page = cur_page; + me.reload(); + } + }); } } }); diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 9bbfb916e5..821df609ef 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -170,6 +170,7 @@ export default class Widget { data.name = this.name; this.refresh(); + this.options.on_edit && this.options.on_edit(data); }, primary_action_label: __("Save") }); diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 2b85359330..913a362932 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -208,7 +208,8 @@ export class SingleWidgetGroup { }); widget_object.options = { ...this.options, - on_delete: (name) => this.on_delete(name) + on_delete: () => this.on_delete(), + on_edit: () => this.on_edit(widget_object) }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; @@ -216,10 +217,14 @@ export class SingleWidgetGroup { return widget_object; } - on_delete(name, setup_new) { + on_delete() { this.api.blocks.delete(); } + on_edit(widget_object) { + this.block.call("on_edit", widget_object); + } + customize() { this.widgets_list.forEach((wid) => { wid.customize(this.options); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index f06e4754e0..89821129e0 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -78,7 +78,7 @@ export default class Card { wid.options = { ...this.options, on_delete: () => this.api.blocks.delete() - } + }; wid.customize(this.options); this.wrapper.setAttribute("card_name", wid.label); this.new_card_widget = wid.get_config(); diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 138ff8eac7..f57c9ef7f1 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,9 +11,10 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; this.col = this.data.col ? this.data.col : "12"; @@ -69,18 +70,19 @@ export default class Shortcut { type: 'shortcut', primary_action: (widget) => { widget.in_customize_mode = 1; - let wid = frappe.widget.make_widget({ + this.shortcut_widget = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', container: this.wrapper }); - wid.options = { + this.shortcut_widget.options = { ...this.options, on_delete: () => this.api.blocks.delete(), - } - wid.customize(this.options); - this.wrapper.setAttribute("shortcut_name", wid.label); - this.new_shortcut_widget = wid.get_config(); + on_edit: () => this.on_edit(this.shortcut_widget) + }; + this.shortcut_widget.customize(this.options); + this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); + this.new_shortcut_widget = this.shortcut_widget.get_config(); }, }); @@ -155,22 +157,30 @@ export default class Shortcut { this.shortcut_field.make(); } + on_edit(shortcut_obj) { + let shortcut = shortcut_obj.get_config(); + this.shortcut_widget.widgets = shortcut; + this.wrapper.setAttribute("shortcut_name", shortcut.label); + this.new_shortcut_widget = shortcut_obj.get_config(); + } + _make_shortcuts(shortcut_name) { let shortcut = this.config.page_data.shortcuts.items.find(obj => { return obj.label == shortcut_name; }); this.wrapper.innerHTML = ''; shortcut.in_customize_mode = !this.readOnly; - let shortcut_widget = new frappe.widget.SingleWidgetGroup({ + this.shortcut_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "shortcut", options: this.options, widgets: shortcut, - api: this.api + api: this.api, + block: this.block }); this.wrapper.setAttribute("shortcut_name", shortcut_name); if (!this.readOnly) { - shortcut_widget.customize(); + this.shortcut_widget.customize(); } } } \ No newline at end of file From 1c4e1bc1df7e0788e235b4f735194d8567de6e58 Mon Sep 17 00:00:00 2001 From: prssanna Date: Wed, 14 Apr 2021 14:48:15 +0530 Subject: [PATCH 0068/1519] refactor: set amended docname to original docname --- frappe/core/doctype/doctype/doctype.py | 16 ++++++ frappe/model/document.py | 10 +++- frappe/model/naming.py | 53 +++++++++++++++++-- frappe/patches.txt | 1 + ...l_name_docfield_to_submittable_doctypes.py | 11 ++++ frappe/public/js/frappe/form/form.js | 24 +++++---- frappe/public/js/frappe/router.js | 6 +++ 7 files changed, 105 insertions(+), 16 deletions(-) create mode 100644 frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 84673f990a..3890ab3a32 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -74,6 +74,7 @@ class DocType(Document): if not self.istable: validate_permissions(self) + self.make_cancellable() self.make_amendable() self.make_repeatable() self.validate_nestedset() @@ -589,6 +590,21 @@ class DocType(Document): "no_copy": 1 }) + def make_cancellable(self): + """If is_submittable is set, add original_name docfield.""" + if self.is_submittable: + if not frappe.db.sql("""select name from tabDocField + where fieldname = 'original_name' and parent = %s""", self.name): + self.append("fields", { + "label": "Original Name", + "fieldtype": "Text", + "fieldname": "original_name", + "read_only": 1, + "hidden": 1, + "print_hide": 1, + "no_copy": 1 + }) + def make_repeatable(self): """If allow_auto_repeat is set, add auto_repeat custom field.""" if self.allow_auto_repeat: diff --git a/frappe/model/document.py b/frappe/model/document.py index 623916597e..2bb4f1f3c0 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -7,7 +7,7 @@ import time from frappe import _, msgprint, is_whitelisted from frappe.utils import flt, cstr, now, get_datetime_str, file_lock, date_diff from frappe.model.base_document import BaseDocument, get_controller -from frappe.model.naming import set_new_name +from frappe.model.naming import set_new_name, rename_cancelled_doc from six import iteritems, string_types from werkzeug.exceptions import NotFound, Forbidden import hashlib, json @@ -919,6 +919,14 @@ class Document(BaseDocument): @whitelist.__func__ def _cancel(self): """Cancel the document. Sets `docstatus` = 2, then saves.""" + + # for backward compatibility + if self.amended_from and not self.original_name: + self.original_name = None + else: + self.original_name = self.name + + self.name = rename_cancelled_doc(self) self.docstatus = 2 self.save() diff --git a/frappe/model/naming.py b/frappe/model/naming.py index b8d6a6f8d7..33a09c659a 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -223,7 +223,16 @@ def revert_series_if_last(key, name, doc=None): * prefix = #### and hashes = 2021 (hash doesn't exist) * will search hash in key then accordingly get prefix = "" """ - if ".#" in key: + + # do not revert if doc is amended, since cancelled docs still exist + if doc.docstatus != 2 and doc.amended_from: + return + + # for first cancelled doc + if doc.docstatus == 2 and not doc.amended_from and doc.original_name: + name = doc.original_name + + if ".#" in key: prefix, hashes = key.rsplit(".", 1) if "#" not in hashes: # get the hash part from the key @@ -306,14 +315,48 @@ def append_number_if_name_exists(doctype, value, fieldname="name", separator="-" def _set_amended_name(doc): + if doc.original_name: + doc.name = doc.original_name + else: + original_name = get_original_name(doc) + doc.name = doc.amended_from + + # rename original doc to next name in series, and set amended doc name as original name + next_name_in_series = get_new_name_from_amended_from(doc) + frappe.rename_doc(doc.doctype, original_name, next_name_in_series, force=True, show_alert=False) + doc.name = original_name + doc.amended_from = next_name_in_series + doc.original_name = original_name + + return doc.name + +def get_original_name(doc): + # get original doc name from chain of amended docs + amended_from = original_name = doc.amended_from + while amended_from: + original_name = amended_from + amended_from = frappe.db.get_value(doc.doctype, amended_from, "amended_from") + + return original_name + +def get_new_name_from_amended_from(doc): am_id = 1 - am_prefix = doc.amended_from - if frappe.db.get_value(doc.doctype, doc.amended_from, "amended_from"): + am_prefix = doc.name + if frappe.db.get_value(doc.doctype, doc.name, "amended_from"): am_id = cint(doc.amended_from.split("-")[-1]) + 1 am_prefix = "-".join(doc.amended_from.split("-")[:-1]) # except the last hyphen - doc.name = am_prefix + "-" + str(am_id) - return doc.name + new_name = am_prefix + "-" + str(am_id) + if new_name == doc.name: + am_id += 1 + new_name = am_prefix + "-" + str(am_id) + return new_name + +def rename_cancelled_doc(doc): + doc = frappe.parse_json(doc) + new_name = get_new_name_from_amended_from(doc) + frappe.rename_doc(doc.doctype, doc.name, new_name, force=True, show_alert=False) + return new_name def _field_autoname(autoname, doc, skip_slicing=None): diff --git a/frappe/patches.txt b/frappe/patches.txt index e70be0a37b..a722bb39fa 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -337,3 +337,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty +frappe.patches.v13_0.add_original_name_docfield_to_submittable_doctypes ####### diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py new file mode 100644 index 0000000000..725d37fd4a --- /dev/null +++ b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py @@ -0,0 +1,11 @@ +import frappe +from frappe.database.schema import add_column + +def execute(): + for doctype in frappe.db.get_all('DocType'): + doctype = frappe.get_doc("DocType", doctype.name) + if doctype.is_submittable and frappe.db.table_exists(doctype.name): + doctype.make_cancellable() + if not frappe.db.has_column(doctype.name, 'original_name'): + add_column(doctype.name, 'original_name', 'Text') + doctype.db_update_all() diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 6d8a6b1cb4..f9d9de967e 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -764,32 +764,36 @@ frappe.ui.form.Form = class FrappeForm { } _cancel(btn, callback, on_error, skip_confirm) { - const me = this; const cancel_doc = () => { frappe.validated = true; - me.script_manager.trigger("before_cancel").then(() => { + this.script_manager.trigger("before_cancel").then(() => { if (!frappe.validated) { - return me.handle_save_fail(btn, on_error); + return this.handle_save_fail(btn, on_error); } - var after_cancel = function(r) { + const original_name = this.docname; + const after_cancel = (r) => { if (r.exc) { - me.handle_save_fail(btn, on_error); + this.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("cancel"); - me.refresh(); callback && callback(); - me.script_manager.trigger("after_cancel"); + this.script_manager.trigger("after_cancel"); + frappe.run_serially([ + () => this.rename_notify(this.doctype, original_name, r.docs[0].name), + () => frappe.router.clear_re_route(this.doctype, original_name), + () => this.refresh(), + ]); } }; - frappe.ui.form.save(me, "cancel", after_cancel, btn); + frappe.ui.form.save(this, "cancel", after_cancel, btn); }); } if (skip_confirm) { cancel_doc(); } else { - frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, me.handle_save_fail(btn, on_error)); + frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, this.handle_save_fail(btn, on_error)); } }; @@ -811,7 +815,7 @@ frappe.ui.form.Form = class FrappeForm { 'docname': this.doc.name }).then(is_amended => { if (is_amended) { - frappe.throw(__('This document is already amended, you cannot ammend it again')); + frappe.throw(__('This document is already amended, you cannot amend it again')); } this.validate_form_action("Amend"); var me = this; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 5378294855..0d5231260c 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -235,6 +235,12 @@ frappe.router = { } }, + clear_re_route(doctype, docname) { + delete frappe.re_route[ + `${encodeURIComponent(frappe.router.slug(doctype))}/${encodeURIComponent(docname)}` + ]; + }, + set_title(sub_path) { if (frappe.route_titles[sub_path]) { frappe.utils.set_title(frappe.route_titles[sub_path]); From 251f878009f8f0e5574307ffd4275cd6ff36e3bc Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 15 Apr 2021 11:20:16 +0530 Subject: [PATCH 0069/1519] test: test naming for cancelled and amended docs --- frappe/tests/test_naming.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 66d48e3612..765ead275f 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -117,3 +117,36 @@ class TestNaming(unittest.TestCase): self.assertEqual(current_index.get('current'), 2) frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + + def test_naming_for_cancelled_and_amended_doc(self): + if not frappe.db.exists('DocType', 'Submittable Doctype'): + frappe.get_doc({ + "doctype": "DocType", + "module": "Core", + "custom": 1, + "is_submittable": 1, + "permissions": [{ + "role": "System Manager", + "read": 1 + }], + "name": 'Submittable Doctype' + }).insert() + + doc = frappe.new_doc('Submittable DocType') + doc.save() + original_name = doc.name + + doc.submit() + doc.cancel() + cancelled_name = doc.name + self.assertEqual(cancelled_name, "{}-1".format(original_name)) + + amended_doc = frappe.copy_doc(doc) + amended_doc.docstatus = 0 + amended_doc.amended_from = doc.name + amended_doc.save() + self.assertEqual(amended_doc.name, original_name) + + amended_doc.submit() + amended_doc.cancel() + self.assertEqual(amended_doc.name, "{}-2".format(original_name)) From 304a771ba2221aa15cb9f186799a0603cb5ee425 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 15 Apr 2021 11:21:48 +0530 Subject: [PATCH 0070/1519] fix: check if doc has attribute amended_from --- frappe/model/naming.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/frappe/model/naming.py b/frappe/model/naming.py index 33a09c659a..b685886c58 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -224,13 +224,14 @@ def revert_series_if_last(key, name, doc=None): * will search hash in key then accordingly get prefix = "" """ - # do not revert if doc is amended, since cancelled docs still exist - if doc.docstatus != 2 and doc.amended_from: - return + if hasattr(doc, 'amended_from'): + # do not revert if doc is amended, since cancelled docs still exist + if doc.docstatus != 2 and doc.amended_from: + return - # for first cancelled doc - if doc.docstatus == 2 and not doc.amended_from and doc.original_name: - name = doc.original_name + # for first cancelled doc + if doc.docstatus == 2 and not doc.amended_from and doc.original_name: + name = doc.original_name if ".#" in key: prefix, hashes = key.rsplit(".", 1) From 3614ca2a4d9ed0831cd3bd7080e977a5c2622149 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 15 Apr 2021 12:17:53 +0530 Subject: [PATCH 0071/1519] style: fix indent --- frappe/core/doctype/doctype/doctype.py | 18 +++++++++--------- frappe/tests/test_naming.py | 23 +++++++++++------------ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 3890ab3a32..0d478015bb 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -580,15 +580,15 @@ class DocType(Document): if self.is_submittable: if not frappe.db.sql("""select name from tabDocField where fieldname = 'amended_from' and parent = %s""", self.name): - self.append("fields", { - "label": "Amended From", - "fieldtype": "Link", - "fieldname": "amended_from", - "options": self.name, - "read_only": 1, - "print_hide": 1, - "no_copy": 1 - }) + self.append("fields", { + "label": "Amended From", + "fieldtype": "Link", + "fieldname": "amended_from", + "options": self.name, + "read_only": 1, + "print_hide": 1, + "no_copy": 1 + }) def make_cancellable(self): """If is_submittable is set, add original_name docfield.""" diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 765ead275f..afaabcc805 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -119,18 +119,17 @@ class TestNaming(unittest.TestCase): frappe.db.sql("""delete from `tabSeries` where name = %s""", series) def test_naming_for_cancelled_and_amended_doc(self): - if not frappe.db.exists('DocType', 'Submittable Doctype'): - frappe.get_doc({ - "doctype": "DocType", - "module": "Core", - "custom": 1, - "is_submittable": 1, - "permissions": [{ - "role": "System Manager", - "read": 1 - }], - "name": 'Submittable Doctype' - }).insert() + frappe.get_doc({ + "doctype": "DocType", + "module": "Core", + "custom": 1, + "is_submittable": 1, + "permissions": [{ + "role": "System Manager", + "read": 1 + }], + "name": 'Submittable Doctype' + }).insert() doc = frappe.new_doc('Submittable DocType') doc.save() From ba267b6e628ea57009aa310645ba2f539708fe76 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 16 Apr 2021 13:03:21 +0530 Subject: [PATCH 0072/1519] fix: update patch --- frappe/patches.txt | 2 +- .../add_original_name_docfield_to_submittable_doctypes.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/patches.txt b/frappe/patches.txt index a722bb39fa..1db775f17c 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -337,4 +337,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.add_original_name_docfield_to_submittable_doctypes ####### +frappe.patches.v13_0.add_original_name_docfield_to_submittable_doctypes diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py index 725d37fd4a..d870e63305 100644 --- a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py +++ b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py @@ -1,11 +1,9 @@ import frappe -from frappe.database.schema import add_column def execute(): for doctype in frappe.db.get_all('DocType'): doctype = frappe.get_doc("DocType", doctype.name) if doctype.is_submittable and frappe.db.table_exists(doctype.name): doctype.make_cancellable() - if not frappe.db.has_column(doctype.name, 'original_name'): - add_column(doctype.name, 'original_name', 'Text') + frappe.reload_doctype(doctype.name) doctype.db_update_all() From 26801f215cf03f9cb921752456ca6117bbb987f3 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 16 Apr 2021 13:10:14 +0530 Subject: [PATCH 0073/1519] fix: use orm --- frappe/core/doctype/doctype/doctype.py | 48 +++++++++++++------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 0d478015bb..aad0321fa0 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -577,33 +577,33 @@ class DocType(Document): def make_amendable(self): """If is_submittable is set, add amended_from docfields.""" - if self.is_submittable: - if not frappe.db.sql("""select name from tabDocField - where fieldname = 'amended_from' and parent = %s""", self.name): - self.append("fields", { - "label": "Amended From", - "fieldtype": "Link", - "fieldname": "amended_from", - "options": self.name, - "read_only": 1, - "print_hide": 1, - "no_copy": 1 - }) + if self.is_submittable and\ + not frappe.db.get_value('DocField', {'fieldname': 'amended_from', 'parent': self.name}): + + self.append("fields", { + "label": "Amended From", + "fieldtype": "Link", + "fieldname": "amended_from", + "options": self.name, + "read_only": 1, + "print_hide": 1, + "no_copy": 1 + }) def make_cancellable(self): """If is_submittable is set, add original_name docfield.""" - if self.is_submittable: - if not frappe.db.sql("""select name from tabDocField - where fieldname = 'original_name' and parent = %s""", self.name): - self.append("fields", { - "label": "Original Name", - "fieldtype": "Text", - "fieldname": "original_name", - "read_only": 1, - "hidden": 1, - "print_hide": 1, - "no_copy": 1 - }) + if self.is_submittable and\ + not frappe.db.get_value('DocField', {'fieldname': 'amended_from', 'parent': self.name}): + + self.append("fields", { + "label": "Original Name", + "fieldtype": "Text", + "fieldname": "original_name", + "read_only": 1, + "hidden": 1, + "print_hide": 1, + "no_copy": 1 + }) def make_repeatable(self): """If allow_auto_repeat is set, add auto_repeat custom field.""" From 413383bf5cbbe27fb2b93c23e761e0a5b8b7f1f4 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 16 Apr 2021 13:38:06 +0530 Subject: [PATCH 0074/1519] fix: condition in make_cancellable --- frappe/core/doctype/doctype/doctype.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index aad0321fa0..c6f6b628cc 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -593,7 +593,7 @@ class DocType(Document): def make_cancellable(self): """If is_submittable is set, add original_name docfield.""" if self.is_submittable and\ - not frappe.db.get_value('DocField', {'fieldname': 'amended_from', 'parent': self.name}): + not frappe.db.get_value('DocField', {'fieldname': 'original_name', 'parent': self.name}): self.append("fields", { "label": "Original Name", From 2cf5915eee428e026de8b4ad9b8c75c60d756eee Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Fri, 16 Apr 2021 13:38:33 +0530 Subject: [PATCH 0075/1519] fix: use get_meta Co-authored-by: Faris Ansari --- .../v13_0/add_original_name_docfield_to_submittable_doctypes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py index d870e63305..c5080cc692 100644 --- a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py +++ b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py @@ -2,7 +2,7 @@ import frappe def execute(): for doctype in frappe.db.get_all('DocType'): - doctype = frappe.get_doc("DocType", doctype.name) + doctype = frappe.get_meta(doctype.name) if doctype.is_submittable and frappe.db.table_exists(doctype.name): doctype.make_cancellable() frappe.reload_doctype(doctype.name) From 209ece8b6cc23fce390d8bb04d5463a85320dd34 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 16 Apr 2021 14:03:36 +0530 Subject: [PATCH 0076/1519] fix: delete test submittable doctype --- frappe/tests/test_naming.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index afaabcc805..7be2cc3ef7 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -119,7 +119,7 @@ class TestNaming(unittest.TestCase): frappe.db.sql("""delete from `tabSeries` where name = %s""", series) def test_naming_for_cancelled_and_amended_doc(self): - frappe.get_doc({ + submittable_doctype = frappe.get_doc({ "doctype": "DocType", "module": "Core", "custom": 1, @@ -149,3 +149,5 @@ class TestNaming(unittest.TestCase): amended_doc.submit() amended_doc.cancel() self.assertEqual(amended_doc.name, "{}-2".format(original_name)) + + submittable_doctype.delete() \ No newline at end of file From 0c603f0d769536d3351386cb2cd7aaccd99797a5 Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 16 Apr 2021 17:27:12 +0530 Subject: [PATCH 0077/1519] test: fix cancel docs tests --- frappe/core/doctype/doctype/test_doctype.py | 4 ++++ .../add_original_name_docfield_to_submittable_doctypes.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 9c492d2c36..5a53600fff 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -350,6 +350,7 @@ class TestDocType(unittest.TestCase): dump_docs = json.dumps(docs.get('docs')) cancel_all_linked_docs(dump_docs) data_link_doc.cancel() + data_doc.name = '{}-1'.format(data_doc.name) data_doc.load_from_db() self.assertEqual(data_link_doc.docstatus, 2) self.assertEqual(data_doc.docstatus, 2) @@ -435,7 +436,10 @@ class TestDocType(unittest.TestCase): self.assertRaises(frappe.LinkExistsError, data_link_doc_1.cancel) data_doc.load_from_db() + + data_doc_2.name = '{}-1'.format(data_doc_2.name) data_doc_2.load_from_db() + self.assertEqual(data_link_doc_1.docstatus, 2) #linked doc is canceled diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py index c5080cc692..eccff2334f 100644 --- a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py +++ b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py @@ -2,7 +2,7 @@ import frappe def execute(): for doctype in frappe.db.get_all('DocType'): - doctype = frappe.get_meta(doctype.name) + doctype = frappe.get_doc('DocType', doctype.name) if doctype.is_submittable and frappe.db.table_exists(doctype.name): doctype.make_cancellable() frappe.reload_doctype(doctype.name) From b550e54f15d02bbb14d79c70344a89f0f73d9c33 Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 29 Apr 2021 17:31:56 +0530 Subject: [PATCH 0078/1519] fix: add column in patch --- .../add_original_name_docfield_to_submittable_doctypes.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py index eccff2334f..d17242e90a 100644 --- a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py +++ b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py @@ -1,9 +1,11 @@ import frappe +from frappe.database.schema import add_column def execute(): for doctype in frappe.db.get_all('DocType'): doctype = frappe.get_doc('DocType', doctype.name) if doctype.is_submittable and frappe.db.table_exists(doctype.name): doctype.make_cancellable() - frappe.reload_doctype(doctype.name) + if not frappe.db.has_column(doctype.name, 'original_name'): + add_column(doctype.name, 'original_name', 'Text') doctype.db_update_all() From 081677c6c4bf6190c804fb432ee2e83d14c74dda Mon Sep 17 00:00:00 2001 From: Prssanna Desai Date: Fri, 7 May 2021 11:30:35 +0530 Subject: [PATCH 0079/1519] fix: typo in test --- frappe/tests/test_naming.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 7be2cc3ef7..e7933ec7b3 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -131,7 +131,7 @@ class TestNaming(unittest.TestCase): "name": 'Submittable Doctype' }).insert() - doc = frappe.new_doc('Submittable DocType') + doc = frappe.new_doc('Submittable Doctype') doc.save() original_name = doc.name From d3d4b49796c551915b965a1d195787286fc16d90 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 May 2021 23:00:37 +0530 Subject: [PATCH 0080/1519] refactor: Simplify sidebar and breadcrumbs code --- frappe/website/context.py | 303 +++--------------- .../website/page_controllers/template_page.py | 56 ++-- 2 files changed, 83 insertions(+), 276 deletions(-) diff --git a/frappe/website/context.py b/frappe/website/context.py index ed5c89f149..c8dade5b8b 100644 --- a/frappe/website/context.py +++ b/frappe/website/context.py @@ -1,206 +1,28 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +import json +import os -from __future__ import unicode_literals -import frappe, os, json - -from frappe.website.doctype.website_settings.website_settings import get_website_settings -from frappe.website.router import get_page_context +import frappe from frappe.model.document import Document -def get_context(path, args=None): - if args and args.source: - context = args - else: - context = get_page_context(path) - if args: - context.update(args) - - if hasattr(frappe.local, 'request'): - # for (remove leading slash) - # path could be overriden in render.resolve_from_map - context["path"] = frappe.local.request.path.strip('/ ') - else: - context["path"] = path - - context.canonical = frappe.utils.get_url(frappe.utils.escape_html(context.path)) - context.route = context.path - context = build_context(context) - - # set using frappe.respond_as_web_page - if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): - context.update(frappe.local.response.context) - - # to be able to inspect the context dict - # Use the macro "inspect" from macros.html - context._context_dict = context - - context.developer_mode = frappe.conf.developer_mode - - return context - -def update_controller_context(context, controller): - module = frappe.get_module(controller) - - if module: - # get config fields - for prop in ("base_template_path", "template", "no_cache", "sitemap", - "condition_field"): - if hasattr(module, prop): - context[prop] = getattr(module, prop) - - if hasattr(module, "get_context"): - import inspect - try: - if inspect.getfullargspec(module.get_context).args: - ret = module.get_context(context) - else: - ret = module.get_context() - if ret: - context.update(ret) - except (frappe.PermissionError, frappe.PageDoesNotExistError, frappe.Redirect): - raise - except: - if not any([frappe.flags.in_migrate, frappe.flags.in_website_search_build]): - frappe.errprint(frappe.utils.get_traceback()) - - if hasattr(module, "get_children"): - context.children = module.get_children(context) - - -def build_context(context): - """get_context method of doc or module is supposed to render - content templates and push it into context""" - context = frappe._dict(context) - - if not "url_prefix" in context: - context.url_prefix = "" - - if context.url_prefix and context.url_prefix[-1]!='/': - context.url_prefix += '/' - - # for backward compatibility - context.docs_base_url = '/docs' - - context.update(get_website_settings(context)) - context.update(frappe.local.conf.get("website_context") or {}) - - # provide doc - if context.doc: - context.update(context.doc.as_dict()) - context.update(context.doc.get_website_properties()) - - if not context.template: - context.template = context.doc.meta.get_web_template() - - if hasattr(context.doc, "get_context"): - ret = context.doc.get_context(context) - - if ret: - context.update(ret) - - for prop in ("no_cache", "sitemap"): - if not prop in context: - context[prop] = getattr(context.doc, prop, False) - - elif context.controller: - # controller based context - update_controller_context(context, context.controller) - - # controller context extensions - context_controller_hooks = frappe.get_hooks("extend_website_page_controller_context") or {} - for controller, extension in context_controller_hooks.items(): - if isinstance(extension, list): - for ext in extension: - if controller == context.controller: - update_controller_context(context, ext) - else: - update_controller_context(context, extension) - - add_metatags(context) - add_sidebar_and_breadcrumbs(context) - - # determine templates to be used - if not context.base_template_path: - app_base = frappe.get_hooks("base_template") - context.base_template_path = app_base[-1] if app_base else "templates/base.html" - - if context.title_prefix and context.title and not context.title.startswith(context.title_prefix): - context.title = '{0} - {1}'.format(context.title_prefix, context.title) - - # apply context from hooks - update_website_context = frappe.get_hooks('update_website_context') - for method in update_website_context: - values = frappe.get_attr(method)(context) - if values: - context.update(values) - - return context - -def load_sidebar(context, sidebar_json_path): - with open(sidebar_json_path, 'r') as sidebarfile: - try: - sidebar_json = sidebarfile.read() - context.sidebar_items = json.loads(sidebar_json) - context.show_sidebar = 1 - except json.decoder.JSONDecodeError: - frappe.throw('Invalid Sidebar JSON at ' + sidebar_json_path) - -def get_sidebar_json_path(path, look_for=False): - ''' - Get _sidebar.json path from directory path - - :param path: path of the current diretory - :param look_for: if True, look for _sidebar.json going upwards from given path - - :return: _sidebar.json path - ''' - if os.path.split(path)[1] == 'www' or path == '/' or not path: - return '' - - sidebar_json_path = os.path.join(path, '_sidebar.json') - if os.path.exists(sidebar_json_path): - return sidebar_json_path - else: - if look_for: - return get_sidebar_json_path(os.path.split(path)[0], look_for) - else: - return '' - -def add_sidebar_and_breadcrumbs(context): - '''Add sidebar and breadcrumbs to context''' - from frappe.website.router import get_page_info_from_template - if context.show_sidebar: - context.no_cache = 1 - add_sidebar_data(context) - else: - if context.basepath: - hooks = frappe.get_hooks('look_for_sidebar_json') - look_for_sidebar_json = hooks[0] if hooks else 0 - sidebar_json_path = get_sidebar_json_path( - context.basepath, - look_for_sidebar_json - ) - if sidebar_json_path: - load_sidebar(context, sidebar_json_path) - - if context.add_breadcrumbs and not context.parents: - if context.basepath: - parent_path = os.path.dirname(context.path).rstrip('/') - page_info = get_page_info_from_template(parent_path) - if page_info: - context.parents = [dict(route=parent_path, title=page_info.title)] - -def add_sidebar_data(context): - from frappe.utils.user import get_fullname_and_avatar +def get_sidebar_data(parent_sidebar, basepath): import frappe.www.list + sidebar_data = frappe._dict() - if context.show_sidebar and context.website_sidebar: - context.sidebar_items = frappe.get_all('Website Sidebar Item', - filters=dict(parent=context.website_sidebar), fields=['title', 'route', '`group`'], + hooks = frappe.get_hooks('look_for_sidebar_json') + look_for_sidebar_json = hooks[0] if hooks else 0 + + if basepath and look_for_sidebar_json: + sidebar_items = get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json) + sidebar_data['sidebar_items'] = sidebar_items + + if not sidebar_data.sidebar_items and parent_sidebar: + sidebar_data.sidebar_items = frappe.get_all('Website Sidebar Item', + filters=dict(parent=parent_sidebar), fields=['title', 'route', '`group`'], order_by='idx asc') - if not context.sidebar_items: + if not sidebar_data.sidebar_items: sidebar_items = frappe.cache().hget('portal_menu_items', frappe.session.user) if sidebar_items == None: sidebar_items = [] @@ -224,74 +46,41 @@ def add_sidebar_data(context): add_items(sidebar_items, items_via_hooks) frappe.cache().hset('portal_menu_items', frappe.session.user, sidebar_items) + sidebar_data.sidebar_items = sidebar_items - context.sidebar_items = sidebar_items + return sidebar_data - info = get_fullname_and_avatar(frappe.session.user) - context["fullname"] = info.fullname - context["user_image"] = info.avatar - context["user"] = info.name +def get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json): + sidebar_items = frappe._dict() + sidebar_json_path = get_sidebar_json_path(basepath, look_for_sidebar_json) + if not sidebar_json_path: return sidebar_items + with open(sidebar_json_path, 'r') as sidebarfile: + try: + sidebar_json = sidebarfile.read() + sidebar_items = json.loads(sidebar_json) + except json.decoder.JSONDecodeError: + frappe.throw('Invalid Sidebar JSON at ' + sidebar_json_path) -def add_metatags(context): - tags = frappe._dict(context.get("metatags") or {}) + return sidebar_items - if "og:type" not in tags: - tags["og:type"] = "article" +def get_sidebar_json_path(path, look_for=False): + ''' + Get _sidebar.json path from directory path - if "title" not in tags and context.title: - tags["title"] = context.title + :param path: path of the current diretory + :param look_for: if True, look for _sidebar.json going upwards from given path - title = tags.get("name") or tags.get("title") - if title: - tags["og:title"] = tags["twitter:title"] = title - tags["twitter:card"] = "summary" + :return: _sidebar.json path + ''' + if os.path.split(path)[1] == 'www' or path == '/' or not path: + return '' - if not tags.get('description') and context.description: - tags["description"] = context.description - - description = tags.get("description") - if description: - tags["og:description"] = tags["twitter:description"] = description - - if "image" not in tags and context.image: - tags["image"] = context.image - - image = tags.get("image") - if image: - tags["og:image"] = tags["twitter:image"] = tags["image"] = frappe.utils.get_url(image) - tags['twitter:card'] = "summary_large_image" - - if "author" not in tags and context.author: - tags["author"] = context.author - - tags["og:url"] = tags["url"] = frappe.utils.get_url(context.path) - - if "published_on" not in tags and context.published_on: - tags["published_on"] = context.published_on - - if "published_on" in tags: - tags["datePublished"] = tags["published_on"] - del tags["published_on"] - - tags["language"] = frappe.local.lang or "en" - - # Get meta tags from Website Route meta - # they can override the defaults set above - route = context.path - if route == '': - # homepage - route = frappe.db.get_single_value('Website Settings', 'home_page') - - route_exists = (route - and not route.endswith(('.js', '.css')) - and frappe.db.exists('Website Route Meta', route)) - - if route_exists: - website_route_meta = frappe.get_doc('Website Route Meta', route) - for meta_tag in website_route_meta.meta_tags: - d = meta_tag.get_meta_dict() - tags.update(d) - - # update tags in context - context.metatags = tags + sidebar_json_path = os.path.join(path, '_sidebar.json') + if os.path.exists(sidebar_json_path): + return sidebar_json_path + else: + if look_for: + return get_sidebar_json_path(os.path.split(path)[0], look_for) + else: + return '' diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index f2664fb928..5b001a55e7 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -3,7 +3,7 @@ import os import frappe from frappe.website.page_controllers.base_template_page import BaseTemplatePage -from frappe.website.context import add_sidebar_and_breadcrumbs +from frappe.website.context import get_sidebar_data from frappe.website.render import build_response from frappe.website.router import get_base_template from frappe.website.utils import (extract_comment_tag, @@ -12,29 +12,32 @@ from frappe.website.utils import (extract_comment_tag, WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") class TemplatePage(BaseTemplatePage): - def validate(self): - for app in frappe.get_installed_apps(frappe_last=True): - if self.find_page_in_app(app): - return True + def __init__(self, path, http_status_code=None): + super().__init__(path=path, http_status_code=http_status_code) + self.set_template_path() - def find_page_in_app(self, app): + def set_template_path(self): ''' Searches for file matching the path in the /www - and /templates/pages folders + and /templates/pages folders and sets path if match is found ''' - app_path = frappe.get_app_path(app) folders = get_start_folders() + for app in frappe.get_installed_apps(frappe_last=True): + app_path = frappe.get_app_path(app) - for dirname in folders: - search_path = os.path.join(app_path, dirname, self.path) - for p in self.get_index_path_options(search_path): - file_path = frappe.as_unicode(p) - if os.path.exists(file_path) and not os.path.isdir(file_path): - self.app = app - self.app_path = app_path - self.template_path = os.path.relpath(file_path, self.app_path) - self.basepath = os.path.dirname(file_path) - return True + for dirname in folders: + search_path = os.path.join(app_path, dirname, self.path) + for p in self.get_index_path_options(search_path): + file_path = frappe.as_unicode(p) + if os.path.exists(file_path) and not os.path.isdir(file_path): + self.app = app + self.app_path = app_path + self.template_path = os.path.relpath(file_path, self.app_path) + self.basepath = os.path.dirname(file_path) + return + + def validate(self): + return hasattr(self, 'template_path') and bool(self.template_path) def get_index_path_options(self, search_path): return (f'{search_path}{d}' for d in ('', '.html', '.md', '/index.html', '/index.md')) @@ -59,12 +62,20 @@ class TemplatePage(BaseTemplatePage): return html def post_process_context(self): + self.set_user_info() self.add_sidebar_and_breadcrumbs() self.set_missing_values() super(TemplatePage, self).post_process_context() def add_sidebar_and_breadcrumbs(self): - add_sidebar_and_breadcrumbs(self.context) + if self.basepath: + sidebar_data = get_sidebar_data(self.context.website_sidebar, self.basepath) or None + self.context.sidebar_items = sidebar_data.sidebar_items + + if self.context.add_breadcrumbs and not self.context.parents: + # TODO: set correct title and route for breadcrumbs + parent_path = os.path.dirname(self.path) + self.context.parents = [dict(route=parent_path, title=extract_title(source='', path=parent_path))] def set_pymodule(self): ''' @@ -229,6 +240,13 @@ class TemplatePage(BaseTemplatePage): # for backward compatibility self.context.docs_base_url = '/docs' + def set_user_info(self): + from frappe.utils.user import get_fullname_and_avatar + info = get_fullname_and_avatar(frappe.session.user) + self.context["fullname"] = info.fullname + self.context["user_image"] = info.avatar + self.context["user"] = info.name + def get_start_folders(): return frappe.local.flags.web_pages_folders or ('www', 'templates/pages') From 19879943102d669ad94b82a9ba89177f2430d8d2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 17 May 2021 23:37:28 +0530 Subject: [PATCH 0081/1519] refactor: Move unwanted code from validate - Also, removed unwanted code in render.py --- frappe/website/page_controllers/error_page.py | 5 ++- frappe/website/page_controllers/list_page.py | 11 ++++--- .../page_controllers/not_found_page.py | 8 +++-- .../page_controllers/not_permitted_page.py | 9 +++-- frappe/website/page_controllers/print_page.py | 14 +++++--- .../website/page_controllers/static_page.py | 32 ++++++++++-------- frappe/website/render.py | 33 +------------------ 7 files changed, 50 insertions(+), 62 deletions(-) diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_controllers/error_page.py index 1f54a5f38c..554949684f 100644 --- a/frappe/website/page_controllers/error_page.py +++ b/frappe/website/page_controllers/error_page.py @@ -1,7 +1,10 @@ from frappe.website.page_controllers.template_page import TemplatePage class ErrorPage(TemplatePage): - def __init__(self, path, http_status_code, exception): + def __init__(self, path=None, http_status_code=None, exception=None): path = 'error' super().__init__(path=path, http_status_code=http_status_code) self.http_status_code = getattr(exception, 'http_status_code', None) or http_status_code or 500 + + def validate(self): + return True diff --git a/frappe/website/page_controllers/list_page.py b/frappe/website/page_controllers/list_page.py index 2cb6ed5f26..cc6f150dd2 100644 --- a/frappe/website/page_controllers/list_page.py +++ b/frappe/website/page_controllers/list_page.py @@ -3,8 +3,9 @@ from frappe.website.page_controllers.template_page import TemplatePage class ListPage(TemplatePage): def validate(self): - if frappe.db.get_value('DocType', self.path): - frappe.local.form_dict.doctype = self.path - self.set_standard_path('list') - return True - return False + return frappe.db.exists('DocType', self.path, True) + + def render(self): + frappe.local.form_dict.doctype = self.path + self.set_standard_path('list') + return super().render() diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py index 1d15877e9d..aebc0006ae 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_controllers/not_found_page.py @@ -2,7 +2,9 @@ from frappe.website.page_controllers.template_page import TemplatePage class NotFoundPage(TemplatePage): def __init__(self, path, http_status_code): + path = '404' + http_status_code = 404 super().__init__(path=path, http_status_code=http_status_code) - self.path = '404' - self.http_status_code = 404 - self.template_path = '404' + + def validate(self): + return True diff --git a/frappe/website/page_controllers/not_permitted_page.py b/frappe/website/page_controllers/not_permitted_page.py index 61c6b88e09..3ed732d80b 100644 --- a/frappe/website/page_controllers/not_permitted_page.py +++ b/frappe/website/page_controllers/not_permitted_page.py @@ -1,13 +1,18 @@ import frappe from frappe import _ from frappe.website.page_controllers.template_page import TemplatePage +from frappe.utils import cstr class NotPermittedPage(TemplatePage): - def __init__(self, path, http_status_code): + def __init__(self, path=None, http_status_code=None, exception=''): + frappe.local.message = cstr(exception) super().__init__(path=path, http_status_code=http_status_code) self.http_status_code = 403 def validate(self): + return True + + def render(self): frappe.local.message_title = _("Not Permitted") frappe.local.response['context'] = dict( indicator_color = 'red', @@ -16,4 +21,4 @@ class NotPermittedPage(TemplatePage): fullpage=True ) self.set_standard_path('message') - return True + return super().render() diff --git a/frappe/website/page_controllers/print_page.py b/frappe/website/page_controllers/print_page.py index 6daea7fcbc..574f335f5d 100644 --- a/frappe/website/page_controllers/print_page.py +++ b/frappe/website/page_controllers/print_page.py @@ -9,11 +9,15 @@ class PrintPage(TemplatePage): def validate(self): parts = self.path.split('/', 1) if len(parts)==2: - if (frappe.db.get_value('DocType', parts[0]) - and frappe.db.get_value(parts[0], parts[1])): - frappe.form_dict.doctype = parts[0] - frappe.form_dict.name = parts[1] - self.set_standard_path('printview') + if (frappe.db.exists('DocType', parts[0], True) + and frappe.db.exists(parts[0], parts[1], True)): return True return False + + def render(self): + parts = self.path.split('/', 1) + frappe.form_dict.doctype = parts[0] + frappe.form_dict.name = parts[1] + self.set_standard_path('printview') + return super().render() diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_controllers/static_page.py index 8f474e71be..8c07440ebb 100644 --- a/frappe/website/page_controllers/static_page.py +++ b/frappe/website/page_controllers/static_page.py @@ -7,27 +7,31 @@ from werkzeug.wsgi import wrap_file import frappe from frappe.website.page_controllers.web_page import WebPage +UNSUPPORTED_STATIC_PAGE_TYPES = ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json') class StaticPage(WebPage): - def validate(self): - if ('.' not in self.path): - return False - extension = self.path.rsplit('.', 1)[-1] - if extension in ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json'): - return False + def __init__(self, path, http_status_code=None): + super().__init__(path=path, http_status_code=http_status_code) + self.set_file_path() - if self.find_path_in_apps(): - return True - - return False - - def find_path_in_apps(self): + def set_file_path(self): + self.file_path = '' + if not self.is_valid_file_path(): return for app in frappe.get_installed_apps(): file_path = frappe.get_app_path(app, 'www') + '/' + self.path if os.path.exists(file_path): self.file_path = file_path - return True - return False + + def validate(self): + return self.is_valid_file_path() and self.file_path + + def is_valid_file_path(self): + if ('.' not in self.path): + return False + extension = self.path.rsplit('.', 1)[-1] + if extension in UNSUPPORTED_STATIC_PAGE_TYPES: + return False + return True def render(self): f = open(self.file_path, 'rb') diff --git a/frappe/website/render.py b/frappe/website/render.py index 87eddf3463..6a1d5a404e 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -11,9 +11,8 @@ from werkzeug.wrappers import Response import frappe import frappe.sessions -from frappe.website.context import get_context from frappe.website.router import evaluate_dynamic_routes -from frappe.website.utils import (can_cache, get_home_page, get_next_link, get_toc) +from frappe.website.utils import get_home_page def build_response(path, data, http_status_code, headers=None): @@ -54,36 +53,6 @@ def add_preload_headers(response): import traceback traceback.print_exc() - -def build_page(path): - if not getattr(frappe.local, "path", None): - frappe.local.path = path - - context = get_context(path) - - if context.source: - html = frappe.render_template(context.source, context) - elif context.template: - if path.endswith('min.js'): - html = frappe.get_jloader().get_source(frappe.get_jenv(), context.template)[0] - else: - html = frappe.get_template(context.template).render(context) - - if '{index}' in html: - html = html.replace('{index}', get_toc(context.route)) - - if '{next}' in html: - html = html.replace('{next}', get_next_link(context.route)) - - # html = frappe.get_template(context.base_template_path).render(context) - - if can_cache(context.no_cache): - page_cache = frappe.cache().hget("website_page", path) or {} - page_cache[frappe.local.lang] = html - frappe.cache().hset("website_page", path, page_cache) - - return html - def resolve_path(path): if not path: path = "index" From 5318697c0fd74d7fd534e1e645fdd6e34464cb08 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 08:40:37 +0530 Subject: [PATCH 0082/1519] feat: Add redirect page --- frappe/website/page_controllers/redirect_page.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 frappe/website/page_controllers/redirect_page.py diff --git a/frappe/website/page_controllers/redirect_page.py b/frappe/website/page_controllers/redirect_page.py new file mode 100644 index 0000000000..f3a0ba6e7f --- /dev/null +++ b/frappe/website/page_controllers/redirect_page.py @@ -0,0 +1,16 @@ +import frappe +from frappe.website.render import build_response + +class RedirectPage(object): + def __init__(self, path, http_status_code=301): + self.path = path + self.http_status_code = http_status_code + + def validate(self): + return True + + def render(self): + return build_response(self.path, "", 301, { + "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), + "Cache-Control": "no-store, no-cache, must-revalidate" + }) From a02e5f766a70258ab05e741afc64263f06970137 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 08:43:49 +0530 Subject: [PATCH 0083/1519] refactor: Add path_resolver to separate route resolving part --- frappe/website/path_resolver.py | 67 +++++++++++++++++++++++++++++++++ frappe/website/serve.py | 54 +++++++++++--------------- 2 files changed, 88 insertions(+), 33 deletions(-) create mode 100644 frappe/website/path_resolver.py diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py new file mode 100644 index 0000000000..d6e43f4f1f --- /dev/null +++ b/frappe/website/path_resolver.py @@ -0,0 +1,67 @@ +from frappe.website.redirect import resolve_redirect +from frappe.website.render import resolve_path +import frappe + +from frappe.website.page_controllers.document_page import DocumentPage +from frappe.website.page_controllers.list_page import ListPage +from frappe.website.page_controllers.not_found_page import NotFoundPage +from frappe.website.page_controllers.print_page import PrintPage +from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_controllers.static_page import StaticPage +from frappe.website.page_controllers.web_form import WebFormPage + +class PathResolver(): + def __init__(self, path, http_status_code=None): + self._path = path + self.http_status_code = http_status_code + # self.url_map = get_url_map() + + @property + def path(self): + return self._path.strip('/ ') + + def resolve(self): + '''Returns endpoint and a renderer instance that can render the endpoint''' + query_string = frappe.local.request.query_string + resolve_redirect(self.path, query_string) + endpoint = resolve_path(self.path) + # urls = self.url_map.bind_to_environ(frappe.local.request.environ) + + renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) + + for renderer in renderers: + renderer_instance = renderer(endpoint, self.http_status_code) + can_render = renderer_instance.validate() + if can_render: + return endpoint, renderer_instance + + return endpoint, None + +# #> Path > Path > resolve using url_map > path.endpoint +# # +# # +# # +# # pathclass url_map + +# def get_url_map(): +# Map([Rule('/', endpoint=get_home_page, defaults={'renderer': TemplatePage})]) + + +# query_string = None +# response = None + +# if not path: +# path = frappe.local.request.path +# query_string = frappe.local.request.query_string + +# try: +# path = path.strip('/ ') +# resolve_redirect(path, query_string) +# path = resolve_path(path) +# # there is no way to determine the type of the page based on the route +# # so evaluate each type of page sequentially +# renderers = [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] +# for renderer in renderers: +# response = renderer(path, http_status_code).get() +# if response: +# break diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 47ca0aa1d2..bdec8a16ba 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,49 +1,37 @@ import frappe -from frappe.utils import cstr -from frappe.website.page_controllers.document_page import DocumentPage from frappe.website.page_controllers.error_page import ErrorPage -from frappe.website.page_controllers.list_page import ListPage -from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.not_permitted_page import NotPermittedPage -from frappe.website.page_controllers.print_page import PrintPage -from frappe.website.page_controllers.template_page import TemplatePage -from frappe.website.page_controllers.static_page import StaticPage -from frappe.website.page_controllers.web_form import WebFormPage - -from frappe.website.redirect import resolve_redirect -from frappe.website.render import build_response, resolve_path +from frappe.website.page_controllers.redirect_page import RedirectPage +from frappe.website.path_resolver import PathResolver +from frappe.website.utils import can_cache def get_response(path=None, http_status_code=200): - """render html page""" - query_string = None + """Resolves path and renders page""" response = None + path = path or frappe.local.request.path + endpoint = path + # if can_cache(): + # # return rendered page + # page_cache = frappe.cache().hget("website_page", path) + # if page_cache and frappe.local.lang in page_cache: + # out = page_cache[frappe.local.lang] - if not path: - path = frappe.local.request.path - query_string = frappe.local.request.query_string + # if out: + # frappe.local.response.from_cache = True + # return out try: - path = path.strip('/ ') - resolve_redirect(path, query_string) - path = resolve_path(path) - # there is no way to determine the type of the page based on the route - # so evaluate each type of page sequentially - renderers = [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] - for renderer in renderers: - response = renderer(path, http_status_code).get() - if response: - break + path_resolver = PathResolver(path, http_status_code) + endpoint, renderer_instance = path_resolver.resolve() + if renderer_instance: + response = renderer_instance.render() except frappe.Redirect: - return build_response(path, "", 301, { - "Location": frappe.flags.redirect_location or (frappe.local.response or {}).get('location'), - "Cache-Control": "no-store, no-cache, must-revalidate" - }) + return RedirectPage(endpoint or path, http_status_code).render() except frappe.PermissionError as e: - frappe.local.message = cstr(e) - response = NotPermittedPage(path, http_status_code).get() + response = NotPermittedPage(endpoint, http_status_code, exception=e).render() except Exception as e: - response = ErrorPage(path, http_status_code, exception=e).get() + response = ErrorPage(exception=e).render() return response From c8d588819f940b89e8a48a5190ecf22a188b5ece Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 09:05:02 +0530 Subject: [PATCH 0084/1519] refactor: Move get_sidebar_data method to utils - Also, rename get_sidebar_data to get_sidebar_items & delete context.py - Remove commented text --- frappe/website/context.py | 86 ---------------- .../website/page_controllers/template_page.py | 5 +- frappe/website/path_resolver.py | 39 +------- frappe/website/serve.py | 4 +- frappe/website/utils.py | 97 +++++++++++++++++-- 5 files changed, 99 insertions(+), 132 deletions(-) delete mode 100644 frappe/website/context.py diff --git a/frappe/website/context.py b/frappe/website/context.py deleted file mode 100644 index c8dade5b8b..0000000000 --- a/frappe/website/context.py +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -import json -import os - -import frappe -from frappe.model.document import Document - -def get_sidebar_data(parent_sidebar, basepath): - import frappe.www.list - sidebar_data = frappe._dict() - - hooks = frappe.get_hooks('look_for_sidebar_json') - look_for_sidebar_json = hooks[0] if hooks else 0 - - if basepath and look_for_sidebar_json: - sidebar_items = get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json) - sidebar_data['sidebar_items'] = sidebar_items - - if not sidebar_data.sidebar_items and parent_sidebar: - sidebar_data.sidebar_items = frappe.get_all('Website Sidebar Item', - filters=dict(parent=parent_sidebar), fields=['title', 'route', '`group`'], - order_by='idx asc') - - if not sidebar_data.sidebar_items: - sidebar_items = frappe.cache().hget('portal_menu_items', frappe.session.user) - if sidebar_items == None: - sidebar_items = [] - roles = frappe.get_roles() - portal_settings = frappe.get_doc('Portal Settings', 'Portal Settings') - - def add_items(sidebar_items, items): - for d in items: - if d.get('enabled') and ((not d.get('role')) or d.get('role') in roles): - sidebar_items.append(d.as_dict() if isinstance(d, Document) else d) - - if not portal_settings.hide_standard_menu: - add_items(sidebar_items, portal_settings.get('menu')) - - if portal_settings.custom_menu: - add_items(sidebar_items, portal_settings.get('custom_menu')) - - items_via_hooks = frappe.get_hooks('portal_menu_items') - if items_via_hooks: - for i in items_via_hooks: i['enabled'] = 1 - add_items(sidebar_items, items_via_hooks) - - frappe.cache().hset('portal_menu_items', frappe.session.user, sidebar_items) - sidebar_data.sidebar_items = sidebar_items - - return sidebar_data - -def get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json): - sidebar_items = frappe._dict() - sidebar_json_path = get_sidebar_json_path(basepath, look_for_sidebar_json) - if not sidebar_json_path: return sidebar_items - - with open(sidebar_json_path, 'r') as sidebarfile: - try: - sidebar_json = sidebarfile.read() - sidebar_items = json.loads(sidebar_json) - except json.decoder.JSONDecodeError: - frappe.throw('Invalid Sidebar JSON at ' + sidebar_json_path) - - return sidebar_items - -def get_sidebar_json_path(path, look_for=False): - ''' - Get _sidebar.json path from directory path - - :param path: path of the current diretory - :param look_for: if True, look for _sidebar.json going upwards from given path - - :return: _sidebar.json path - ''' - if os.path.split(path)[1] == 'www' or path == '/' or not path: - return '' - - sidebar_json_path = os.path.join(path, '_sidebar.json') - if os.path.exists(sidebar_json_path): - return sidebar_json_path - else: - if look_for: - return get_sidebar_json_path(os.path.split(path)[0], look_for) - else: - return '' diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 5b001a55e7..12f459afd7 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -3,7 +3,7 @@ import os import frappe from frappe.website.page_controllers.base_template_page import BaseTemplatePage -from frappe.website.context import get_sidebar_data +from frappe.website.utils import get_sidebar_items from frappe.website.render import build_response from frappe.website.router import get_base_template from frappe.website.utils import (extract_comment_tag, @@ -69,8 +69,7 @@ class TemplatePage(BaseTemplatePage): def add_sidebar_and_breadcrumbs(self): if self.basepath: - sidebar_data = get_sidebar_data(self.context.website_sidebar, self.basepath) or None - self.context.sidebar_items = sidebar_data.sidebar_items + self.context.sidebar_items = get_sidebar_items(self.context.website_sidebar, self.basepath) if self.context.add_breadcrumbs and not self.context.parents: # TODO: set correct title and route for breadcrumbs diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index d6e43f4f1f..b9f8972380 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -1,20 +1,19 @@ -from frappe.website.redirect import resolve_redirect -from frappe.website.render import resolve_path import frappe - from frappe.website.page_controllers.document_page import DocumentPage from frappe.website.page_controllers.list_page import ListPage from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.print_page import PrintPage -from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.static_page import StaticPage +from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.web_form import WebFormPage +from frappe.website.redirect import resolve_redirect +from frappe.website.render import resolve_path + class PathResolver(): def __init__(self, path, http_status_code=None): self._path = path self.http_status_code = http_status_code - # self.url_map = get_url_map() @property def path(self): @@ -25,7 +24,6 @@ class PathResolver(): query_string = frappe.local.request.query_string resolve_redirect(self.path, query_string) endpoint = resolve_path(self.path) - # urls = self.url_map.bind_to_environ(frappe.local.request.environ) renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) @@ -36,32 +34,3 @@ class PathResolver(): return endpoint, renderer_instance return endpoint, None - -# #> Path > Path > resolve using url_map > path.endpoint -# # -# # -# # -# # pathclass url_map - -# def get_url_map(): -# Map([Rule('/', endpoint=get_home_page, defaults={'renderer': TemplatePage})]) - - -# query_string = None -# response = None - -# if not path: -# path = frappe.local.request.path -# query_string = frappe.local.request.query_string - -# try: -# path = path.strip('/ ') -# resolve_redirect(path, query_string) -# path = resolve_path(path) -# # there is no way to determine the type of the page based on the route -# # so evaluate each type of page sequentially -# renderers = [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] -# for renderer in renderers: -# response = renderer(path, http_status_code).get() -# if response: -# break diff --git a/frappe/website/serve.py b/frappe/website/serve.py index bdec8a16ba..9b28fd2e3b 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,10 +1,10 @@ import frappe - from frappe.website.page_controllers.error_page import ErrorPage from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.path_resolver import PathResolver -from frappe.website.utils import can_cache + +#from frappe.website.utils import can_cache def get_response(path=None, http_status_code=200): """Resolves path and renders page""" diff --git a/frappe/website/utils.py b/frappe/website/utils.py index a5fe9c3986..723d878fac 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -2,16 +2,21 @@ # MIT License. See license.txt from __future__ import unicode_literals -import functools -import re -import os -import frappe -import yaml -from six import iteritems +import functools +import json +import os +import re + +import yaml from past.builtins import cmp +from six import iteritems + +import frappe +from frappe.model.document import Document from frappe.utils import md_to_html + def delete_page_cache(path): cache = frappe.cache() cache.delete_value('full_index') @@ -439,3 +444,83 @@ def get_frontmatter(string): "attributes": yaml.safe_load(frontmatter), "body": body, } + +def get_sidebar_items(parent_sidebar, basepath): + import frappe.www.list + sidebar_items = [] + + hooks = frappe.get_hooks('look_for_sidebar_json') + look_for_sidebar_json = hooks[0] if hooks else 0 + + if basepath and look_for_sidebar_json: + sidebar_items = get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json) + + if not sidebar_items and parent_sidebar: + sidebar_items = frappe.get_all('Website Sidebar Item', + filters=dict(parent=parent_sidebar), fields=['title', 'route', '`group`'], + order_by='idx asc') + + if not sidebar_items: + sidebar_items = get_portal_sidebar_items() + + return sidebar_items + + +def get_portal_sidebar_items(): + sidebar_items = frappe.cache().hget('portal_menu_items', frappe.session.user) + if sidebar_items == None: + sidebar_items = [] + roles = frappe.get_roles() + portal_settings = frappe.get_doc('Portal Settings', 'Portal Settings') + + def add_items(sidebar_items, items): + for d in items: + if d.get('enabled') and ((not d.get('role')) or d.get('role') in roles): + sidebar_items.append(d.as_dict() if isinstance(d, Document) else d) + + if not portal_settings.hide_standard_menu: + add_items(sidebar_items, portal_settings.get('menu')) + + if portal_settings.custom_menu: + add_items(sidebar_items, portal_settings.get('custom_menu')) + + items_via_hooks = frappe.get_hooks('portal_menu_items') + if items_via_hooks: + for i in items_via_hooks: i['enabled'] = 1 + add_items(sidebar_items, items_via_hooks) + + frappe.cache().hset('portal_menu_items', frappe.session.user, sidebar_items) + + return sidebar_items + +def get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json): + sidebar_items = frappe._dict() + sidebar_json_path = get_sidebar_json_path(basepath, look_for_sidebar_json) + if not sidebar_json_path: return sidebar_items + + with open(sidebar_json_path, 'r') as sidebarfile: + try: + sidebar_json = sidebarfile.read() + sidebar_items = json.loads(sidebar_json) + except json.decoder.JSONDecodeError: + frappe.throw('Invalid Sidebar JSON at ' + sidebar_json_path) + + return sidebar_items + +def get_sidebar_json_path(path, look_for=False): + '''Get _sidebar.json path from directory path + :param path: path of the current diretory + :param look_for: if True, look for _sidebar.json going upwards from given path + :return: _sidebar.json path + ''' + if os.path.split(path)[1] == 'www' or path == '/' or not path: + return '' + + sidebar_json_path = os.path.join(path, '_sidebar.json') + if os.path.exists(sidebar_json_path): + return sidebar_json_path + else: + if look_for: + return get_sidebar_json_path(os.path.split(path)[0], look_for) + else: + return '' From d6a539362d1a3401f549f6788450116004d6b986 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 09:13:13 +0530 Subject: [PATCH 0085/1519] style: Fix formatting issue --- frappe/website/page_controllers/static_page.py | 3 ++- frappe/website/utils.py | 10 ++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_controllers/static_page.py index 8c07440ebb..767cc872d1 100644 --- a/frappe/website/page_controllers/static_page.py +++ b/frappe/website/page_controllers/static_page.py @@ -16,7 +16,8 @@ class StaticPage(WebPage): def set_file_path(self): self.file_path = '' - if not self.is_valid_file_path(): return + if not self.is_valid_file_path(): + return for app in frappe.get_installed_apps(): file_path = frappe.get_app_path(app, 'www') + '/' + self.path if os.path.exists(file_path): diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 723d878fac..2d16658efb 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -468,7 +468,7 @@ def get_sidebar_items(parent_sidebar, basepath): def get_portal_sidebar_items(): sidebar_items = frappe.cache().hget('portal_menu_items', frappe.session.user) - if sidebar_items == None: + if sidebar_items is None: sidebar_items = [] roles = frappe.get_roles() portal_settings = frappe.get_doc('Portal Settings', 'Portal Settings') @@ -486,7 +486,8 @@ def get_portal_sidebar_items(): items_via_hooks = frappe.get_hooks('portal_menu_items') if items_via_hooks: - for i in items_via_hooks: i['enabled'] = 1 + for i in items_via_hooks: + i['enabled'] = 1 add_items(sidebar_items, items_via_hooks) frappe.cache().hset('portal_menu_items', frappe.session.user, sidebar_items) @@ -494,9 +495,10 @@ def get_portal_sidebar_items(): return sidebar_items def get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json): - sidebar_items = frappe._dict() + sidebar_items = [] sidebar_json_path = get_sidebar_json_path(basepath, look_for_sidebar_json) - if not sidebar_json_path: return sidebar_items + if not sidebar_json_path: + return sidebar_items with open(sidebar_json_path, 'r') as sidebarfile: try: From 0c575f02eae7c66861a12b9c264d8ae05c11e760 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 11:43:42 +0530 Subject: [PATCH 0086/1519] fix: Handle encoding issue and some edge cases --- frappe/website/page_controllers/template_page.py | 2 +- frappe/website/path_resolver.py | 2 +- frappe/website/serve.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 12f459afd7..9f3bf66701 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -234,7 +234,7 @@ class TemplatePage(BaseTemplatePage): self.context.url_prefix += '/' self.context.path = self.path - self.context.pathname = frappe.local.path + self.context.pathname = frappe.local.path if hasattr(frappe, 'local') else self.path # for backward compatibility self.context.docs_base_url = '/docs' diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index b9f8972380..1368932792 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -21,7 +21,7 @@ class PathResolver(): def resolve(self): '''Returns endpoint and a renderer instance that can render the endpoint''' - query_string = frappe.local.request.query_string + query_string = frappe.local.request.query_string if hasattr(frappe.local, 'request') else None resolve_redirect(self.path, query_string) endpoint = resolve_path(self.path) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 9b28fd2e3b..7a93ada825 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -37,4 +37,4 @@ def get_response(path=None, http_status_code=200): def get_response_content(path=None, http_status_code=200): response = get_response(path, http_status_code) - return response.data + return str(response.data, 'utf-8') From ca89fa6a32a7bfb4488bb5af28f6af29aa0cf915 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 14:31:34 +0530 Subject: [PATCH 0087/1519] fix: Edit & Delete Card --- frappe/desk/desktop.py | 19 +++++++-- frappe/desk/doctype/workspace/workspace.py | 13 ++++-- .../public/js/frappe/widgets/links_widget.js | 12 ++++-- .../public/js/frappe/widgets/widget_dialog.js | 6 +-- .../public/js/frappe/widgets/widget_group.js | 10 ++--- frappe/public/js/frappe/wiki_blocks/card.js | 40 ++++++++++++------- .../public/js/frappe/wiki_blocks/shortcut.js | 12 +++--- 7 files changed, 74 insertions(+), 38 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 2a09978744..3713a489e3 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -550,10 +550,23 @@ def save_new_widget(page, new_widgets): if widgets.card: original_page.build_links_table_from_card(widgets.card) + # remove duplicate and unwanted widgets content = frappe.db.get_value("Internal Wiki Page", page, "content") - for wid in ['shortcut']: - widd = [x['data'][ wid + '_name'] for x in json.loads(content) if x['type'] == wid] - original_page.set(wid+'s', [ele for ele in original_page.get(wid+'s') if ele.label in widd]) + page_widgets = {} + for wid in ['shortcut', 'card', 'chart']: + # get list of widget's name from internal wiki page + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + + updated_widgets = [] + original_page.get('shortcuts').reverse() + for w in original_page.get('shortcuts'): + if w.label in page_widgets['shortcut'] and w.label not in [x.label for x in updated_widgets]: + updated_widgets.append(w) + original_page.set('shortcuts', updated_widgets) + + for i, v in enumerate(original_page.links): + if v.type == 'Card Break' and v.label not in page_widgets['card']: + del original_page.links[ i : i+v.link_count+1] try: original_page.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 18aa383455..7e50b8db70 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -105,11 +105,18 @@ class Workspace(Document): for idx, card in enumerate(config): links = loads(card.get('links')) + # remove duplicate before adding + duplicate_links = [x for x in self.links if(x.label == card.get('label') and x.type == 'Card Break')] + for v in duplicate_links: + del self.links[ v.idx-1 : v.idx+v.link_count] + self.append('links', { "label": card.get('label'), "type": "Card Break", "icon": card.get('icon'), - "hidden": card.get('hidden') or False + "hidden": card.get('hidden') or False, + "link_count": card.get('link_count'), + "idx": self.links[-1].idx + 1 }) for link in links: @@ -121,10 +128,10 @@ class Workspace(Document): "onboard": link.get('onboard'), "only_for": link.get('only_for'), "dependencies": link.get('dependencies'), - "is_query_report": link.get('is_query_report') + "is_query_report": link.get('is_query_report'), + "idx": self.links[-1].idx + 1 }) - def disable_saving_as_standard(): return frappe.flags.in_install or \ frappe.flags.in_patch or \ diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index 05280a22c8..26d52c1fcc 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -12,14 +12,18 @@ export default class LinksWidget extends Widget { return { name: this.name, links: JSON.stringify(this.links), + link_count: this.links.length, label: this.label, hidden: this.hidden, }; } set_body() { - this.options = {}; - this.options.links = this.links; + + if (!this.options) { + this.options = {}; + this.options.links = this.links; + } this.widget.addClass("links-widget-box"); const is_link_disabled = item => { return item.dependencies && item.incomplete_dependencies; @@ -74,7 +78,9 @@ export default class LinksWidget extends Widget { ${get_link_for_item(item)} `); }); - + if (this.in_customize_mode) { + this.body.empty(); + } this.link_list.forEach(link => link.appendTo(this.body)); } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index 5bcaaf9e3e..02be3bd15a 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -142,9 +142,9 @@ class CardDialog extends WidgetDialog { fieldtype: 'Table', label: __('Card Links'), editable_grid: 1, - data: this.data || [], + data: me.values ? JSON.parse(me.values.links) : [], get_data: () => { - return this.data || []; + return me.values ? JSON.parse(me.values.links) : []; }, fields: [ { @@ -529,7 +529,7 @@ export default function get_dialog_constructor(type) { chart: ChartDialog, shortcut: ShortcutDialog, number_card: NumberCardDialog, - card: CardDialog, + links: CardDialog, }; return widget_map[type] || WidgetDialog; diff --git a/frappe/public/js/frappe/widgets/widget_group.js b/frappe/public/js/frappe/widgets/widget_group.js index 913a362932..d8f92edc5d 100644 --- a/frappe/public/js/frappe/widgets/widget_group.js +++ b/frappe/public/js/frappe/widgets/widget_group.js @@ -205,12 +205,12 @@ export class SingleWidgetGroup { widget_type: this.type, container: this.container, height: this.height || null, + options: { + ...this.options, + on_delete: () => this.on_delete(), + on_edit: () => this.on_edit(widget_object) + } }); - widget_object.options = { - ...this.options, - on_delete: () => this.on_delete(), - on_edit: () => this.on_edit(widget_object) - }; this.widgets_list.push(widget_object); this.widgets_dict[widget.name] = widget_object; diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 89821129e0..5426fd24ce 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,9 +11,10 @@ export default class Card { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; this.sections = {}; @@ -28,7 +29,7 @@ export default class Card { allow_create: this.allow_customization, allow_delete: this.allow_customization, allow_hiding: false, - allow_edit: false, + allow_edit: true, }; } @@ -64,24 +65,25 @@ export default class Card { } _new_card() { - const dialog_class = get_dialog_constructor('card'); + const dialog_class = get_dialog_constructor('links'); this.dialog = new dialog_class({ label: this.label, type: 'card', primary_action: (widget) => { widget.in_customize_mode = 1; - let wid = frappe.widget.make_widget({ + this.card_widget = frappe.widget.make_widget({ ...widget, widget_type: 'links', - container: this.wrapper + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.card_widget) + } }); - wid.options = { - ...this.options, - on_delete: () => this.api.blocks.delete() - }; - wid.customize(this.options); - this.wrapper.setAttribute("card_name", wid.label); - this.new_card_widget = wid.get_config(); + this.card_widget.customize(this.options); + this.wrapper.setAttribute("card_name", this.card_widget.label); + this.new_card_widget = this.card_widget.get_config(); }, }); @@ -156,22 +158,30 @@ export default class Card { this.card_field.make(); } + on_edit(card_obj) { + let card = card_obj.get_config(); + this.card_widget.widgets = card; + this.wrapper.setAttribute("card_name", card.label); + this.new_card_widget = card_obj.get_config(); + } + _make_cards(card_name) { let card = this.config.page_data.cards.items.find(obj => { return obj.label == card_name; }); this.wrapper.innerHTML = ''; card.in_customize_mode = !this.readOnly; - let card_widget = new frappe.widget.SingleWidgetGroup({ + this.card_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "links", options: this.options, widgets: card, - api: this.api + api: this.api, + block: this.block }); this.wrapper.setAttribute("card_name", card_name); if (!this.readOnly) { - card_widget.customize(); + this.card_widget.customize(); } } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index f57c9ef7f1..ba98cbc382 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -73,13 +73,13 @@ export default class Shortcut { this.shortcut_widget = frappe.widget.make_widget({ ...widget, widget_type: 'shortcut', - container: this.wrapper + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.shortcut_widget) + } }); - this.shortcut_widget.options = { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.shortcut_widget) - }; this.shortcut_widget.customize(this.options); this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); this.new_shortcut_widget = this.shortcut_widget.get_config(); From c217b32fa91c1a8e252a343bcb21f9c7283ca2e5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 15:41:23 +0530 Subject: [PATCH 0088/1519] fix: Add cache_html decorator to cache HTML --- .../website/page_controllers/template_page.py | 5 +++-- frappe/website/serve.py | 10 --------- frappe/website/utils.py | 22 +++++++++++++++++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 9f3bf66701..635b8a56fe 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -6,8 +6,8 @@ from frappe.website.page_controllers.base_template_page import BaseTemplatePage from frappe.website.utils import get_sidebar_items from frappe.website.render import build_response from frappe.website.router import get_base_template -from frappe.website.utils import (extract_comment_tag, - extract_title, get_next_link, get_toc, get_frontmatter) +from frappe.website.utils import (extract_comment_tag, extract_title, + get_next_link, get_toc, get_frontmatter, cache_html) WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") @@ -45,6 +45,7 @@ class TemplatePage(BaseTemplatePage): def render(self): return build_response(self.path, self.get_html(), self.http_status_code, self.headers) + @cache_html def get_html(self): # context object should be separate from self for security # because it will be accessed via the user defined template diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 7a93ada825..7010b768d8 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -4,22 +4,12 @@ from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.path_resolver import PathResolver -#from frappe.website.utils import can_cache def get_response(path=None, http_status_code=200): """Resolves path and renders page""" response = None path = path or frappe.local.request.path endpoint = path - # if can_cache(): - # # return rendered page - # page_cache = frappe.cache().hget("website_page", path) - # if page_cache and frappe.local.lang in page_cache: - # out = page_cache[frappe.local.lang] - - # if out: - # frappe.local.response.from_cache = True - # return out try: path_resolver = PathResolver(path, http_status_code) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 2d16658efb..576d1d911c 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -7,6 +7,7 @@ import functools import json import os import re +from functools import wraps import yaml from past.builtins import cmp @@ -526,3 +527,24 @@ def get_sidebar_json_path(path, look_for=False): return get_sidebar_json_path(os.path.split(path)[0], look_for) else: return '' + +def cache_html(func): + @wraps(func) + def cache_html_decorator(*args, **kwargs): + if can_cache(): + html = None + page_cache = frappe.cache().hget("website_page", args[0].path) + if page_cache and frappe.local.lang in page_cache: + html = page_cache[frappe.local.lang] + if html: + frappe.local.response.from_cache = True + return html + html = func(*args, **kwargs) + if can_cache(): + page_cache = frappe.cache().hget("website_page", args[0].path) or {} + page_cache[frappe.local.lang] = html + frappe.cache().hset("website_page", args[0].path, page_cache) + + return html + + return cache_html_decorator From 7ce6a776d04bfa0b52c562275f6c8198bfebce07 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 16:44:14 +0530 Subject: [PATCH 0089/1519] fix: Remove duplicate card fix --- frappe/desk/doctype/workspace/workspace.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 7e50b8db70..d9bf5fa618 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -106,9 +106,9 @@ class Workspace(Document): links = loads(card.get('links')) # remove duplicate before adding - duplicate_links = [x for x in self.links if(x.label == card.get('label') and x.type == 'Card Break')] - for v in duplicate_links: - del self.links[ v.idx-1 : v.idx+v.link_count] + for idx, link in enumerate(self.links): + if link.label == card.get('label') and link.type == 'Card Break': + del self.links[idx : idx + link.link_count + 1] self.append('links', { "label": card.get('label'), From 60454fafc84ef126f972cff41960f9a592bc8a1e Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 29 Apr 2021 14:57:02 +0530 Subject: [PATCH 0090/1519] feat: Tab Break fieldtype --- frappe/core/doctype/docfield/docfield.json | 4 +- frappe/public/build.json | 3 + frappe/public/js/frappe/form/column.js | 41 +++ frappe/public/js/frappe/form/dashboard.js | 233 +++++-------- frappe/public/js/frappe/form/form.js | 21 +- frappe/public/js/frappe/form/layout.js | 363 ++++++++------------- frappe/public/js/frappe/form/section.js | 158 +++++++++ frappe/public/js/frappe/form/tab.js | 76 +++++ frappe/public/js/frappe/ui/field_group.js | 16 +- frappe/public/scss/desk/form.scss | 22 +- 10 files changed, 542 insertions(+), 395 deletions(-) create mode 100644 frappe/public/js/frappe/form/column.js create mode 100644 frappe/public/js/frappe/form/section.js create mode 100644 frappe/public/js/frappe/form/tab.js diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index ca134665b8..4ce553b44a 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -90,7 +90,7 @@ "label": "Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature\nTab Break", "reqd": 1, "search_index": 1 }, @@ -487,7 +487,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-10-29 06:09:26.454990", + "modified": "2021-04-15 12:59:35.484572", "modified_by": "Administrator", "module": "Core", "name": "DocField", diff --git a/frappe/public/build.json b/frappe/public/build.json index 942871ee9b..192deab9b1 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -140,6 +140,9 @@ "public/js/frappe/ui/find.js", "public/js/frappe/ui/iconbar.js", "public/js/frappe/form/layout.js", + "public/js/frappe/form/section.js", + "public/js/frappe/form/tab.js", + "public/js/frappe/form/column.js", "public/js/frappe/ui/field_group.js", "public/js/frappe/form/link_selector.js", "public/js/frappe/form/multi_select_dialog.js", diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js new file mode 100644 index 0000000000..8ceb2d029e --- /dev/null +++ b/frappe/public/js/frappe/form/column.js @@ -0,0 +1,41 @@ +frappe.ui.form.Column = class Column { + constructor(section, df) { + if (!df) df = {}; + + this.df = df; + this.section = section; + this.make(); + this.resize_all_columns(); + } + + make() { + this.wrapper = $(`
+
+
+
`).appendTo(this.section.body) + .find("form") + .on("submit", function () { + return false; + }); + + if (this.df.label) { + $(``).appendTo(this.wrapper); + } + } + + resize_all_columns() { + // distribute all columns equally + let colspan = cint(12 / this.section.wrapper.find(".form-column").length); + + this.section.wrapper.find(".form-column").removeClass() + .addClass("form-column") + .addClass("col-sm-" + colspan); + + } + + refresh() { + this.section.refresh(); + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index c1c95d94cf..c983f612e0 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -4,57 +4,79 @@ frappe.ui.form.Dashboard = class FormDashboard { constructor(opts) { $.extend(this, opts); + this.setup_dashboard_tabs(); this.setup_dashboard_sections(); } - setup_dashboard_sections() { - this.progress_area = new Section(this.parent, { - css_class: 'progress-area', + setup_dashboard_tabs() { + this.overview_tab = new frappe.ui.form.Tab(this.frm.layout, { + label: __("Overview"), hidden: 1, - collapsible: 1 + fieldname: 'dashboard-overview' }); - this.heatmap_area = new Section(this.parent, { - title: __("Overview"), + this.connections_tab = new frappe.ui.form.Tab(this.frm.layout, { + label: __("Connections"), + hidden: 1, + fieldname: 'dashboard-connection' + }); + } + + setup_dashboard_sections() { + this.progress_area = this.make_section({ + css_class: 'progress-area', + hidden: 1, + is_dashboard_section: 1, + }, this.overview_tab); + + this.heatmap_area = this.make_section({ + label: __("Overview"), css_class: 'form-heatmap', hidden: 1, - collapsible: 1, + is_dashboard_section: 1, body_html: `
` - }); + }, this.overview_tab); - this.chart_area = new Section(this.parent, { - title: __("Graph"), + this.chart_area = this.make_section({ + label: __("Graph"), css_class: 'form-graph', hidden: 1, - collapsible: 1 - }); + is_dashboard_section: 1 + }, this.overview_tab); this.stats_area_row = $(`
`); - this.stats_area = new Section(this.parent, { - title: __("Stats"), + this.stats_area = this.make_section({ + label: __("Stats"), css_class: 'form-stats', hidden: 1, - collapsible: 1, + is_dashboard_section: 1, body_html: this.stats_area_row - }); + }, this.overview_tab); this.transactions_area = $(`
') + let progress_chart = $('
') .appendTo(this.progress_area.body); return progress_chart; } @@ -169,7 +196,7 @@ frappe.ui.form.Dashboard = class FormDashboard { this.init_data(); } - var show = false; + let show = false; if (this.data && ((this.data.transactions || []).length || (this.data.reports || []).length)) { @@ -198,11 +225,10 @@ frappe.ui.form.Dashboard = class FormDashboard { } after_refresh() { - var me = this; // show / hide new buttons (if allowed) - this.links_area.body.find('.btn-new').each(function() { - if (me.frm.can_create($(this).attr('data-doctype'))) { - $(this).removeClass('hidden'); + this.links_area.body.find('.btn-new').each((i, el) => { + if (this.frm.can_create($(this).attr('data-doctype'))) { + $(el).removeClass('hidden'); } }); } @@ -269,7 +295,7 @@ frappe.ui.form.Dashboard = class FormDashboard { } render_links() { - var me = this; + let me = this; this.links_area.show(); this.links_area.body.find('.btn-new').addClass('hidden'); if (this.data_rendered) { @@ -324,7 +350,7 @@ frappe.ui.form.Dashboard = class FormDashboard { open_document_list($link, show_open) { // show document list with filters - var doctype = $link.attr('data-doctype'), + let doctype = $link.attr('data-doctype'), names = $link.attr('data-names') || []; if (this.data.internal_links[doctype]) { @@ -346,8 +372,8 @@ frappe.ui.form.Dashboard = class FormDashboard { get_document_filter(doctype) { // return the default filter for the given document // like {"customer": frm.doc.name} - var filter = {}; - var fieldname = this.data.non_standard_fieldnames + let filter = {}; + let fieldname = this.data.non_standard_fieldnames ? (this.data.non_standard_fieldnames[doctype] || this.data.fieldname) : this.data.fieldname; @@ -366,7 +392,7 @@ frappe.ui.form.Dashboard = class FormDashboard { } // list all items from the transaction list - var items = [], + let items = [], me = this; this.data.transactions.forEach(function(group) { @@ -375,7 +401,7 @@ frappe.ui.form.Dashboard = class FormDashboard { }); }); - var method = this.data.method || 'frappe.desk.notifications.get_open_count'; + let method = this.data.method || 'frappe.desk.notifications.get_open_count'; frappe.call({ type: "GET", method: method, @@ -424,7 +450,7 @@ frappe.ui.form.Dashboard = class FormDashboard { } set_badge_count(doctype, open_count, count, names) { - var $link = $(this.transactions_area) + let $link = $(this.transactions_area) .find('.document-link[data-doctype="'+doctype+'"]'); if (open_count) { @@ -471,7 +497,7 @@ frappe.ui.form.Dashboard = class FormDashboard { this.heatmap_area.body.find('svg').css({'margin': 'auto'}); // message - var heatmap_message = this.heatmap_area.body.find('.heatmap-message'); + let heatmap_message = this.heatmap_area.body.find('.heatmap-message'); if (this.data.heatmap_message) { heatmap_message.removeClass('hidden').html(this.data.heatmap_message); } else { @@ -486,9 +512,9 @@ frappe.ui.form.Dashboard = class FormDashboard { // set colspan - var indicators = this.stats_area_row.find('.indicator-column'); - var n_indicators = indicators.length + 1; - var colspan; + let indicators = this.stats_area_row.find('.indicator-column'); + let n_indicators = indicators.length + 1; + let colspan; if (n_indicators > 4) { colspan = 3; } else { @@ -500,7 +526,7 @@ frappe.ui.form.Dashboard = class FormDashboard { indicators.removeClass().addClass('col-sm-'+colspan).addClass('indicator-column'); } - var indicator = $('
' + let indicator = $('
' +label+'
').appendTo(this.stats_area_row); return indicator; @@ -508,9 +534,9 @@ frappe.ui.form.Dashboard = class FormDashboard { // graphs setup_graph() { - var me = this; - var method = this.data.graph_method; - var args = { + let me = this; + let method = this.data.graph_method; + let args = { doctype: this.frm.doctype, docname: this.frm.doc.name, }; @@ -574,11 +600,10 @@ frappe.ui.form.Dashboard = class FormDashboard { } add_comment(text, alert_class, permanent) { - var me = this; this.set_headline_alert(text, alert_class); if (!permanent) { - setTimeout(function() { - me.clear_headline(); + setTimeout(() => { + this.clear_headline(); }, 10000); } } @@ -595,109 +620,3 @@ frappe.ui.form.Dashboard = class FormDashboard { } } }; - -class Section { - constructor(parent, options) { - this.parent = parent; - this.df = options || {}; - this.make(); - - if (this.df.title && this.df.collapsible && localStorage.getItem(options.css_class + '-closed')) { - this.collapse(); - } - this.refresh(); - } - - make() { - this.wrapper = $(`
`) - .appendTo(this.parent); - - if (this.df) { - if (this.df.title) { - this.make_head(); - } - if (this.df.description) { - this.description_wrapper = $( - `
- ${__(this.df.description)} -
` - ); - - this.wrapper.append(this.description_wrapper); - } - if (this.df.css_class) { - this.wrapper.addClass(this.df.css_class); - } - if (this.df.hide_border) { - this.wrapper.toggleClass("hide-border", true); - } - } - - this.body = $('
').appendTo(this.wrapper); - - if (this.df.body_html) { - this.body.append(this.df.body_html); - } - } - - make_head() { - this.head = $(` -
- ${__(this.df.title)} - -
- `); - - this.head.appendTo(this.wrapper); - this.indicator = this.head.find('.collapse-indicator'); - this.indicator.hide(); - - if (this.df.collapsible) { - // show / hide based on status - this.collapse_link = this.head.on("click", () => { - this.collapse(); - }); - this.set_icon(); - this.indicator.show(); - } - } - - refresh() { - if (!this.df) return; - - // hide if explicitly hidden - let hide = this.df.hidden; - this.wrapper.toggle(!hide); - } - - collapse(hide) { - if (hide === undefined) { - hide = !this.body.hasClass("hide"); - } - - this.body.toggleClass("hide", hide); - this.head && this.head.toggleClass("collapsed", hide); - - this.set_icon(hide); - - // save state for next reload ('' is falsy) - localStorage.setItem(this.df.css_class + '-closed', hide ? '1' : ''); - } - - set_icon(hide) { - let indicator_icon = hide ? 'down' : 'up-line'; - this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1')); - } - - is_collapsed() { - return this.body.hasClass('hide'); - } - - hide() { - this.wrapper.hide(); - } - - show() { - this.wrapper.show(); - } -} diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index a188c42950..83d38b323b 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -93,6 +93,11 @@ frappe.ui.form.Form = class FrappeForm { this.watch_model_updates(); if (!this.meta.hide_toolbar && frappe.boot.desk_settings.timeline) { + // this.footer_tab = new frappe.ui.form.Tab(this.layout, { + // label: __("Activity"), + // fieldname: 'timeline' + // }); + this.footer = new frappe.ui.form.Footer({ frm: this, parent: $('
').appendTo(this.page.main.parent()) @@ -141,6 +146,7 @@ frappe.ui.form.Form = class FrappeForm { frm: this, with_dashboard: true, card_layout: true, + tabbed_layout: true, }); this.layout.make(); @@ -149,7 +155,7 @@ frappe.ui.form.Form = class FrappeForm { this.dashboard = new frappe.ui.form.Dashboard({ frm: this, - parent: $('
').insertAfter(this.layout.wrapper.find('.form-message')) + parent: this.layout.wrapper, }); // workflow state @@ -453,7 +459,7 @@ frappe.ui.form.Form = class FrappeForm { }, () => this.cscript.is_onload && this.is_new() && this.focus_on_first_input(), () => this.run_after_load_hook(), - () => this.dashboard.after_refresh() + () => this.dashboard.after_refresh(), ]); } else { @@ -462,6 +468,7 @@ frappe.ui.form.Form = class FrappeForm { this.$wrapper.trigger('render_complete'); + this.cscript.is_onload && this.set_first_tab_as_active(); if(!this.hidden) { this.layout.show_empty_form_message(); } @@ -469,6 +476,11 @@ frappe.ui.form.Form = class FrappeForm { this.scroll_to_element(); } + set_first_tab_as_active() { + this.layout.tabs[0] + && this.layout.tabs[0].set_active(); + } + focus_on_first_input() { let first = this.form_wrapper.find('.form-layout :input:visible:first'); if (!in_list(["Date", "Datetime"], first.attr("data-fieldtype"))) { @@ -1580,6 +1592,11 @@ frappe.ui.form.Form = class FrappeForm { let $el = field.$wrapper; + // set tab as active + if (field.tab && !field.tab.is_active()) { + field.tab.set_active(); + } + // uncollapse section if (field.section.is_collapsed()) { field.section.collapse(false); diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 282655b589..2ffba7b15a 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -1,27 +1,38 @@ -import '../class'; - frappe.ui.form.Layout = class Layout { constructor (opts) { this.views = {}; this.pages = []; + this.tabs = []; this.sections = []; this.fields_list = []; this.fields_dict = {}; $.extend(this, opts); } + make() { if (!this.parent && this.body) { this.parent = this.body; } this.wrapper = $('
').appendTo(this.parent); this.message = $('').appendTo(this.wrapper); + + this.page = $('
').appendTo(this.wrapper); + $(`
+ +
`).appendTo(this.page); + this.tabs_list = this.page.find('.form-tabs'); + this.tabs_content = $(`
`).appendTo(this.page); + if (!this.fields) { this.fields = this.get_doctype_fields(); } + + this.setup_events(); this.setup_tabbing(); this.render(); } + show_empty_form_message() { if (!(this.wrapper.find(".frappe-control:visible").length || this.wrapper.find(".section-head.collapsed").length)) { this.show_message(__("This form does not have any input")); @@ -87,9 +98,9 @@ frappe.ui.form.Layout = class Layout { this.message.empty().addClass('hidden'); } } - render (new_fields) { - var me = this; - var fields = new_fields || this.fields; + + render(new_fields) { + let fields = new_fields || this.fields; this.section = null; this.column = null; @@ -98,38 +109,45 @@ frappe.ui.form.Layout = class Layout { this.setup_dashboard_section(); } + if (this.tabbed_layout) { + this.first_tab = this.make_tab({label: __('Details'), fieldname: 'details'}) + } + if (this.no_opening_section()) { this.make_section(); } - $.each(fields, function (i, df) { + + fields.forEach(df => { switch (df.fieldtype) { case "Fold": - me.make_page(df); + this.make_page(df); break; case "Section Break": - me.make_section(df); + this.make_section(df); break; case "Column Break": - me.make_column(df); + this.make_column(df); + break; + case "Tab Break": + this.make_tab(df); break; default: - me.make_field(df); + this.make_field(df); } }); - } - no_opening_section () { + no_opening_section() { return (this.fields[0] && this.fields[0].fieldtype != "Section Break") || !this.fields.length; } - setup_dashboard_section () { + setup_dashboard_section() { if (this.no_opening_section()) { this.fields.unshift({fieldtype: 'Section Break'}); } } - replace_field (fieldname, df, render) { + replace_field(fieldname, df, render) { df.fieldname = fieldname; // change of fieldname is avoided if (this.fields_dict[fieldname] && this.fields_dict[fieldname].df) { const fieldobj = this.init_field(df, render); @@ -145,7 +163,7 @@ frappe.ui.form.Layout = class Layout { } } - make_field (df, colspan, render) { + make_field(df, colspan, render) { !this.section && this.make_section(); !this.column && this.make_column(); @@ -159,9 +177,10 @@ frappe.ui.form.Layout = class Layout { this.section.fields_list.push(fieldobj); this.section.fields_dict[df.fieldname] = fieldobj; fieldobj.section = this.section; + fieldobj.tab = this.tab; } - init_field (df, render = false) { + init_field(df, render=false) { const fieldobj = frappe.ui.form.make_control({ df: df, doctype: this.doctype, @@ -176,8 +195,8 @@ frappe.ui.form.Layout = class Layout { return fieldobj; } - make_page (df) { // eslint-disable-line no-unused-vars - var me = this, + make_page(df) { // eslint-disable-line no-unused-vars + let me = this, head = $('
\ ' + __("Show more details") + '\
').appendTo(this.wrapper); @@ -185,7 +204,7 @@ frappe.ui.form.Layout = class Layout { this.page = $('
').appendTo(this.wrapper); this.fold_btn = head.find(".btn-fold").on("click", function () { - var page = $(this).parent().next(); + let page = $(this).parent().next(); if (page.hasClass("hide")) { $(this).removeClass("btn-fold").html(__("Hide details")); page.removeClass("hide"); @@ -202,12 +221,12 @@ frappe.ui.form.Layout = class Layout { this.folded = true; } - unfold () { + unfold() { this.fold_btn.trigger('click'); } - make_section (df) { - this.section = new frappe.ui.form.Section(this, df); + make_section(df) { + this.section = new frappe.ui.form.Section(this, df, this.tab || null); // append to layout fields if (df) { @@ -218,15 +237,25 @@ frappe.ui.form.Layout = class Layout { this.column = null; } - make_column (df) { + make_column(df) { this.column = new frappe.ui.form.Column(this.section, df); if (df && df.fieldname) { this.fields_list.push(this.column); } } - refresh (doc) { - var me = this; + make_tab(df) { + this.tab = new frappe.ui.form.Tab(this, df); + + if (df) { + this.fields_dict[df.fieldname] = this.tab; + this.fields_list.push(this.tab); + } + + return this.tab; + } + + refresh(doc) { if (doc) this.doc = doc; if (this.frm) { @@ -234,7 +263,7 @@ frappe.ui.form.Layout = class Layout { } // NOTE this might seem redundant at first, but it needs to be executed when frm.refresh_fields is called - me.attach_doc_and_docfields(true); + this.attach_doc_and_docfields(true); if (this.frm && this.frm.wrapper) { $(this.frm.wrapper).trigger("refresh-fields"); @@ -246,6 +275,9 @@ frappe.ui.form.Layout = class Layout { // refresh sections this.refresh_sections(); + // refresh tabs + this.refresh_tabs(); + if (this.frm) { // collapse sections this.refresh_section_collapse(); @@ -265,10 +297,26 @@ frappe.ui.form.Layout = class Layout { }); this.frm && this.frm.dashboard.refresh(); - } - refresh_fields (fields) { + refresh_tabs() { + this.tabs.forEach(tab => { + if (!tab.wrapper.hasClass('hide') && !tab.parent.hasClass('hide')) { + tab.parent.removeClass('show hide'); + tab.wrapper.removeClass('show hide'); + if (tab.wrapper.find( + ".form-section:not(.hide-control, .empty-section), .form-dashboard-section:not(.hide-control, .empty-section)" + ).length + ) { + tab.toggle(true) + } else { + tab.toggle(false) + } + } + }); + } + + refresh_fields(fields) { let fieldnames = fields.map((field) => { if (field.fieldname) return field.fieldname; }); @@ -283,7 +331,7 @@ frappe.ui.form.Layout = class Layout { }); } - add_fields (fields) { + add_fields(fields) { this.render(fields); this.refresh_fields(fields); } @@ -291,11 +339,11 @@ frappe.ui.form.Layout = class Layout { refresh_section_collapse () { if (!(this.sections && this.sections.length)) return; - for (var i = 0; i < this.sections.length; i++) { - var section = this.sections[i]; - var df = section.df; + for (let i = 0; i < this.sections.length; i++) { + let section = this.sections[i]; + let df = section.df; if (df && df.collapsible) { - var collapse = true; + let collapse = true; if (df.collapsible_depends_on) { collapse = !this.evaluate_depends_on_value(df.collapsible_depends_on); @@ -310,10 +358,10 @@ frappe.ui.form.Layout = class Layout { } } - attach_doc_and_docfields (refresh) { - var me = this; - for (var i = 0, l = this.fields_list.length; i < l; i++) { - var fieldobj = this.fields_list[i]; + attach_doc_and_docfields(refresh) { + let me = this; + for (let i = 0, l = this.fields_list.length; i < l; i++) { + let fieldobj = this.fields_list[i]; if (me.doc) { fieldobj.doc = me.doc; fieldobj.doctype = me.doc.doctype; @@ -330,41 +378,49 @@ frappe.ui.form.Layout = class Layout { } } - refresh_section_count () { + refresh_section_count() { this.wrapper.find(".section-count-label:visible").each(function (i) { $(this).html(i + 1); }); } - setup_tabbing () { - var me = this; - this.wrapper.on("keydown", function (ev) { + + setup_events() { + this.tabs_list.off('click').on('click', '.nav-link', (e) => { + e.preventDefault() + e.stopImmediatePropagation(); + $(e.currentTarget).tab('show'); + // this.$current_tab = $(e.currentTarget); + }); + } + + setup_tabbing() { + this.wrapper.on("keydown", (ev) => { if (ev.which == 9) { - var current = $(ev.target), + let current = $(ev.target), doctype = current.attr("data-doctype"), fieldname = current.attr("data-fieldname"); if (doctype) - return me.handle_tab(doctype, fieldname, ev.shiftKey); + return this.handle_tab(doctype, fieldname, ev.shiftKey); } }); } - handle_tab (doctype, fieldname, shift) { - var me = this, - grid_row = null, + + handle_tab(doctype, fieldname, shift) { + let grid_row = null, prev = null, - fields = me.fields_list, - in_grid = false, + fields = this.fields_list, focused = false; // in grid - if (doctype != me.doctype) { - grid_row = me.get_open_grid_row(); + if (doctype != this.doctype) { + grid_row = this.get_open_grid_row(); if (!grid_row || !grid_row.layout) { return; } fields = grid_row.layout.fields_list; } - for (var i = 0, len = fields.length; i < len; i++) { + for (let i = 0, len = fields.length; i < len; i++) { if (fields[i].df.fieldname == fieldname) { if (shift) { if (prev) { @@ -375,7 +431,7 @@ frappe.ui.form.Layout = class Layout { break; } if (i < len - 1) { - focused = me.focus_on_next_field(i, fields); + focused = this.focus_on_next_field(i, fields); } if (focused) { @@ -406,10 +462,11 @@ frappe.ui.form.Layout = class Layout { return false; } - focus_on_next_field (start_idx, fields) { + + focus_on_next_field(start_idx, fields) { // loop to find next eligible fields - for (var i = start_idx + 1, len = fields.length; i < len; i++) { - var field = fields[i]; + for (let i = start_idx + 1, len = fields.length; i < len; i++) { + let field = fields[i]; if (this.is_visible(field)) { if (field.df.fieldtype === "Table") { // open table grid @@ -428,10 +485,12 @@ frappe.ui.form.Layout = class Layout { } } } - is_visible (field) { + + is_visible(field) { return field.disp_status === "Write" && (field.$wrapper && field.$wrapper.is(":visible")); } - set_focus (field) { + + set_focus(field) { // next is table, show the table if (field.df.fieldtype=="Table") { if (!field.grid.grid_rows.length) { @@ -445,18 +504,19 @@ frappe.ui.form.Layout = class Layout { field.$input.focus(); } } - get_open_grid_row () { + + get_open_grid_row() { return $(".grid-row-open").data("grid_row"); } - refresh_dependency () { + + refresh_dependency() { // Resolve "depends_on" and show / hide accordingly - var me = this; // build dependants' dictionary - var has_dep = false; + let has_dep = false; - for (var fkey in this.fields_list) { - var f = this.fields_list[fkey]; + for (let fkey in this.fields_list) { + let f = this.fields_list[fkey]; f.dependencies_clear = true; if (f.df.depends_on || f.df.mandatory_depends_on || f.df.read_only_depends_on) { has_dep = true; @@ -466,8 +526,8 @@ frappe.ui.form.Layout = class Layout { if (!has_dep) return; // show / hide based on values - for (var i = me.fields_list.length - 1; i >= 0; i--) { - var f = me.fields_list[i]; + for (let i = this.fields_list.length - 1; i >= 0; i--) { + let f = this.fields_list[i]; f.guardian_has_value = true; if (f.df.depends_on) { // evaluate guardian @@ -499,7 +559,8 @@ frappe.ui.form.Layout = class Layout { this.refresh_section_count(); } - set_dependant_property (condition, fieldname, property) { + + set_dependant_property(condition, fieldname, property) { let set_property = this.evaluate_depends_on_value(condition); let value = set_property ? 1 : 0; let form_obj; @@ -521,19 +582,20 @@ frappe.ui.form.Layout = class Layout { } } } - evaluate_depends_on_value (expression) { - var out = null; - var doc = this.doc; + + evaluate_depends_on_value(expression) { + let out = null; + let doc = this.doc; if (!doc && this.get_values) { - var doc = this.get_values(true); + let doc = this.get_values(true); } if (!doc) { return; } - var parent = this.frm ? this.frm.doc : this.doc || null; + let parent = this.frm ? this.frm.doc : this.doc || null; if (typeof (expression) === 'boolean') { out = expression; @@ -564,161 +626,4 @@ frappe.ui.form.Layout = class Layout { return out; } -}; - -frappe.ui.form.Section = class FormSection { - constructor(layout, df) { - this.layout = layout; - this.df = df || {}; - this.fields_list = []; - this.fields_dict = {}; - - this.make(); - // if (this.frm) - // this.section.body.css({"padding":"0px 3%"}) - this.row = { - wrapper: this.wrapper - }; - - this.refresh(); - } - make() { - if (!this.layout.page) { - this.layout.page = $('
').appendTo(this.layout.wrapper); - } - let make_card = this.layout.card_layout; - this.wrapper = $(`
`) - .appendTo(this.layout.page); - this.layout.sections.push(this); - - if (this.df) { - if (this.df.label) { - this.make_head(); - } - if (this.df.description) { - $('
' + __(this.df.description) + '
') - .appendTo(this.wrapper); - } - if (this.df.cssClass) { - this.wrapper.addClass(this.df.cssClass); - } - if (this.df.hide_border) { - this.wrapper.toggleClass("hide-border", true); - } - } - - // for bc - this.body = $('
').appendTo(this.wrapper); - } - - make_head () { - this.head = $(`
- ${__(this.df.label)} - - -
`); - this.head.appendTo(this.wrapper); - this.indicator = this.head.find('.collapse-indicator'); - this.indicator.hide(); - if (this.df.collapsible) { - // show / hide based on status - this.collapse_link = this.head.on("click", () => { - this.collapse(); - }); - - this.indicator.show(); - } - } - refresh() { - if (!this.df) - return; - - // hide if explictly hidden - var hide = this.df.hidden || this.df.hidden_due_to_dependency; - - // hide if no perm - if (!hide && this.layout && this.layout.frm && !this.layout.frm.get_perm(this.df.permlevel || 0, "read")) { - hide = true; - } - - this.wrapper.toggleClass("hide-control", !!hide); - } - collapse (hide) { - // unknown edge case - if (!(this.head && this.body)) { - return; - } - - if (hide===undefined) { - hide = !this.body.hasClass("hide"); - } - - this.body.toggleClass("hide", hide); - this.head.toggleClass("collapsed", hide); - - let indicator_icon = hide ? 'down' : 'up-line'; - - this.indicator & this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1')); - - // refresh signature fields - this.fields_list.forEach((f) => { - if (f.df.fieldtype == 'Signature') { - f.refresh(); - } - }); - } - - is_collapsed() { - return this.body.hasClass('hide'); - } - - has_missing_mandatory () { - var missing_mandatory = false; - for (var j = 0, l = this.fields_list.length; j < l; j++) { - var section_df = this.fields_list[j].df; - if (section_df.reqd && this.layout.doc[section_df.fieldname] == null) { - missing_mandatory = true; - break; - } - } - return missing_mandatory; - } -}; - -frappe.ui.form.Column = class FormColumn { - constructor(section, df) { - if (!df) df = {}; - - this.df = df; - this.section = section; - this.make(); - this.resize_all_columns(); - } - make () { - this.wrapper = $('
\ -
\ -
\ -
').appendTo(this.section.body) - .find("form") - .on("submit", function () { - return false; - }); - - if (this.df.label) { - $('').appendTo(this.wrapper); - } - } - resize_all_columns () { - // distribute all columns equally - var colspan = cint(12 / this.section.wrapper.find(".form-column").length); - - this.section.wrapper.find(".form-column").removeClass() - .addClass("form-column") - .addClass("col-sm-" + colspan); - - } - refresh () { - this.section.refresh(); - } -}; +} diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js new file mode 100644 index 0000000000..f84dd6a58b --- /dev/null +++ b/frappe/public/js/frappe/form/section.js @@ -0,0 +1,158 @@ +// import '../class'; + +frappe.ui.form.Section = class Section { + constructor(layout, df, tab) { + this.layout = layout; + this.tab = tab; + this.parent = this.tab && this.tab.wrapper || null; + this.df = df || {}; + this.fields_list = []; + this.fields_dict = {}; + + this.make(); + + if (this.df.label && this.df.collapsible && localStorage.getItem(df.css_class + '-closed')) { + this.collapse(); + } + + this.row = { + wrapper: this.wrapper + }; + + this.refresh(); + } + + make() { + if (!this.layout.page) { + this.layout.page = $('
').appendTo(this.layout.wrapper); + } + + let make_card = this.layout.card_layout; + + this.wrapper = $(`
+ `).appendTo(this.parent || this.layout.page); + + this.layout.sections.push(this); + + if (this.df) { + if (this.df.label) { + this.make_head(); + } + if (this.df.description) { + this.description_wrapper = $( + `
+ ${__(this.df.description)} +
` + ); + + this.wrapper.append(this.description_wrapper); + } + if (this.df.css_class) { + this.wrapper.addClass(this.df.css_class); + } + if (this.df.hide_border) { + this.wrapper.toggleClass("hide-border", true); + } + } + + this.body = $('
').appendTo(this.wrapper); + + if (this.df.body_html) { + this.body.append(this.df.body_html); + } + } + + make_head() { + this.head = $(` +
+ ${__(this.df.label)} + +
+ `); + + this.head.appendTo(this.wrapper); + this.indicator = this.head.find('.collapse-indicator'); + this.indicator.hide(); + + if (this.df.collapsible) { + // show / hide based on status + this.collapse_link = this.head.on("click", () => { + this.collapse(); + }); + this.set_icon(); + this.indicator.show(); + } + } + + refresh() { + if (!this.df) return; + + // hide if explicitly hidden + let hide = this.df.hidden || this.df.hidden_due_to_dependency; + if (!hide && this.layout && this.layout.frm && !this.layout.frm.get_perm(this.df.permlevel || 0, "read")) { + hide = true; + } + + this.wrapper.toggleClass("hide-control", !!hide); + // this.tab && this.tab.refresh(); + } + + collapse(hide) { + // unknown edge case + if (!(this.head && this.body)) { + return; + } + + if (hide === undefined) { + hide = !this.body.hasClass("hide"); + } + + this.body.toggleClass("hide", hide); + this.head && this.head.toggleClass("collapsed", hide); + + this.set_icon(hide); + + // refresh signature fields + this.fields_list.forEach((f) => { + if (f.df.fieldtype == 'Signature') { + f.refresh(); + } + }); + + // save state for next reload ('' is falsy) + if (this.df.css_class) + localStorage.setItem(this.df.css_class + '-closed', hide ? '1' : ''); + } + + set_icon(hide) { + let indicator_icon = hide ? 'down' : 'up-line'; + this.indicator && this.indicator.html(frappe.utils.icon(indicator_icon, 'sm', 'mb-1')); + } + + is_collapsed() { + return this.body.hasClass('hide'); + } + + has_missing_mandatory () { + var missing_mandatory = false; + for (var j = 0, l = this.fields_list.length; j < l; j++) { + var section_df = this.fields_list[j].df; + if (section_df.reqd && this.layout.doc[section_df.fieldname] == null) { + missing_mandatory = true; + break; + } + } + return missing_mandatory; + } + + hide() { + this.wrapper.toggleClass("hide-control", true); + } + + show() { + this.wrapper.toggleClass("hide-control", false); + this.tab && this.tab.toggle(true); + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js new file mode 100644 index 0000000000..bcd532061f --- /dev/null +++ b/frappe/public/js/frappe/form/tab.js @@ -0,0 +1,76 @@ +frappe.ui.form.Tab = class Tab { + constructor(layout, df) { + this.layout = layout; + this.df = df || {}; + this.label = this.df && this.df.label || 'Details'; + this.fields_list = []; + this.fields_dict = {}; + this.make(); + this.refresh(); + } + + make() { + if (!this.layout.page) { + this.layout.page = $('
').appendTo(this.layout.wrapper); + } + + const id = `${frappe.scrub(this.layout.doctype, '-')}-${this.df.fieldname}`; + this.parent = $(`
  • + + ${__(this.label)} + +
    • `).appendTo(this.layout.tabs_list); + + this.wrapper = $(`
    + `).appendTo(this.layout.tabs_content); + + this.layout.tabs.push(this); + } + + set_content() { + + } + + refresh() { + if (!this.df) return; + + // hide if explicitly hidden + let hide = this.df.hidden || this.df.hidden_due_to_dependency; + if (!hide && this.layout && this.layout.frm && !this.layout.frm.get_perm(this.df.permlevel || 0, "read")) { + hide = true; + } + this.toggle(!hide); + } + + toggle(show) { + this.parent.toggleClass('hide', !show); + this.wrapper.toggleClass('hide', !show); + this.parent.toggleClass('show', show); + this.wrapper.toggleClass('show', show); + } + + show() { + this.parent.show(); + } + + hide() { + this.parent.hide(); + } + + set_active() { + this.parent.find('.nav-link').tab('show'); + this.wrapper.addClass('show'); + } + + is_active() { + return this.wrapper.hasClass('active'); + } + + is_hidden() { + this.wrapper.hasClass('hidden') + && this.parent.hasClass('hidden'); + } +} diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index b8b908eb95..9fc357e9c4 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -5,7 +5,6 @@ frappe.provide('frappe.ui'); frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { constructor(opts) { super(opts); - this.first_button = false; this.dirty = false; $.each(this.fields || [], function(i, f) { if(!f.fieldname && f.label) { @@ -16,6 +15,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { this.set_values(this.values); } } + make() { var me = this; if(this.fields) { @@ -61,6 +61,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { } }); } + catch_enter_as_submit() { var me = this; $(this.body).find('input[type="text"], input[type="password"], select').keypress(function(e) { @@ -72,13 +73,16 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { } }); } + get_input(fieldname) { var field = this.fields_dict[fieldname]; return $(field.txt ? field.txt : field.input); } + get_field(fieldname) { return this.fields_dict[fieldname]; } + get_values(ignore_errors) { var ret = {}; var errors = []; @@ -111,10 +115,12 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { } return ret; } + get_value(key) { var f = this.fields_dict[key]; return f && (f.get_value ? f.get_value() : null); } + set_value(key, val){ return new Promise(resolve => { var f = this.fields_dict[key]; @@ -129,9 +135,11 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { } }); } + set_input(key, val) { return this.set_value(key, val); } + set_values(dict) { let promises = []; for(var key in dict) { @@ -142,6 +150,7 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { return Promise.all(promises); } + clear() { for(var key in this.fields_dict) { var f = this.fields_dict[key]; @@ -150,9 +159,10 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { } } } + set_df_property (fieldname, prop, value) { - const field = this.get_field(fieldname); + const field = this.get_field(fieldname); field.df[prop] = value; field.refresh(); } -}; +} diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss index 0bb686f045..a7f9fd5ab6 100644 --- a/frappe/public/scss/desk/form.scss +++ b/frappe/public/scss/desk/form.scss @@ -50,11 +50,11 @@ @extend .frappe-card; } -.form-dashboard { +.form-dashboard-section { .section-body:first-child { margin-top: 0; } - .form-dashboard-section .section-body { + .section-body { display: block; padding-left: var(--padding-md); padding-right: var(--padding-md); @@ -302,6 +302,24 @@ } } +.form-tabs { + .nav-item { + .nav-link { + padding-bottom: 15px; + color: var(--gray-700); + padding-left: 0; + padding-right: 0; + margin-right: 30px; + + &.active { + font-weight: 500; + border-bottom: 1px solid var(--primary); + color: var(--text-color); + } + } + } +} + .progress-area { padding-top: var(--padding-md); padding-bottom: var(--padding-md); From 6e9555ca815ea3b0670834a0135911b5b654083d Mon Sep 17 00:00:00 2001 From: prssanna Date: Thu, 29 Apr 2021 15:02:47 +0530 Subject: [PATCH 0091/1519] feat: add Tab Break to Custom Field fieldtype --- frappe/custom/doctype/custom_field/custom_field.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index 2f0819ab68..4f987e3d14 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -120,7 +120,7 @@ "label": "Field Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature\nTab Break", "reqd": 1 }, { @@ -417,7 +417,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-10-29 06:14:43.073329", + "modified": "2021-04-29 15:02:06.442612", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", From 4be537d287125aade9c357efc393d245fdb3ec5c Mon Sep 17 00:00:00 2001 From: prssanna Date: Fri, 30 Apr 2021 12:58:47 +0530 Subject: [PATCH 0092/1519] fix: add bottom margin to tabs --- frappe/public/scss/desk/form.scss | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/frappe/public/scss/desk/form.scss b/frappe/public/scss/desk/form.scss index a7f9fd5ab6..c2a7c00e40 100644 --- a/frappe/public/scss/desk/form.scss +++ b/frappe/public/scss/desk/form.scss @@ -302,19 +302,23 @@ } } -.form-tabs { - .nav-item { - .nav-link { - padding-bottom: 15px; - color: var(--gray-700); - padding-left: 0; - padding-right: 0; - margin-right: 30px; +.form-tabs-list { + margin-bottom: var(--margin-lg); - &.active { - font-weight: 500; - border-bottom: 1px solid var(--primary); - color: var(--text-color); + .form-tabs { + .nav-item { + .nav-link { + padding-bottom: var(--padding-md); + color: var(--gray-700); + padding-left: 0; + padding-right: 0; + margin-right: var(--margin-xl); + + &.active { + font-weight: 500; + border-bottom: 1px solid var(--primary); + color: var(--text-color); + } } } } @@ -373,7 +377,4 @@ .form-column:not(:first-child) { padding-top: var(--padding-md); } - - - } From 022f7e1c06c8a076fe1c36e2a60059242b077015 Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 8 May 2021 17:59:25 +0530 Subject: [PATCH 0093/1519] fix: label for Tab Break fields --- frappe/core/doctype/doctype/doctype.py | 2 ++ frappe/custom/doctype/custom_field/custom_field.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 84673f990a..3cd336377c 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -277,6 +277,8 @@ class DocType(Document): d.fieldname = d.fieldname + '_section' elif d.fieldtype=='Column Break': d.fieldname = d.fieldname + '_column' + elif d.fieldtype=='Tab Break': + d.fieldname = d.fieldname + '_tab' else: d.fieldname = d.fieldtype.lower().replace(" ","_") + "_" + str(d.idx) else: diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index 39aff8b4a7..dc09173595 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -19,7 +19,7 @@ class CustomField(Document): if not self.fieldname: label = self.label if not label: - if self.fieldtype in ["Section Break", "Column Break"]: + if self.fieldtype in ["Section Break", "Column Break", "Tab Break"]: label = self.fieldtype + "_" + str(self.idx) else: frappe.throw(_("Label is mandatory")) From ea3ca571ad768e0d6e1b368b6ffdfe21d76bb75a Mon Sep 17 00:00:00 2001 From: prssanna Date: Sat, 8 May 2021 18:00:30 +0530 Subject: [PATCH 0094/1519] fix: add Tab Break to no value fields --- frappe/custom/doctype/property_setter/property_setter.py | 2 +- frappe/model/__init__.py | 2 ++ .../page/print_format_builder/print_format_builder.js | 6 +++--- .../print_format_builder/print_format_builder_sidebar.html | 2 +- frappe/public/js/frappe/form/toolbar.js | 2 +- frappe/public/js/frappe/model/model.js | 4 ++-- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/frappe/custom/doctype/property_setter/property_setter.py b/frappe/custom/doctype/property_setter/property_setter.py index 56e5829271..f7e8650489 100644 --- a/frappe/custom/doctype/property_setter/property_setter.py +++ b/frappe/custom/doctype/property_setter/property_setter.py @@ -35,7 +35,7 @@ class PropertySetter(Document): fields=['fieldname', 'label', 'fieldtype'], filters={ 'parent': dt, - 'fieldtype': ['not in', ('Section Break', 'Column Break', 'HTML', 'Read Only', 'Fold') + frappe.model.table_fields], + 'fieldtype': ['not in', ('Section Break', 'Column Break', 'Tab Break', 'HTML', 'Read Only', 'Fold') + frappe.model.table_fields], 'fieldname': ['!=', ''] }, order_by='label asc', diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 205b451336..356275e7b8 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -41,6 +41,7 @@ data_fieldtypes = ( no_value_fields = ( 'Section Break', 'Column Break', + 'Tab Break', 'HTML', 'Table', 'Table MultiSelect', @@ -53,6 +54,7 @@ no_value_fields = ( display_fieldtypes = ( 'Section Break', 'Column Break', + 'Tab Break', 'HTML', 'Button', 'Image', 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 ca2a8bc378..51cac66026 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -261,7 +261,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { } else if(f.fieldtype==="Column Break") { set_column(); - } else if(!in_list(["Section Break", "Column Break", "Fold"], f.fieldtype) + } else if(!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) && f.label) { if(!column) set_column(); @@ -298,7 +298,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { 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) && + if(!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) && !_f.print_hide && f.label) { // column names set as fieldname|width @@ -606,7 +606,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { // add remaining fields $.each(doc_fields, function(j, f) { if (f && !in_list(column_names, f.fieldname) - && !in_list(["Section Break", "Column Break"], f.fieldtype) && f.label) { + && !in_list(["Section Break", "Column Break", "Tab Break"], f.fieldtype) && f.label) { fields.push(f); } }) diff --git a/frappe/printing/page/print_format_builder/print_format_builder_sidebar.html b/frappe/printing/page/print_format_builder/print_format_builder_sidebar.html index 1ebb87ac31..c608eecbbd 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder_sidebar.html +++ b/frappe/printing/page/print_format_builder/print_format_builder_sidebar.html @@ -4,7 +4,7 @@
    {% for (var i=0, l=fields.length; i < l; i++) { var f = fields[i]; %} - {% if(!in_list(["Section Break", "Column Break", "Fold"], f.fieldtype)) { %} + {% if(!in_list(["Section Break", "Tab Break", "Column Break", "Fold"], f.fieldtype)) { %}
    Date: Mon, 10 May 2021 11:51:45 +0530 Subject: [PATCH 0096/1519] fix: remove console.log --- frappe/public/js/frappe/form/dashboard.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index c983f612e0..fd5cff4f9d 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -57,7 +57,7 @@ frappe.ui.form.Dashboard = class FormDashboard { }, this.overview_tab); this.transactions_area = $(`
    Date: Mon, 10 May 2021 11:52:25 +0530 Subject: [PATCH 0097/1519] fix: don't show tab if only 1 is visible --- frappe/public/js/frappe/form/layout.js | 9 +++++++-- frappe/public/js/frappe/form/tab.js | 8 +++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 3396f7ec1b..9d30d17a27 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -280,7 +280,7 @@ frappe.ui.form.Layout = class Layout { this.refresh_sections(); // refresh tabs - this.refresh_tabs(); + this.tabbed_layout && this.refresh_tabs(); if (this.frm) { // collapse sections @@ -305,7 +305,7 @@ frappe.ui.form.Layout = class Layout { refresh_tabs() { this.tabs.forEach(tab => { - if (!tab.wrapper.hasClass('hide') && !tab.parent.hasClass('hide')) { + if (!tab.wrapper.hasClass('hide') || !tab.parent.hasClass('hide')) { tab.parent.removeClass('show hide'); tab.wrapper.removeClass('show hide'); if (tab.wrapper.find( @@ -318,6 +318,11 @@ frappe.ui.form.Layout = class Layout { } } }); + + const visible_tabs = this.tabs.filter(tab => !tab.hidden); + if (visible_tabs && visible_tabs.length == 1) { + visible_tabs[0].parent.toggleClass('hide show'); + } } refresh_fields(fields) { diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index bcd532061f..d60f608e2a 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -42,7 +42,8 @@ frappe.ui.form.Tab = class Tab { if (!hide && this.layout && this.layout.frm && !this.layout.frm.get_perm(this.df.permlevel || 0, "read")) { hide = true; } - this.toggle(!hide); + + hide && this.toggle(false); } toggle(show) { @@ -50,6 +51,7 @@ frappe.ui.form.Tab = class Tab { this.wrapper.toggleClass('hide', !show); this.parent.toggleClass('show', show); this.wrapper.toggleClass('show', show); + this.hidden = !show; } show() { @@ -70,7 +72,7 @@ frappe.ui.form.Tab = class Tab { } is_hidden() { - this.wrapper.hasClass('hidden') - && this.parent.hasClass('hidden'); + this.wrapper.hasClass('hide') + && this.parent.hasClass('hide'); } } From 0aaf002819a47254eeaaa82f77d33f387a680824 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 11 May 2021 14:53:50 +0530 Subject: [PATCH 0098/1519] fix: set up tabbed layout only if tabbed_layout is true --- frappe/public/js/frappe/form/layout.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 9d30d17a27..b4309107bc 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -18,19 +18,24 @@ frappe.ui.form.Layout = class Layout { this.message = $('').appendTo(this.wrapper); this.page = $('
    ').appendTo(this.wrapper); + this.tabbed_layout && this.setup_tabbed_layout(); + + if (!this.fields) { + this.fields = this.get_doctype_fields(); + } + + this.setup_tabbing(); + this.render(); + } + + setup_tabbed_layout() { $(`
    `).appendTo(this.page); this.tabs_list = this.page.find('.form-tabs'); this.tabs_content = $(`
    `).appendTo(this.page); - if (!this.fields) { - this.fields = this.get_doctype_fields(); - } - this.setup_events(); - this.setup_tabbing(); - this.render(); } show_empty_form_message() { @@ -312,9 +317,9 @@ frappe.ui.form.Layout = class Layout { ".form-section:not(.hide-control, .empty-section), .form-dashboard-section:not(.hide-control, .empty-section)" ).length ) { - tab.toggle(true) + tab.toggle(true); } else { - tab.toggle(false) + tab.toggle(false); } } }); From 4e9e1a9ccf93c1504fdaed30b7f2d6c6141c65e3 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 11 May 2021 15:00:46 +0530 Subject: [PATCH 0099/1519] style: fix formatting --- .../page/print_format_builder/print_format_builder.js | 4 ++-- frappe/public/js/frappe/form/column.js | 2 +- frappe/public/js/frappe/form/form.js | 1 + frappe/public/js/frappe/form/layout.js | 9 ++++----- frappe/public/js/frappe/form/section.js | 2 +- frappe/public/js/frappe/ui/field_group.js | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) 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 51cac66026..b73ff31d32 100644 --- a/frappe/printing/page/print_format_builder/print_format_builder.js +++ b/frappe/printing/page/print_format_builder/print_format_builder.js @@ -261,7 +261,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { } else if(f.fieldtype==="Column Break") { set_column(); - } else if(!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) + } else if (!in_list(["Section Break", "Column Break", "Tab Break", "Fold"], f.fieldtype) && f.label) { if(!column) set_column(); @@ -298,7 +298,7 @@ frappe.PrintFormatBuilder = class PrintFormatBuilder { init_visible_columns(f) { f.visible_columns = [] $.each(frappe.get_meta(f.options).fields, function(i, _f) { - if(!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) && + if (!in_list(["Section Break", "Column Break", "Tab Break"], _f.fieldtype) && !_f.print_hide && f.label) { // column names set as fieldname|width diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js index 8ceb2d029e..c94b0ad8fa 100644 --- a/frappe/public/js/frappe/form/column.js +++ b/frappe/public/js/frappe/form/column.js @@ -38,4 +38,4 @@ frappe.ui.form.Column = class Column { refresh() { this.section.refresh(); } -} \ No newline at end of file +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 83d38b323b..293963433c 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -469,6 +469,7 @@ frappe.ui.form.Form = class FrappeForm { this.$wrapper.trigger('render_complete'); this.cscript.is_onload && this.set_first_tab_as_active(); + if(!this.hidden) { this.layout.show_empty_form_message(); } diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index b4309107bc..0f81195e07 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -115,7 +115,7 @@ frappe.ui.form.Layout = class Layout { // } if (this.tabbed_layout && this.no_opening_tab()) { - this.make_tab({label: __('Details'), fieldname: 'details'}) + this.make_tab({label: __('Details'), fieldname: 'details'}); } if (this.no_opening_section()) { @@ -400,10 +400,9 @@ frappe.ui.form.Layout = class Layout { setup_events() { this.tabs_list.off('click').on('click', '.nav-link', (e) => { - e.preventDefault() + e.preventDefault(); e.stopImmediatePropagation(); $(e.currentTarget).tab('show'); - // this.$current_tab = $(e.currentTarget); }); } @@ -602,7 +601,7 @@ frappe.ui.form.Layout = class Layout { let doc = this.doc; if (!doc && this.get_values) { - let doc = this.get_values(true); + doc = this.get_values(true); } if (!doc) { @@ -640,4 +639,4 @@ frappe.ui.form.Layout = class Layout { return out; } -} +}; diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js index f84dd6a58b..cbbe5a9d20 100644 --- a/frappe/public/js/frappe/form/section.js +++ b/frappe/public/js/frappe/form/section.js @@ -155,4 +155,4 @@ frappe.ui.form.Section = class Section { this.wrapper.toggleClass("hide-control", false); this.tab && this.tab.toggle(true); } -} \ No newline at end of file +}; diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js index 9fc357e9c4..9cc5b78456 100644 --- a/frappe/public/js/frappe/ui/field_group.js +++ b/frappe/public/js/frappe/ui/field_group.js @@ -121,10 +121,10 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { return f && (f.get_value ? f.get_value() : null); } - set_value(key, val){ + set_value(key, val) { return new Promise(resolve => { var f = this.fields_dict[key]; - if(f) { + if (f) { f.set_value(val).then(() => { f.set_input(val); this.refresh_dependency(); @@ -165,4 +165,4 @@ frappe.ui.FieldGroup = class FieldGroup extends frappe.ui.form.Layout { field.df[prop] = value; field.refresh(); } -} +}; From c6c2eeed72b2cd4e4ed572e37ca64bf6884b6225 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 17:54:42 +0530 Subject: [PATCH 0100/1519] fix: Add, Edit & Delete Chart --- frappe/desk/desktop.py | 41 +++++---- frappe/public/js/frappe/wiki_blocks/chart.js | 89 +++++++++++++------- 2 files changed, 83 insertions(+), 47 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 3713a489e3..6d0356747d 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -551,22 +551,7 @@ def save_new_widget(page, new_widgets): original_page.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - content = frappe.db.get_value("Internal Wiki Page", page, "content") - page_widgets = {} - for wid in ['shortcut', 'card', 'chart']: - # get list of widget's name from internal wiki page - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] - - updated_widgets = [] - original_page.get('shortcuts').reverse() - for w in original_page.get('shortcuts'): - if w.label in page_widgets['shortcut'] and w.label not in [x.label for x in updated_widgets]: - updated_widgets.append(w) - original_page.set('shortcuts', updated_widgets) - - for i, v in enumerate(original_page.links): - if v.type == 'Card Break' and v.label not in page_widgets['card']: - del original_page.links[ i : i+v.link_count+1] + clean_up(original_page, page) try: original_page.save(ignore_permissions=True) @@ -586,6 +571,30 @@ def save_new_widget(page, new_widgets): return True +def clean_up(original_page, page): + page_widgets = {} + + content = frappe.db.get_value("Internal Wiki Page", page, "content") + + for wid in ['shortcut', 'card', 'chart']: + # get list of widget's name from internal wiki page + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + + # shortcut & chart cleanup + for wid in ['shortcut', 'chart']: + updated_widgets = [] + original_page.get(wid+'s').reverse() + + for w in original_page.get(wid+'s'): + if w.label in page_widgets[wid] and w.label not in [x.label for x in updated_widgets]: + updated_widgets.append(w) + original_page.set(wid+'s', updated_widgets) + + # card cleanup + for i, v in enumerate(original_page.links): + if v.type == 'Card Break' and v.label not in page_widgets['card']: + del original_page.links[i : i+v.link_count+1] + def new_widget(config, doctype, parentfield): if not config: return [] diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 1d637ef5b6..6c51ad873e 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -1,3 +1,4 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; export default class Chart { static get toolbox() { return { @@ -10,34 +11,32 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly}) { + constructor({data, api, config, readOnly, block}) { this.data = data; this.api = api; + this.block = block; this.config = config; this.readOnly = readOnly; - this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; this.pb = this.data.pb ? this.data.pb : "0"; this.pl = this.data.pl ? this.data.pl : "0"; this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true, + max_widget_count: 2, + }; } render() { - let me = this; this.wrapper = document.createElement('div'); - this._make_fieldgroup(this.wrapper, [{ - fieldtype: "Select", - label: "Chart Name", - fieldname: "chart_name", - options: this.config.page_data.charts.items.map(({ chart_name }) => chart_name), - change: function() { - if (this.value) { - me._make_charts(this.value); - } - } - }]); + this._new_chart(); + if (this.data && this.data.chart_name) { this._make_charts(this.data.chart_name); } @@ -51,7 +50,8 @@ export default class Chart { pt: this._getPadding("t"), pr: this._getPadding("r"), pb: this._getPadding("b"), - pl: this._getPadding("l") + pl: this._getPadding("l"), + new: this.new_chart_widget }; } @@ -64,6 +64,34 @@ export default class Chart { e.classList.add("pl-" + this.pl); } + _new_chart() { + const dialog_class = get_dialog_constructor('chart'); + this.dialog = new dialog_class({ + label: this.label, + type: 'chart', + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.chart_widget = frappe.widget.make_widget({ + ...widget, + widget_type: 'chart', + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.chart_widget) + } + }); + this.chart_widget.customize(this.options); + this.wrapper.setAttribute("chart_name", this.chart_widget.label); + this.new_chart_widget = this.chart_widget.get_config(); + }, + }); + + if (!this.readOnly && this.data && !this.data.chart_name) { + this.dialog.make(); + } + } + _getCol() { var e = 12; var t = "col-12"; @@ -130,32 +158,31 @@ export default class Chart { this.chart_field.make(); } + on_edit(chart_obj) { + let chart = chart_obj.get_config(); + this.chart_widget.widgets = chart; + this.wrapper.setAttribute("chart_name", chart.label); + this.new_chart_widget = chart_obj.get_config(); + } + _make_charts(chart_name) { let chart = this.config.page_data.charts.items.find(obj => { - return obj.chart_name == chart_name; + return obj.label == chart_name; }); + if (!chart) return; this.wrapper.innerHTML = ''; - this.sections = {}; - chart.in_customize_mode = !this.readOnly; - this.sections["charts"] = new frappe.widget.SingleWidgetGroup({ + this.chart_widget = new frappe.widget.SingleWidgetGroup({ container: this.wrapper, type: "chart", - columns: 1, class_name: "widget-charts", - // hidden: Boolean(this.onboarding_widget), - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - max_widget_count: 2, - }, - widgets: chart + options: this.options, + widgets: chart, + api: this.api, + block: this.block }); this.wrapper.setAttribute("chart_name", chart_name); if (!this.readOnly) { - this.sections["charts"].customize(); + this.chart_widget.customize(); } } } \ No newline at end of file From 46195c6b8a9dd1a069f5efa162c34cd77ac4c1ce Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 18 May 2021 18:04:42 +0530 Subject: [PATCH 0101/1519] fix: new build system changes --- frappe/public/js/frappe/form/column.js | 2 +- frappe/public/js/frappe/form/dashboard.js | 11 +++++++---- frappe/public/js/frappe/form/layout.js | 10 +++++++--- frappe/public/js/frappe/form/section.js | 2 +- frappe/public/js/frappe/form/tab.js | 2 +- 5 files changed, 17 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js index c94b0ad8fa..5551bf5b62 100644 --- a/frappe/public/js/frappe/form/column.js +++ b/frappe/public/js/frappe/form/column.js @@ -1,4 +1,4 @@ -frappe.ui.form.Column = class Column { +export default class Column { constructor(section, df) { if (!df) df = {}; diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index fd5cff4f9d..b85f3cc2bb 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -1,6 +1,9 @@ // Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors // MIT License. See license.txt +import Section from "./section.js"; +import Tab from "./tab.js"; + frappe.ui.form.Dashboard = class FormDashboard { constructor(opts) { $.extend(this, opts); @@ -9,13 +12,13 @@ frappe.ui.form.Dashboard = class FormDashboard { } setup_dashboard_tabs() { - this.overview_tab = new frappe.ui.form.Tab(this.frm.layout, { + this.overview_tab = new Tab(this.frm.layout, { label: __("Overview"), hidden: 1, fieldname: 'dashboard-overview' }); - this.connections_tab = new frappe.ui.form.Tab(this.frm.layout, { + this.connections_tab = new Tab(this.frm.layout, { label: __("Connections"), hidden: 1, fieldname: 'dashboard-connection' @@ -68,7 +71,7 @@ frappe.ui.form.Dashboard = class FormDashboard { } make_section(df, tab) { - return new frappe.ui.form.Section( + return new Section( this.frm.layout, df, tab, @@ -105,7 +108,7 @@ frappe.ui.form.Dashboard = class FormDashboard { make_card: true, is_dashboard_section: 1 }; - return new frappe.ui.form.Section(this.frm.layout, options, tab).body; + return new Section(this.frm.layout, options, tab).body; } remove_section(title) { diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 0f81195e07..72ee979443 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -1,3 +1,7 @@ +import Section from "./section.js"; +import Tab from "./tab.js"; +import Column from "./column.js" + frappe.ui.form.Layout = class Layout { constructor (opts) { this.views = {}; @@ -235,7 +239,7 @@ frappe.ui.form.Layout = class Layout { } make_section(df) { - this.section = new frappe.ui.form.Section(this, df, this.tab || null); + this.section = new Section(this, df, this.tab || null); // append to layout fields if (df) { @@ -247,14 +251,14 @@ frappe.ui.form.Layout = class Layout { } make_column(df) { - this.column = new frappe.ui.form.Column(this.section, df); + this.column = new Column(this.section, df); if (df && df.fieldname) { this.fields_list.push(this.column); } } make_tab(df) { - this.tab = new frappe.ui.form.Tab(this, df); + this.tab = new Tab(this, df); if (df) { this.fields_dict[df.fieldname] = this.tab; diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js index cbbe5a9d20..a88397c51a 100644 --- a/frappe/public/js/frappe/form/section.js +++ b/frappe/public/js/frappe/form/section.js @@ -1,6 +1,6 @@ // import '../class'; -frappe.ui.form.Section = class Section { +export default class Section { constructor(layout, df, tab) { this.layout = layout; this.tab = tab; diff --git a/frappe/public/js/frappe/form/tab.js b/frappe/public/js/frappe/form/tab.js index d60f608e2a..84e50a7da1 100644 --- a/frappe/public/js/frappe/form/tab.js +++ b/frappe/public/js/frappe/form/tab.js @@ -1,4 +1,4 @@ -frappe.ui.form.Tab = class Tab { +export default class Tab { constructor(layout, df) { this.layout = layout; this.df = df || {}; From d15b3f76f4d608c1493f862887b02bb1c5d82466 Mon Sep 17 00:00:00 2001 From: prssanna Date: Tue, 18 May 2021 18:08:00 +0530 Subject: [PATCH 0102/1519] style: fix formatting --- frappe/public/js/frappe/form/column.js | 2 +- frappe/public/js/frappe/form/dashboard.js | 4 ---- frappe/public/js/frappe/form/layout.js | 2 +- frappe/public/js/frappe/form/section.js | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/frappe/public/js/frappe/form/column.js b/frappe/public/js/frappe/form/column.js index 5551bf5b62..98ca28b9f5 100644 --- a/frappe/public/js/frappe/form/column.js +++ b/frappe/public/js/frappe/form/column.js @@ -38,4 +38,4 @@ export default class Column { refresh() { this.section.refresh(); } -}; \ No newline at end of file +} \ No newline at end of file diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index b85f3cc2bb..33d34f1b4a 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -111,10 +111,6 @@ frappe.ui.form.Dashboard = class FormDashboard { return new Section(this.frm.layout, options, tab).body; } - remove_section(title) { - section.wrapper.remove(); - } - add_progress(title, percent, message) { let progress_chart = this.make_progress_chart(title); diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 72ee979443..0a5494fc76 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -1,6 +1,6 @@ import Section from "./section.js"; import Tab from "./tab.js"; -import Column from "./column.js" +import Column from "./column.js"; frappe.ui.form.Layout = class Layout { constructor (opts) { diff --git a/frappe/public/js/frappe/form/section.js b/frappe/public/js/frappe/form/section.js index a88397c51a..cbc8666883 100644 --- a/frappe/public/js/frappe/form/section.js +++ b/frappe/public/js/frappe/form/section.js @@ -155,4 +155,4 @@ export default class Section { this.wrapper.toggleClass("hide-control", false); this.tab && this.tab.toggle(true); } -}; +} From a2248192e1273298a932e06b03b2a7dd00c389f2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 18 May 2021 21:42:59 +0530 Subject: [PATCH 0103/1519] fix: Chart config fix --- frappe/public/js/frappe/views/wiki.js | 10 ++++++++++ frappe/public/js/frappe/widgets/chart_widget.js | 2 ++ 2 files changed, 12 insertions(+) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 057ae25902..4b52708194 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -207,6 +207,16 @@ frappe.views.Wiki = class Wiki { page: page }).then(data => { this.page_data = data; + if (!this.page_data) return; + + return frappe.dashboard_utils.get_dashboard_settings().then(settings => { + let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; + if (this.page_data.charts.items) { + this.page_data.charts.items.map(chart => { + chart.chart_settings = chart_config[chart.chart_name] || {}; + }); + } + }); }); } diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 0c36f013ec..44f3edc038 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -349,6 +349,8 @@ export default class ChartWidget extends Widget { } setup_filter_button() { + if (this.in_customize_mode) return; + this.is_document_type = this.chart_doc.chart_type !== "Report" && this.chart_doc.chart_type !== "Custom"; From 6375818c10d73e9ae02ba7ee6e1821e3b4143857 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 21:57:20 +0530 Subject: [PATCH 0104/1519] fix: 404 caching --- .../page_controllers/not_found_page.py | 20 +++++++++++++++++++ frappe/website/serve.py | 6 ++++++ frappe/website/utils.py | 3 ++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py index aebc0006ae..1f6bbd4b02 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_controllers/not_found_page.py @@ -1,10 +1,30 @@ +import frappe from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.utils import can_cache +from urllib.parse import urlparse + +HOMEPAGE_PATHS = ('/', '/index', '', 'index') class NotFoundPage(TemplatePage): def __init__(self, path, http_status_code): + self.resolved_path = path path = '404' http_status_code = 404 super().__init__(path=path, http_status_code=http_status_code) def validate(self): return True + + def render(self): + if can_cache_404(self.resolved_path): + frappe.cache().hset('website_404', frappe.request.url, True) + return super().render() + +def can_cache_404(path): + # do not cache 404 for custom homepages + return can_cache() and not is_custom_home_page(path) + +def is_custom_home_page(path): + url = frappe.request.url + url_parts = urlparse(url) + return url_parts.path in HOMEPAGE_PATHS and path not in HOMEPAGE_PATHS diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 7010b768d8..56fed22469 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,8 +1,10 @@ import frappe from frappe.website.page_controllers.error_page import ErrorPage +from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.path_resolver import PathResolver +from frappe.website.utils import can_cache def get_response(path=None, http_status_code=200): @@ -11,6 +13,10 @@ def get_response(path=None, http_status_code=200): path = path or frappe.local.request.path endpoint = path + if can_cache() and frappe.cache().hget('website_404', frappe.request.url): + response = NotFoundPage(path=path).render() + return response + try: path_resolver = PathResolver(path, http_status_code) endpoint, renderer_instance = path_resolver.resolve() diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 576d1d911c..be18466714 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -540,7 +540,8 @@ def cache_html(func): frappe.local.response.from_cache = True return html html = func(*args, **kwargs) - if can_cache(): + context = args[0].context + if can_cache(context.no_cache): page_cache = frappe.cache().hget("website_page", args[0].path) or {} page_cache[frappe.local.lang] = html frappe.cache().hset("website_page", args[0].path, page_cache) From 48b9198ebd717fe3e3ac1ae1598c78dc04e91266 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 18 May 2021 23:34:30 +0530 Subject: [PATCH 0105/1519] test: Add test case to validate base_template_path --- frappe/website/doctype/web_page/test_web_page.py | 9 ++++++++- frappe/www/_test/_test_folder/_test_page.html | 3 +++ frappe/www/_test/_test_folder/_test_page.py | 2 ++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 frappe/www/_test/_test_folder/_test_page.html create mode 100644 frappe/www/_test/_test_folder/_test_page.py diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index daaa41f5a8..2c43acc226 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import unittest import frappe from frappe.website.router import resolve_route -from frappe.website.serve import get_response +from frappe.website.serve import get_response, get_response_content from frappe.utils import set_request test_records = frappe.get_test_records('Web Page') @@ -73,4 +73,11 @@ class TestWebPage(unittest.TestCase): finally: web_page.delete() + def test_custom_base_template_path(self): + content = get_response_content('/_test/_test_folder/_test_page') + # assert the text in base template is rendered + self.assertTrue('

    This is for testing

    ' in frappe.as_unicode(content)) + + # assert template block rendered + self.assertTrue('

    Test content

    ' in frappe.as_unicode(content)) diff --git a/frappe/www/_test/_test_folder/_test_page.html b/frappe/www/_test/_test_folder/_test_page.html new file mode 100644 index 0000000000..7364235e10 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.html @@ -0,0 +1,3 @@ +{% block content %} +

    Test content

    +{% endblock %} diff --git a/frappe/www/_test/_test_folder/_test_page.py b/frappe/www/_test/_test_folder/_test_page.py new file mode 100644 index 0000000000..fa7b5f5727 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.py @@ -0,0 +1,2 @@ +def get_context(context): + context.base_template_path = 'frappe/templates/test/_test_base.html' From 1be1c25e587c98b62a6134496dac19cd9f4af88e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 04:46:19 +0530 Subject: [PATCH 0106/1519] fix: 404 caching - Move 404 resolving code to path resolver --- .../page_controllers/not_found_page.py | 28 +++++++++++-------- frappe/website/path_resolver.py | 12 ++++++-- frappe/website/serve.py | 6 ---- 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py index 1f6bbd4b02..13c6358512 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_controllers/not_found_page.py @@ -1,13 +1,16 @@ +import os +from urllib.parse import urlparse + import frappe from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.utils import can_cache -from urllib.parse import urlparse -HOMEPAGE_PATHS = ('/', '/index', '', 'index') +HOMEPAGE_PATHS = ('/', '/index', 'index') class NotFoundPage(TemplatePage): def __init__(self, path, http_status_code): - self.resolved_path = path + self.request_path = path + self.request_url = frappe.local.request.url if hasattr(frappe.local, 'request') else '' path = '404' http_status_code = 404 super().__init__(path=path, http_status_code=http_status_code) @@ -16,15 +19,16 @@ class NotFoundPage(TemplatePage): return True def render(self): - if can_cache_404(self.resolved_path): - frappe.cache().hset('website_404', frappe.request.url, True) + if self.can_cache_404(): + frappe.cache().hset('website_404', self.request_url, True) return super().render() -def can_cache_404(path): - # do not cache 404 for custom homepages - return can_cache() and not is_custom_home_page(path) + def can_cache_404(self): + # do not cache 404 for custom homepages + return can_cache() and self.request_url and not self.is_custom_home_page() -def is_custom_home_page(path): - url = frappe.request.url - url_parts = urlparse(url) - return url_parts.path in HOMEPAGE_PATHS and path not in HOMEPAGE_PATHS + def is_custom_home_page(self): + url_parts = urlparse(self.request_url) + request_url = os.path.splitext(url_parts.path)[0] + request_path = os.path.splitext(self.request_path)[0] + return request_url in HOMEPAGE_PATHS and request_path not in HOMEPAGE_PATHS diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 1368932792..1a813fac60 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -8,6 +8,7 @@ from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.web_form import WebFormPage from frappe.website.redirect import resolve_redirect from frappe.website.render import resolve_path +from frappe.website.utils import can_cache class PathResolver(): @@ -21,8 +22,15 @@ class PathResolver(): def resolve(self): '''Returns endpoint and a renderer instance that can render the endpoint''' - query_string = frappe.local.request.query_string if hasattr(frappe.local, 'request') else None - resolve_redirect(self.path, query_string) + request = frappe._dict() + if hasattr(frappe.local, 'request'): + request = frappe.local.request or request + + # check if the request url is in 404 list + if request.url and can_cache() and frappe.cache().hget('website_404', request.url): + return self.path, NotFoundPage(self.path) + + resolve_redirect(self.path, request.query_string) endpoint = resolve_path(self.path) renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 56fed22469..7010b768d8 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,10 +1,8 @@ import frappe from frappe.website.page_controllers.error_page import ErrorPage -from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.not_permitted_page import NotPermittedPage from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.path_resolver import PathResolver -from frappe.website.utils import can_cache def get_response(path=None, http_status_code=200): @@ -13,10 +11,6 @@ def get_response(path=None, http_status_code=200): path = path or frappe.local.request.path endpoint = path - if can_cache() and frappe.cache().hget('website_404', frappe.request.url): - response = NotFoundPage(path=path).render() - return response - try: path_resolver = PathResolver(path, http_status_code) endpoint, renderer_instance = path_resolver.resolve() From b193666c71a32550ce61a2a9a7bc722ef1b2a2fd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 11:34:04 +0530 Subject: [PATCH 0107/1519] fix: Do not set content type for paths ending with .com To avoid unnecessary download --- frappe/website/render.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/website/render.py b/frappe/website/render.py index 6a1d5a404e..c14d8e0d48 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -103,7 +103,9 @@ def set_content_type(response, data, path): response.mimetype = 'text/html' response.charset = 'utf-8' - if "." in path: + # ignore paths ending with .com to avoid unnecessary download + # https://bugs.python.org/issue22347 + if "." in path and not path.endswith('.com'): content_type, encoding = mimetypes.guess_type(path) if content_type: response.mimetype = content_type From 0b37e0dbd7a4f82d0562685723757282304611f2 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 13:55:45 +0530 Subject: [PATCH 0108/1519] fix: Check if resolved file_path in StaticPage is a file --- frappe/website/page_controllers/static_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_controllers/static_page.py index 767cc872d1..b292a62922 100644 --- a/frappe/website/page_controllers/static_page.py +++ b/frappe/website/page_controllers/static_page.py @@ -20,7 +20,7 @@ class StaticPage(WebPage): return for app in frappe.get_installed_apps(): file_path = frappe.get_app_path(app, 'www') + '/' + self.path - if os.path.exists(file_path): + if os.path.isfile(file_path): self.file_path = file_path def validate(self): From 68aa1805aaca41476ea4d47cba9d88ab7cf17c18 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 14:03:31 +0530 Subject: [PATCH 0109/1519] fix: Exception handling --- frappe/utils/global_search.py | 4 +-- .../website/doctype/web_page/test_web_page.py | 31 ++++++++++++++++++- 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 4c78d63918..a7d484a7ff 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -332,8 +332,8 @@ def add_route_to_global_search(route): route=route ) sync_value_in_queue(value) - except (frappe.PermissionError, frappe.DoesNotExistError, frappe.ValidationError, Exception) as e: - raise e + except Exception: + pass frappe.set_user('Administrator') diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 2c43acc226..b40b63b0d5 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -63,7 +63,7 @@ class TestWebPage(unittest.TestCase): dynamic_route = 1, route = '/doctype-view/', content_type = 'HTML', - dymamic_template = 1, + dynamic_template = 1, main_section_html = '
    {{ frappe.form_dict.doctype }}
    ' )).insert() @@ -81,3 +81,32 @@ class TestWebPage(unittest.TestCase): # assert template block rendered self.assertTrue('

    Test content

    ' in frappe.as_unicode(content)) + def test_home_page(self): + content = get_response_content(path='/') + print(content) + content = get_response_content(path='/index') + print(content) + + def test_table_of_content(self): + page = get_response(path='/_test/_test_folder/_test_toc') + print(page) + + def test_sidebar_data(self): + pass + + def test_meta_tags(self): + pass + + def test_breadcrumbs(self): + pass + + def test_downloadable_file(self): + pass + + + + +# breadcrumb +# validate +# cache no-cache +# page context caching From aa0151ce744b3b13265f9f6cfa4e0724c38e4afb Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 19 May 2021 16:28:40 +0530 Subject: [PATCH 0110/1519] fix: Drag, Delete sidebar page --- frappe/desk/desktop.py | 1 - .../internal_wiki_page/internal_wiki_page.py | 15 ++- frappe/public/js/frappe/views/wiki.js | 110 +++++++++++++----- frappe/public/scss/desk/wiki.scss | 17 +++ 4 files changed, 109 insertions(+), 34 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 6d0356747d..a87ca6bc02 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -538,7 +538,6 @@ def save_customization(page, config): return True -@frappe.whitelist() def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) widgets = _dict(loads(new_widgets)) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 6e695ef516..3fba588343 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe import json +from frappe.desk.desktop import save_new_widget from frappe.model.document import Document class InternalWikiPage(Document): @@ -16,7 +17,7 @@ class InternalWikiPage(Document): self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 @frappe.whitelist() -def save_wiki_page(title, parent, sb_items, blocks, save=True): +def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): if save: if not frappe.db.exists("Workspace", title): wspace = frappe.new_doc('Workspace') @@ -38,6 +39,18 @@ def save_wiki_page(title, parent, sb_items, blocks, save=True): doc = frappe.get_doc('Internal Wiki Page', d.get('name')) doc.sequence_id = d.get('sequence_id') doc.save() + + if json.loads(deleted_pages): + for d in json.loads(deleted_pages): + wiki_doc = frappe.get_doc('Internal Wiki Page', d) + wiki_doc.delete() + wspace_doc = frappe.get_doc('Workspace', d) + if not wspace_doc.is_standard: + wspace_doc.delete() + return 'Build' + + if json.loads(new_widgets): + save_new_widget(title, new_widgets) return doc.title diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 4b52708194..1053f7b76e 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -12,6 +12,7 @@ frappe.views.Wiki = class Wiki { this.sections = {}; this.sidebar_items = {}; this.sorted_sidebar_items = []; + this.deleted_sidebar_items = []; this.tools = {}; this.isReadOnly = true; this.new_page = null; @@ -37,13 +38,13 @@ frappe.views.Wiki = class Wiki { for (let page of this.all_pages || []) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } - frappe.router.route(); this.make_sidebar(root_pages); } if (this.new_page) { frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } + frappe.router.route(); }); } @@ -65,12 +66,12 @@ frappe.views.Wiki = class Wiki {
    ${frappe.utils.icon(item.icon || "folder-normal", "md")} ${item.label || item.name} - +
    @@ -85,25 +86,34 @@ frappe.views.Wiki = class Wiki { const get_child_item = function (item) { return $(` -
    - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - +
    +
    + + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
    +
    `); }; const make_sidebar_child_item = item => { let $child_item = get_child_item(item); + let sidebar_control = $child_item.find('.sidebar-item-control'); + this.add_sidebar_actions(item, sidebar_control); $child_item.appendTo(child_item_section); this.sidebar_items[item.name] = $child_item; }; let $item = get_sidebar_item(item); + let sidebar_control = $item.find('.sidebar-item-control'); + this.add_sidebar_actions(item, sidebar_control); + let $drop_icon = $(``); + $drop_icon.appendTo(sidebar_control); let drop_icon = $item.find('.drop-icon').get(0); let child_item_section = $item.find('.sidebar-child-item').get(0); if (this.all_pages.some(e => e.parent_page == item.name)) { @@ -260,7 +270,6 @@ frappe.views.Wiki = class Wiki { setup_actions() { this.page.clear_inner_toolbar(); - this.page.set_secondary_action( __("Customize"), () => { @@ -271,9 +280,9 @@ frappe.views.Wiki = class Wiki { this.undo = new Undo({ editor: this.editor }); this.undo.initialize({blocks: JSON.parse(this.content)}); this.setup_customization_buttons(); + this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); - // this.customize(); }); }, ); @@ -283,10 +292,55 @@ frappe.views.Wiki = class Wiki { }); } + show_sidebar_actions() { + $('.sidebar-item-control .drag-handle').removeClass('hidden'); + $('.sidebar-item-control .delete-page').removeClass('hidden'); + } + + add_sidebar_actions(item, sidebar_control) { + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle hidden", + `${__('Drag')}`, + null, + sidebar_control + ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item.name), + "delete-page hidden", + `${__('Delete')}`, + null, + sidebar_control + ); + } + + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + + delete_page(name) { + if (!this.deleted_sidebar_items.includes(name)) { + this.deleted_sidebar_items.push(name) + } + frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { + this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden') + }); + } + make_sidebar_sortable() { let me = this; this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { - handle: ".standard-sidebar-item-container", + handle: ".drag-handle", draggable: ".standard-sidebar-item-container", animation: 150, onEnd: function (evt) { @@ -353,6 +407,7 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = true; this.page_sortable.option("disabled", true); this.sidebar_sortable.option("disabled", true); + this.deleted_sidebar_items = []; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); } @@ -372,10 +427,6 @@ frappe.views.Wiki = class Wiki { this.setup_customization_buttons(); this.title = values.title; this.parent = values.parent; - // const index = this.all_pages.findIndex(e => e.selected == true ) - // this.all_pages[index].selected = false; - // let item = {name: this.title, selected: true} - // this.make_sidebar([...this.all_pages, item], 'new') this.editor.render({ blocks: [ { @@ -444,26 +495,21 @@ frappe.views.Wiki = class Wiki { title: me.title, parent: me.parent || '', sb_items: me.sorted_sidebar_items, + deleted_pages: me.deleted_sidebar_items, + new_widgets: new_widgets, blocks: JSON.stringify(outputData.blocks), save: save }, callback: function(res) { frappe.dom.unfreeze(); if (res.message) { - let cur_page = res.message; - frappe.call('frappe.desk.desktop.save_new_widget', { - page: me.title, - new_widgets: new_widgets - }).then(res => { - if (res.message) { - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.title = ''; - me.parent = ''; - me.sorted_sidebar_items = []; - me.new_page = cur_page; - me.reload(); - } - }); + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.title = ''; + me.parent = ''; + me.sorted_sidebar_items = []; + me.deleted_sidebar_items = []; + me.new_page = res.message; + me.reload(); } } }); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 8c464a7a48..e0a3727f4f 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -14,6 +14,23 @@ .standard-sidebar-item { justify-content: space-between; + + .sidebar-item-control { + > * { + align-self: center; + margin-left: 3px; + box-shadow: none; + } + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + + svg { + margin-right: 0; + } + } } .sidebar-child-item-container { From 8cf03b492175440403285ad1d9555e6c4aec508e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 19 May 2021 18:43:24 +0530 Subject: [PATCH 0111/1519] fix: Blank to Spacer, Resizable Header --- frappe/public/js/frappe/views/wiki.js | 15 +- frappe/public/js/frappe/wiki_blocks/blocks.js | 6 +- frappe/public/js/frappe/wiki_blocks/header.js | 363 ++++++++++++++++++ .../wiki_blocks/{blank.js => spacer.js} | 6 +- frappe/public/scss/desk/wiki.scss | 11 + 5 files changed, 383 insertions(+), 18 deletions(-) create mode 100644 frappe/public/js/frappe/wiki_blocks/header.js rename frappe/public/js/frappe/wiki_blocks/{blank.js => spacer.js} (97%) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 1053f7b76e..165371e10c 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -1,7 +1,4 @@ import EditorJS from '@editorjs/editorjs'; -import Header from '@editorjs/header'; -import Checklist from '@editorjs/checklist'; -import List from '@editorjs/list'; import Undo from 'editorjs-undo'; frappe.views.Wiki = class Wiki { @@ -151,21 +148,13 @@ frappe.views.Wiki = class Wiki { if (this.content) { this.tools = { header: { - class: Header, + class: frappe.wiki_block.blocks['header'], inlineToolbar: true }, paragraph: { class: frappe.wiki_block.blocks['paragraph'], inlineToolbar: true }, - checklist: { - class: Checklist, - inlineToolbar: true, - }, - list: { - class: List, - inlineToolbar: true, - }, chart: { class: frappe.wiki_block.blocks['chart'], config: { @@ -184,7 +173,7 @@ frappe.views.Wiki = class Wiki { page_data: this.page_data || [] } }, - blank: frappe.wiki_block.blocks['blank'], + spacer: frappe.wiki_block.blocks['spacer'], spacingTune: frappe.wiki_block.tunes['spacing_tune'], }; if (this.editor) { diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js index 239127a674..dc69db66ca 100644 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ b/frappe/public/js/frappe/wiki_blocks/blocks.js @@ -1,9 +1,10 @@ // import blocks +import Header from "../wiki_blocks/header"; import Paragraph from "../wiki_blocks/paragraph"; import Card from "../wiki_blocks/card"; import Chart from "../wiki_blocks/chart"; import Shortcut from "../wiki_blocks/shortcut"; -import Blank from "../wiki_blocks/blank"; +import Spacer from "../wiki_blocks/spacer"; // import tunes import SpacingTune from "../wiki_blocks/spacing_tune"; @@ -11,11 +12,12 @@ import SpacingTune from "../wiki_blocks/spacing_tune"; frappe.provide("frappe.wiki_block"); frappe.wiki_block.blocks = { + header: Header, paragraph: Paragraph, card: Card, chart: Chart, shortcut: Shortcut, - blank: Blank, + spacer: Spacer, }; frappe.wiki_block.tunes = { diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js new file mode 100644 index 0000000000..f3da84a22f --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -0,0 +1,363 @@ +export default class Header { + + constructor({ data, config, api, readOnly }) { + this.api = api; + this.readOnly = readOnly; + + this._CSS = { + block: this.api.styles.block, + settingsButton: this.api.styles.settingsButton, + settingsButtonActive: this.api.styles.settingsButtonActive, + wrapper: 'ce-header', + }; + + this._settings = config; + this._data = this.normalizeData(data); + this.settingsButtons = []; + this._element = this.getTag(); + + this.data = data; + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + } + + normalizeData(data) { + const newData = {}; + + if (typeof data !== 'object') { + data = {}; + } + + newData.text = data.text || ''; + newData.level = parseInt(data.level) || this.defaultLevel.number; + newData.col = parseInt(data.col) || 12; + newData.pt = parseInt(data.pt) || 0; + newData.pr = parseInt(data.pr) || 0; + newData.pb = parseInt(data.pb) || 0; + newData.pl = parseInt(data.pl) || 0; + + return newData; + } + + render() { + if (!this.readOnly) { + this._element.classList.add('widget', 'header'); + this._element.style.minHeight = 50 + 'px'; + } + return this._element; + } + + renderSettings() { + const holder = document.createElement('DIV'); + + if (this.levels.length <= 1) { + return holder; + } + + this.levels.forEach(level => { + const selectTypeButton = document.createElement('SPAN'); + + selectTypeButton.classList.add(this._CSS.settingsButton); + + if (this.currentLevel.number === level.number) { + selectTypeButton.classList.add(this._CSS.settingsButtonActive); + } + + selectTypeButton.innerHTML = level.svg; + + selectTypeButton.dataset.level = level.number; + + selectTypeButton.addEventListener('click', () => { + this.setLevel(level.number); + }); + + holder.appendChild(selectTypeButton); + + this.settingsButtons.push(selectTypeButton); + }); + + return holder; + } + + setLevel(level) { + this.data = { + level: level, + text: this.data.text, + }; + + this.settingsButtons.forEach(button => { + button.classList.toggle(this._CSS.settingsButtonActive, parseInt(button.dataset.level) === level); + }); + } + + merge(data) { + const newData = { + text: this.data.text + data.text, + level: this.data.level, + }; + + this.data = newData; + } + + validate(blockData) { + return blockData.text.trim() !== ''; + } + + save(toolsContent) { + return { + text: toolsContent.innerHTML, + level: this.currentLevel.number, + col: this._getCol(), + pt: this._getPadding("t"), + pr: this._getPadding("r"), + pb: this._getPadding("b"), + pl: this._getPadding("l") + }; + } + + rendered() { + var e = this._element.parentNode.parentNode; + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); + } + + _getCol() { + var e = 12; + var t = "col-12"; + var n = this._element.parentNode.parentNode; + var r = new RegExp(/\bcol-.+?\b/, "g"); + if (n.className.match(r)) { + n.classList.forEach(function (e) { + e.match(r) && (t = e); + }); + var a = t.split("-"); + e = parseInt(a[1]); + } + return e; + } + + _getPadding() { + var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + var t = 0; + var n = "p" + e + "-0"; + var r = this._element.parentNode.parentNode; + var a = new RegExp(/\pl-.+?\b/, "g"); + var i = new RegExp(/\pr-.+?\b/, "g"); + var o = new RegExp(/\pt-.+?\b/, "g"); + var c = new RegExp(/\pb-.+?\b/, "g"); + if ("l" == e) { + if (r.className.match(a)) { + r.classList.forEach(function (e) { + e.match(a) && (n = e); + }); + var s = n.split("-"); + t = parseInt(s[1]); + } + } else if ("r" == e) { + if (r.className.match(i)) { + r.classList.forEach(function (e) { + e.match(i) && (n = e); + }); + var l = n.split("-"); + t = parseInt(l[1]); + } + } else if ("t" == e) { + if (r.className.match(o)) { + r.classList.forEach(function (e) { + e.match(o) && (n = e); + }); + var u = n.split("-"); + t = parseInt(u[1]); + } + } else if ("b" == e && r.className.match(c)) { + r.classList.forEach(function (e) { + e.match(c) && (n = e); + }); + var p = n.split("-"); + t = parseInt(p[1]); + } + return t; + } + + static get conversionConfig() { + return { + export: 'text', // use 'text' property for other blocks + import: 'text', // fill 'text' property from other block's export string + }; + } + + static get sanitize() { + return { + level: false, + text: {}, + }; + } + + static get isReadOnlySupported() { + return true; + } + + get data() { + this._data.text = this._element.innerHTML; + this._data.level = this.currentLevel.number; + + return this._data; + } + + set data(data) { + this._data = this.normalizeData(data); + + if (data.level !== undefined && this._element.parentNode) { + const newHeader = this.getTag(); + newHeader.innerHTML = this._element.innerHTML; + this._element.parentNode.replaceChild(newHeader, this._element); + this._element = newHeader; + } + + if (data.text !== undefined) { + this._element.innerHTML = this._data.text || ''; + } + + if (!this.readOnly) { + this._element.classList.add('widget', 'header'); + this._element.style.minHeight = 50 + 'px'; + } + } + + getTag() { + const tag = document.createElement(this.currentLevel.tag); + + tag.innerHTML = this._data.text || ''; + + tag.classList.add(this._CSS.wrapper); + + tag.contentEditable = this.readOnly ? 'false' : 'true'; + + tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); + + return tag; + } + + get currentLevel() { + let level = this.levels.find(levelItem => levelItem.number === this._data.level); + + if (!level) { + level = this.defaultLevel; + } + + return level; + } + + get defaultLevel() { + if (this._settings.defaultLevel) { + const userSpecified = this.levels.find(levelItem => { + return levelItem.number === this._settings.defaultLevel; + }); + + if (userSpecified) { + return userSpecified; + } else { + console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); + } + } + + return this.levels[1]; + } + + get levels() { + const availableLevels = [ + { + number: 1, + tag: 'H1', + svg: '', + }, + { + number: 2, + tag: 'H2', + svg: '', + }, + { + number: 3, + tag: 'H3', + svg: '', + }, + { + number: 4, + tag: 'H4', + svg: '', + }, + { + number: 5, + tag: 'H5', + svg: '', + }, + { + number: 6, + tag: 'H6', + svg: '', + }, + ]; + + return this._settings.levels ? availableLevels.filter( + l => this._settings.levels.includes(l.number) + ) : availableLevels; + } + + onPaste(event) { + const content = event.detail.data; + + let level = this.defaultLevel.number; + + switch (content.tagName) { + case 'H1': + level = 1; + break; + case 'H2': + level = 2; + break; + case 'H3': + level = 3; + break; + case 'H4': + level = 4; + break; + case 'H5': + level = 5; + break; + case 'H6': + level = 6; + break; + } + + if (this._settings.levels) { + // Fallback to nearest level when specified not available + level = this._settings.levels.reduce((prevLevel, currLevel) => { + return Math.abs(currLevel - level) < Math.abs(prevLevel - level) ? currLevel : prevLevel; + }); + } + + this.data = { + level, + text: content.innerHTML, + }; + } + + static get pasteConfig() { + return { + tags: ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'], + }; + } + + static get toolbox() { + return { + icon: '', + title: 'Heading', + }; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/blank.js b/frappe/public/js/frappe/wiki_blocks/spacer.js similarity index 97% rename from frappe/public/js/frappe/wiki_blocks/blank.js rename to frappe/public/js/frappe/wiki_blocks/spacer.js index 761bd2d9e9..6ec33adcc2 100644 --- a/frappe/public/js/frappe/wiki_blocks/blank.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -1,7 +1,7 @@ -export default class Blank { +export default class Spacer { static get toolbox() { return { - title: 'Blank', + title: 'Spacer', icon: '' }; } @@ -25,7 +25,7 @@ export default class Blank { render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { - this.wrapper.innerText = 'Blank'; + this.wrapper.innerText = 'Spacer'; this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; } diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index e0a3727f4f..2ffdeaa15d 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -57,6 +57,17 @@ margin-bottom: 0 !important; } +.widget.header { + display: flex; + justify-content: center; + padding-left: 12px !important; + min-height: 65px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + cursor: pointer; +} + .codex-editor { min-height: 630px; From c26c5d9ef027312ba695c962fe0427172a8db27d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 19:04:16 +0530 Subject: [PATCH 0112/1519] feat: Add is_valid_path method to PathResolver --- .../website/doctype/web_page/test_web_page.py | 11 ++++---- frappe/website/path_resolver.py | 26 +++++++++++-------- frappe/website/serve.py | 2 +- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index b40b63b0d5..108b36caaa 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -1,7 +1,7 @@ from __future__ import unicode_literals import unittest import frappe -from frappe.website.router import resolve_route +from frappe.website.path_resolver import PathResolver from frappe.website.serve import get_response, get_response_content from frappe.utils import set_request @@ -18,10 +18,11 @@ class TestWebPage(unittest.TestCase): for t in test_records: frappe.get_doc(t).insert() - def test_check_sitemap(self): - resolve_route("test-web-page-1") - resolve_route("test-web-page-1/test-web-page-2") - resolve_route("test-web-page-1/test-web-page-3") + def test_path_resolver(self): + self.assertTrue(PathResolver("test-web-page-1").is_valid_path()) + self.assertTrue(PathResolver("test-web-page-1/test-web-page-2").is_valid_path()) + self.assertTrue(PathResolver("test-web-page-1/test-web-page-3").is_valid_path()) + self.assertFalse(PathResolver("test-web-page-1/test-web-page-Random").is_valid_path()) def test_base_template(self): content = get_page_content('/_test/_test_custom_base.html') diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 1a813fac60..b6f7dbe9f9 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -6,19 +6,15 @@ from frappe.website.page_controllers.print_page import PrintPage from frappe.website.page_controllers.static_page import StaticPage from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.web_form import WebFormPage +from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.redirect import resolve_redirect from frappe.website.render import resolve_path from frappe.website.utils import can_cache class PathResolver(): - def __init__(self, path, http_status_code=None): - self._path = path - self.http_status_code = http_status_code - - @property - def path(self): - return self._path.strip('/ ') + def __init__(self, path): + self.path = path.strip('/ ') def resolve(self): '''Returns endpoint and a renderer instance that can render the endpoint''' @@ -30,15 +26,23 @@ class PathResolver(): if request.url and can_cache() and frappe.cache().hget('website_404', request.url): return self.path, NotFoundPage(self.path) - resolve_redirect(self.path, request.query_string) - endpoint = resolve_path(self.path) + try: + resolve_redirect(self.path, request.query_string) + except frappe.Redirect: + return self.path, RedirectPage(self.path) + endpoint = resolve_path(self.path) renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) for renderer in renderers: - renderer_instance = renderer(endpoint, self.http_status_code) + renderer_instance = renderer(endpoint, 200) can_render = renderer_instance.validate() if can_render: return endpoint, renderer_instance - return endpoint, None + return endpoint, NotFoundPage(endpoint) + + def is_valid_path(self): + _endpoint, renderer_instance = self.resolve() + return not isinstance(renderer_instance, NotFoundPage) + diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 7010b768d8..95a49cef1a 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -12,7 +12,7 @@ def get_response(path=None, http_status_code=200): endpoint = path try: - path_resolver = PathResolver(path, http_status_code) + path_resolver = PathResolver(path) endpoint, renderer_instance = path_resolver.resolve() if renderer_instance: response = renderer_instance.render() From adb4bc8e30bff16602556f8563d8a09759d58a87 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 19 May 2021 19:08:22 +0530 Subject: [PATCH 0113/1519] refactor: Delete unused code --- frappe/website/doctype/web_page/web_page.py | 42 +----- .../website_settings/website_settings.py | 13 +- frappe/website/router.py | 125 +----------------- frappe/website/utils.py | 19 --- 4 files changed, 14 insertions(+), 185 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index d3c7d19b9a..cc41e4e339 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -1,23 +1,19 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import print_function, unicode_literals - import re -import requests -import requests.exceptions from jinja2.exceptions import TemplateSyntaxError import frappe -from frappe.utils import get_datetime, now, strip_html, quoted +from frappe import _ +from frappe.utils import get_datetime, now, quoted, strip_html from frappe.utils.jinja import render_template -from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow -from frappe.website.router import resolve_route -from frappe.website.utils import (extract_title, find_first_image, get_comment_list, - get_html_content_based_on_type) -from frappe.website.website_generator import WebsiteGenerator from frappe.utils.safe_exec import safe_exec +from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow +from frappe.website.utils import (extract_title, find_first_image, + get_comment_list, get_html_content_based_on_type) +from frappe.website.website_generator import WebsiteGenerator class WebPage(WebsiteGenerator): @@ -184,32 +180,6 @@ def check_publish_status(): frappe.db.set_value("Web Page", page.name, "published", 1) - -def check_broken_links(): - cnt = 0 - for p in frappe.db.sql("select name, main_section from `tabWeb Page`", as_dict=True): - for link in re.findall('href=["\']([^"\']*)["\']', p.main_section): - if link.startswith("http"): - try: - res = requests.get(link) - except requests.exceptions.SSLError: - res = frappe._dict({"status_code": "SSL Error"}) - except requests.exceptions.ConnectionError: - res = frappe._dict({"status_code": "Connection Error"}) - - if res.status_code!=200: - print("[{0}] {1}: {2}".format(res.status_code, p.name, link)) - cnt += 1 - else: - link = link[1:] # remove leading / - link = link.split("#")[0] - - if not resolve_route(link): - print(p.name + ":" + link) - cnt += 1 - - print("{0} links broken".format(cnt)) - def get_web_blocks_html(blocks): '''Converts a list of blocks into Raw HTML and extracts out their scripts for deduplication''' diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index f7f22aa2df..ae8e6bd7e1 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -1,15 +1,13 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from six.moves.urllib.parse import quote -from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import get_request_site_address, encode -from frappe.model.document import Document -from six.moves.urllib.parse import quote -from frappe.website.router import resolve_route -from frappe.website.doctype.website_theme.website_theme import add_website_theme from frappe.integrations.doctype.google_settings.google_settings import get_auth_url +from frappe.model.document import Document +from frappe.utils import encode, get_request_site_address +from frappe.website.doctype.website_theme.website_theme import add_website_theme INDEXING_SCOPES = "https://www.googleapis.com/auth/indexing" @@ -23,7 +21,8 @@ class WebsiteSettings(Document): def validate_home_page(self): if frappe.flags.in_install: return - if self.home_page and not resolve_route(self.home_page): + from frappe.website.path_resolver import PathResolver + if self.home_page and not PathResolver(self.home_page).is_valid_path(): frappe.msgprint(_("Invalid Home Page") + " (Standard pages - index, login, products, blog, about, contact)") self.home_page = '' diff --git a/frappe/website/router.py b/frappe/website/router.py index 2e27b4c690..9922647ebf 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -5,130 +5,9 @@ import io import os import re -from werkzeug.routing import Map, NotFound, Rule - import frappe -from frappe.model.document import get_controller -from frappe.website.utils import can_cache, extract_comment_tag, extract_title - - -def resolve_route(path): - """Returns the page route object based on searching in pages and generators. - The `www` folder is also a part of generator **Web Page**. - - The only exceptions are `/about` and `/contact` these will be searched in Web Pages - first before checking the standard pages.""" - - if path not in ("about", "contact"): - context = get_page_info_from_template(path) - if context: - return context - return get_page_context_from_doctype(path) - else: - context = get_page_context_from_doctype(path) - if context: - return context - return get_page_info_from_template(path) - -def get_page_context(path): - page_context = None - if can_cache(): - page_context_cache = frappe.cache().hget("page_context", path) or {} - page_context = page_context_cache.get(frappe.local.lang, None) - - if not page_context: - page_context = make_page_context(path) - if can_cache(page_context.no_cache): - page_context_cache[frappe.local.lang] = page_context - frappe.cache().hset("page_context", path, page_context_cache) - - return page_context - -def make_page_context(path): - context = resolve_route(path) - if not context: - raise frappe.PageDoesNotExistError - - context.doctype = context.ref_doctype - - if context.page_title: - context.title = context.page_title - - context.pathname = frappe.local.path - - return context - -def get_page_info_from_template(path): - '''Return page_info from path''' - for app in frappe.get_installed_apps(frappe_last=True): - app_path = frappe.get_app_path(app) - - folders = get_start_folders() - - for start in folders: - search_path = os.path.join(app_path, start, path) - options = (search_path, search_path + '.html', search_path + '.md', - search_path + '/index.html', search_path + '/index.md') - for o in options: - option = frappe.as_unicode(o) - if os.path.exists(option) and not os.path.isdir(option): - return get_page_info(option, app, start, app_path=app_path) - - return None - -def get_page_context_from_doctype(path): - page_info = get_page_info_from_doctypes(path) - if not page_info: - page_info = get_page_info_from_web_page_with_dynamic_routes(path) - - if page_info: - return frappe.get_doc(page_info.get("doctype"), - page_info.get("name")).get_page_info() - -def get_all_page_context_from_doctypes(): - ''' - Get all doctype generated routes (for sitemap.xml) - ''' - routes = frappe.cache().get_value("website_generator_routes") - if not routes: - routes = get_page_info_from_doctypes() - frappe.cache().set_value("website_generator_routes", routes) - - return routes - -def get_page_info_from_doctypes(path=None): - ''' - Find a document with matching `route` from all doctypes with `has_web_view`=1 - ''' - routes = {} - for doctype in get_doctypes_with_web_view(): - filters = {} - controller = get_controller(doctype) - meta = frappe.get_meta(doctype) - - condition_field = (meta.is_published_field or - # custom doctypes dont have controllers and no website attribute - (controller.website.condition_field if not meta.custom else None)) - - if condition_field: - filters[condition_field] = 1 - - if path: - filters['route'] = path - - try: - for r in frappe.get_all(doctype, fields = ['name', 'route', 'modified'], - filters = filters, limit = 1): - - routes[r.route] = {"doctype": doctype, "name": r.name, "modified": r.modified} - - # just want one path, return it! - if path: - return routes[r.route] - except Exception as e: - if not frappe.db.is_missing_column(e): raise e - - return routes +from frappe.website.utils import extract_comment_tag, extract_title +from werkzeug.routing import Map, Rule, NotFound def get_page_info_from_web_page_with_dynamic_routes(path): ''' diff --git a/frappe/website/utils.py b/frappe/website/utils.py index be18466714..4f19267a7d 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -371,25 +371,6 @@ def extract_comment_tag(source, tag): return None -def add_missing_headers(): - '''Walk and add missing headers in docs (to be called from bench execute)''' - path = frappe.get_app_path('erpnext', 'docs') - for basepath, folders, files in os.walk(path): - for fname in files: - if fname.endswith('.md'): - with open(os.path.join(basepath, fname), 'r') as f: - content = frappe.as_unicode(f.read()) - - if not content.startswith('# ') and not '

    ' in content: - with open(os.path.join(basepath, fname), 'w') as f: - if fname=='index.md': - fname = os.path.basename(basepath) - else: - fname = fname[:-3] - h = fname.replace('_', ' ').replace('-', ' ').title() - content = '# {0}\n\n'.format(h) + content - f.write(content.encode('utf-8')) - def get_html_content_based_on_type(doc, fieldname, content_type): ''' Set content based on content_type From 132434cc9476254e2abc5df2b0408f90d2b9bb76 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 01:23:54 +0530 Subject: [PATCH 0114/1519] refactor: Delete unused code --- frappe/website/doctype/web_page/web_page.py | 42 +------ .../website_settings/website_settings.py | 13 +-- frappe/website/utils.py | 104 +----------------- 3 files changed, 15 insertions(+), 144 deletions(-) diff --git a/frappe/website/doctype/web_page/web_page.py b/frappe/website/doctype/web_page/web_page.py index d3c7d19b9a..cc41e4e339 100644 --- a/frappe/website/doctype/web_page/web_page.py +++ b/frappe/website/doctype/web_page/web_page.py @@ -1,23 +1,19 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -from __future__ import print_function, unicode_literals - import re -import requests -import requests.exceptions from jinja2.exceptions import TemplateSyntaxError import frappe -from frappe.utils import get_datetime, now, strip_html, quoted +from frappe import _ +from frappe.utils import get_datetime, now, quoted, strip_html from frappe.utils.jinja import render_template -from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow -from frappe.website.router import resolve_route -from frappe.website.utils import (extract_title, find_first_image, get_comment_list, - get_html_content_based_on_type) -from frappe.website.website_generator import WebsiteGenerator from frappe.utils.safe_exec import safe_exec +from frappe.website.doctype.website_slideshow.website_slideshow import get_slideshow +from frappe.website.utils import (extract_title, find_first_image, + get_comment_list, get_html_content_based_on_type) +from frappe.website.website_generator import WebsiteGenerator class WebPage(WebsiteGenerator): @@ -184,32 +180,6 @@ def check_publish_status(): frappe.db.set_value("Web Page", page.name, "published", 1) - -def check_broken_links(): - cnt = 0 - for p in frappe.db.sql("select name, main_section from `tabWeb Page`", as_dict=True): - for link in re.findall('href=["\']([^"\']*)["\']', p.main_section): - if link.startswith("http"): - try: - res = requests.get(link) - except requests.exceptions.SSLError: - res = frappe._dict({"status_code": "SSL Error"}) - except requests.exceptions.ConnectionError: - res = frappe._dict({"status_code": "Connection Error"}) - - if res.status_code!=200: - print("[{0}] {1}: {2}".format(res.status_code, p.name, link)) - cnt += 1 - else: - link = link[1:] # remove leading / - link = link.split("#")[0] - - if not resolve_route(link): - print(p.name + ":" + link) - cnt += 1 - - print("{0} links broken".format(cnt)) - def get_web_blocks_html(blocks): '''Converts a list of blocks into Raw HTML and extracts out their scripts for deduplication''' diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index f7f22aa2df..ae8e6bd7e1 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -1,15 +1,13 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt +from six.moves.urllib.parse import quote -from __future__ import unicode_literals import frappe from frappe import _ -from frappe.utils import get_request_site_address, encode -from frappe.model.document import Document -from six.moves.urllib.parse import quote -from frappe.website.router import resolve_route -from frappe.website.doctype.website_theme.website_theme import add_website_theme from frappe.integrations.doctype.google_settings.google_settings import get_auth_url +from frappe.model.document import Document +from frappe.utils import encode, get_request_site_address +from frappe.website.doctype.website_theme.website_theme import add_website_theme INDEXING_SCOPES = "https://www.googleapis.com/auth/indexing" @@ -23,7 +21,8 @@ class WebsiteSettings(Document): def validate_home_page(self): if frappe.flags.in_install: return - if self.home_page and not resolve_route(self.home_page): + from frappe.website.path_resolver import PathResolver + if self.home_page and not PathResolver(self.home_page).is_valid_path(): frappe.msgprint(_("Invalid Home Page") + " (Standard pages - index, login, products, blog, about, contact)") self.home_page = '' diff --git a/frappe/website/utils.py b/frappe/website/utils.py index be18466714..9e98b9da9c 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -1,8 +1,5 @@ # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt - -from __future__ import unicode_literals - import functools import json import os @@ -156,91 +153,15 @@ def cleanup_page_name(title): name = title.lower() name = re.sub(r'[~!@#$%^&*+()<>,."\'\?]', '', name) name = re.sub('[:/]', '-', name) - name = '-'.join(name.split()) - # replace repeating hyphens name = re.sub(r"(-)\1+", r"\1", name) - return name[:140] -def get_shade(color, percent): - color, color_format = detect_color_format(color) - r, g, b, a = color - - avg = (float(int(r) + int(g) + int(b)) / 3) - # switch dark and light shades - if avg > 128: - percent = -percent - - # stronger diff for darker shades - if percent < 25 and avg < 64: - percent = percent * 2 - - new_color = [] - for channel_value in (r, g, b): - new_color.append(get_shade_for_channel(channel_value, percent)) - - r, g, b = new_color - - return format_color(r, g, b, a, color_format) - - -def detect_color_format(color): - if color.startswith("rgba"): - color_format = "rgba" - color = [c.strip() for c in color[5:-1].split(",")] - - elif color.startswith("rgb"): - color_format = "rgb" - color = [c.strip() for c in color[4:-1].split(",")] + [1] - - else: - # assume hex - color_format = "hex" - - if color.startswith("#"): - color = color[1:] - - if len(color) == 3: - # hex in short form like #fff - color = "{0}{0}{1}{1}{2}{2}".format(*tuple(color)) - - color = [int(color[0:2], 16), int(color[2:4], 16), int(color[4:6], 16), 1] - - return color, color_format - - -def get_shade_for_channel(channel_value, percent): - v = int(channel_value) + int(int('ff', 16) * (float(percent)/100)) - if v < 0: - v=0 - if v > 255: - v=255 - - return v - - -def format_color(r, g, b, a, color_format): - if color_format == "rgba": - return "rgba({0}, {1}, {2}, {3})".format(r, g, b, a) - - elif color_format == "rgb": - return "rgb({0}, {1}, {2})".format(r, g, b) - - else: - # assume hex - return "#{0}{1}{2}".format(convert_to_hex(r), convert_to_hex(g), convert_to_hex(b)) - - -def convert_to_hex(channel_value): - h = hex(channel_value)[2:] - - if len(h) < 2: - h = "0" + h - - return h +def get_shade(color, percent=None): + frappe.msgprint('get_shade method has been deprecated!') + return color def abs_url(path): """Deconstructs and Reconstructs a URL into an absolute URL or a URL relative from root '/'""" @@ -371,25 +292,6 @@ def extract_comment_tag(source, tag): return None -def add_missing_headers(): - '''Walk and add missing headers in docs (to be called from bench execute)''' - path = frappe.get_app_path('erpnext', 'docs') - for basepath, folders, files in os.walk(path): - for fname in files: - if fname.endswith('.md'): - with open(os.path.join(basepath, fname), 'r') as f: - content = frappe.as_unicode(f.read()) - - if not content.startswith('# ') and not '

    ' in content: - with open(os.path.join(basepath, fname), 'w') as f: - if fname=='index.md': - fname = os.path.basename(basepath) - else: - fname = fname[:-3] - h = fname.replace('_', ' ').replace('-', ' ').title() - content = '# {0}\n\n'.format(h) + content - f.write(content.encode('utf-8')) - def get_html_content_based_on_type(doc, fieldname, content_type): ''' Set content based on content_type From 862b5320b6931a8f31164f6e234f4e71af17aea6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 01:29:02 +0530 Subject: [PATCH 0115/1519] refactor: Move code to appropriate files - Delete unused resolve_route method - move resolve_path & resolve_redirect to path_resolver - Remove redirect.py --- frappe/core/doctype/user/user.py | 4 +- frappe/website/path_resolver.py | 93 ++++++++++++++++++++++- frappe/website/redirect.py | 45 ----------- frappe/website/render.py | 84 +++++---------------- frappe/website/router.py | 125 +------------------------------ frappe/website/utils.py | 12 +-- frappe/www/list.py | 2 +- 7 files changed, 117 insertions(+), 248 deletions(-) delete mode 100644 frappe/website/redirect.py diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index a4d13a57e0..e202711b07 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -17,7 +17,7 @@ from frappe.utils.password import update_password as _update_password, check_pas from frappe.desk.notifications import clear_notifications from frappe.desk.doctype.notification_settings.notification_settings import create_notification_settings, toggle_notifications from frappe.utils.user import get_system_managers -from frappe.website.utils import is_signup_enabled +from frappe.website.utils import is_signup_disabled from frappe.rate_limiter import rate_limit from frappe.utils.background_jobs import enqueue from frappe.core.doctype.user_type.user_type import user_linked_with_permission_on_doctype @@ -843,7 +843,7 @@ def verify_password(password): @frappe.whitelist(allow_guest=True) def sign_up(email, full_name, redirect_to): - if not is_signup_enabled(): + if is_signup_disabled(): frappe.throw(_('Sign Up is disabled'), title='Not Allowed') user = frappe.db.get("User", {"email": email}) diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index b6f7dbe9f9..39edf0d9a8 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -1,15 +1,18 @@ +import re + +from werkzeug.routing import Rule + import frappe from frappe.website.page_controllers.document_page import DocumentPage from frappe.website.page_controllers.list_page import ListPage from frappe.website.page_controllers.not_found_page import NotFoundPage from frappe.website.page_controllers.print_page import PrintPage +from frappe.website.page_controllers.redirect_page import RedirectPage from frappe.website.page_controllers.static_page import StaticPage from frappe.website.page_controllers.template_page import TemplatePage from frappe.website.page_controllers.web_form import WebFormPage -from frappe.website.page_controllers.redirect_page import RedirectPage -from frappe.website.redirect import resolve_redirect -from frappe.website.render import resolve_path -from frappe.website.utils import can_cache +from frappe.website.router import evaluate_dynamic_routes +from frappe.website.utils import can_cache, get_home_page class PathResolver(): @@ -46,3 +49,85 @@ class PathResolver(): _endpoint, renderer_instance = self.resolve() return not isinstance(renderer_instance, NotFoundPage) + +def resolve_redirect(path, query_string=None): + ''' + Resolve redirects from hooks + + Example: + + website_redirect = [ + # absolute location + {"source": "/from", "target": "https://mysite/from"}, + + # relative location + {"source": "/from", "target": "/main"}, + + # use regex + {"source": r"/from/(.*)", "target": r"/main/\1"} + # use r as a string prefix if you use regex groups or want to escape any string literal + ] + ''' + redirects = frappe.get_hooks('website_redirects') + redirects += frappe.db.get_all('Website Route Redirect', ['source', 'target']) + + if not redirects: return + + redirect_to = frappe.cache().hget('website_redirects', path) + + if redirect_to: + frappe.flags.redirect_location = redirect_to + raise frappe.Redirect + + for rule in redirects: + pattern = rule['source'].strip('/ ') + '$' + path_to_match = path + if rule.get('match_with_query_string'): + path_to_match = path + '?' + frappe.safe_decode(query_string) + + if re.match(pattern, path_to_match): + redirect_to = re.sub(pattern, rule['target'], path_to_match) + frappe.flags.redirect_location = redirect_to + frappe.cache().hset('website_redirects', path_to_match, redirect_to) + raise frappe.Redirect + + +def resolve_path(path): + if not path: + path = "index" + + if path.endswith('.html'): + path = path[:-5] + + if path == "index": + path = get_home_page() + + frappe.local.path = path + + if path != "index": + path = resolve_from_map(path) + + return path + +def resolve_from_map(path): + '''transform dynamic route to a static one from hooks and route defined in doctype''' + rules = [Rule(r["from_route"], endpoint=r["to_route"], defaults=r.get("defaults")) + for r in get_website_rules()] + + return evaluate_dynamic_routes(rules, path) or path + +def get_website_rules(): + '''Get website route rules from hooks and DocType route''' + def _get(): + rules = frappe.get_hooks("website_route_rules") + for d in frappe.get_all('DocType', 'name, route', dict(has_web_view=1)): + if d.route: + rules.append(dict(from_route = '/' + d.route.strip('/'), to_route=d.name)) + + return rules + + if frappe.local.dev_server: + # dont cache in development + return _get() + + return frappe.cache().get_value('website_route_rules', _get) diff --git a/frappe/website/redirect.py b/frappe/website/redirect.py deleted file mode 100644 index e66c0a3b7b..0000000000 --- a/frappe/website/redirect.py +++ /dev/null @@ -1,45 +0,0 @@ -from __future__ import unicode_literals - -import re, frappe - -def resolve_redirect(path, query_string=None): - ''' - Resolve redirects from hooks - - Example: - - website_redirect = [ - # absolute location - {"source": "/from", "target": "https://mysite/from"}, - - # relative location - {"source": "/from", "target": "/main"}, - - # use regex - {"source": r"/from/(.*)", "target": r"/main/\1"} - # use r as a string prefix if you use regex groups or want to escape any string literal - ] - ''' - redirects = frappe.get_hooks('website_redirects') - redirects += frappe.db.get_all('Website Route Redirect', ['source', 'target']) - - if not redirects: return - - redirect_to = frappe.cache().hget('website_redirects', path) - - if redirect_to: - frappe.flags.redirect_location = redirect_to - raise frappe.Redirect - - for rule in redirects: - pattern = rule['source'].strip('/ ') + '$' - path_to_match = path - if rule.get('match_with_query_string'): - path_to_match = path + '?' + frappe.safe_decode(query_string) - - if re.match(pattern, path_to_match): - redirect_to = re.sub(pattern, rule['target'], path_to_match) - frappe.flags.redirect_location = redirect_to - frappe.cache().hset('website_redirects', path_to_match, redirect_to) - raise frappe.Redirect - diff --git a/frappe/website/render.py b/frappe/website/render.py index c14d8e0d48..d5587ad98b 100644 --- a/frappe/website/render.py +++ b/frappe/website/render.py @@ -6,13 +6,10 @@ import mimetypes import re from six import iteritems -from werkzeug.routing import Rule from werkzeug.wrappers import Response import frappe import frappe.sessions -from frappe.website.router import evaluate_dynamic_routes -from frappe.website.utils import get_home_page def build_response(path, data, http_status_code, headers=None): @@ -30,6 +27,26 @@ def build_response(path, data, http_status_code, headers=None): return response +def set_content_type(response, data, path): + if isinstance(data, dict): + response.mimetype = 'application/json' + response.charset = 'utf-8' + data = json.dumps(data) + return data + + response.mimetype = 'text/html' + response.charset = 'utf-8' + + # ignore paths ending with .com to avoid unnecessary download + # https://bugs.python.org/issue22347 + if "." in path and not path.endswith('.com'): + content_type, encoding = mimetypes.guess_type(path) + if content_type: + response.mimetype = content_type + if encoding: + response.charset = encoding + + return data def add_preload_headers(response): from bs4 import BeautifulSoup @@ -53,67 +70,6 @@ def add_preload_headers(response): import traceback traceback.print_exc() -def resolve_path(path): - if not path: - path = "index" - - if path.endswith('.html'): - path = path[:-5] - - if path == "index": - path = get_home_page() - - frappe.local.path = path - - if path != "index": - path = resolve_from_map(path) - - return path - -def resolve_from_map(path): - '''transform dynamic route to a static one from hooks and route defined in doctype''' - rules = [Rule(r["from_route"], endpoint=r["to_route"], defaults=r.get("defaults")) - for r in get_website_rules()] - - return evaluate_dynamic_routes(rules, path) or path - -def get_website_rules(): - '''Get website route rules from hooks and DocType route''' - def _get(): - rules = frappe.get_hooks("website_route_rules") - for d in frappe.get_all('DocType', 'name, route', dict(has_web_view=1)): - if d.route: - rules.append(dict(from_route = '/' + d.route.strip('/'), to_route=d.name)) - - return rules - - if frappe.local.dev_server: - # dont cache in development - return _get() - - return frappe.cache().get_value('website_route_rules', _get) - -def set_content_type(response, data, path): - if isinstance(data, dict): - response.mimetype = 'application/json' - response.charset = 'utf-8' - data = json.dumps(data) - return data - - response.mimetype = 'text/html' - response.charset = 'utf-8' - - # ignore paths ending with .com to avoid unnecessary download - # https://bugs.python.org/issue22347 - if "." in path and not path.endswith('.com'): - content_type, encoding = mimetypes.guess_type(path) - if content_type: - response.mimetype = content_type - if encoding: - response.charset = encoding - - return data - def clear_cache(path=None): # TODO: Remove this from frappe.website.utils import clear_cache diff --git a/frappe/website/router.py b/frappe/website/router.py index 2e27b4c690..9922647ebf 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -5,130 +5,9 @@ import io import os import re -from werkzeug.routing import Map, NotFound, Rule - import frappe -from frappe.model.document import get_controller -from frappe.website.utils import can_cache, extract_comment_tag, extract_title - - -def resolve_route(path): - """Returns the page route object based on searching in pages and generators. - The `www` folder is also a part of generator **Web Page**. - - The only exceptions are `/about` and `/contact` these will be searched in Web Pages - first before checking the standard pages.""" - - if path not in ("about", "contact"): - context = get_page_info_from_template(path) - if context: - return context - return get_page_context_from_doctype(path) - else: - context = get_page_context_from_doctype(path) - if context: - return context - return get_page_info_from_template(path) - -def get_page_context(path): - page_context = None - if can_cache(): - page_context_cache = frappe.cache().hget("page_context", path) or {} - page_context = page_context_cache.get(frappe.local.lang, None) - - if not page_context: - page_context = make_page_context(path) - if can_cache(page_context.no_cache): - page_context_cache[frappe.local.lang] = page_context - frappe.cache().hset("page_context", path, page_context_cache) - - return page_context - -def make_page_context(path): - context = resolve_route(path) - if not context: - raise frappe.PageDoesNotExistError - - context.doctype = context.ref_doctype - - if context.page_title: - context.title = context.page_title - - context.pathname = frappe.local.path - - return context - -def get_page_info_from_template(path): - '''Return page_info from path''' - for app in frappe.get_installed_apps(frappe_last=True): - app_path = frappe.get_app_path(app) - - folders = get_start_folders() - - for start in folders: - search_path = os.path.join(app_path, start, path) - options = (search_path, search_path + '.html', search_path + '.md', - search_path + '/index.html', search_path + '/index.md') - for o in options: - option = frappe.as_unicode(o) - if os.path.exists(option) and not os.path.isdir(option): - return get_page_info(option, app, start, app_path=app_path) - - return None - -def get_page_context_from_doctype(path): - page_info = get_page_info_from_doctypes(path) - if not page_info: - page_info = get_page_info_from_web_page_with_dynamic_routes(path) - - if page_info: - return frappe.get_doc(page_info.get("doctype"), - page_info.get("name")).get_page_info() - -def get_all_page_context_from_doctypes(): - ''' - Get all doctype generated routes (for sitemap.xml) - ''' - routes = frappe.cache().get_value("website_generator_routes") - if not routes: - routes = get_page_info_from_doctypes() - frappe.cache().set_value("website_generator_routes", routes) - - return routes - -def get_page_info_from_doctypes(path=None): - ''' - Find a document with matching `route` from all doctypes with `has_web_view`=1 - ''' - routes = {} - for doctype in get_doctypes_with_web_view(): - filters = {} - controller = get_controller(doctype) - meta = frappe.get_meta(doctype) - - condition_field = (meta.is_published_field or - # custom doctypes dont have controllers and no website attribute - (controller.website.condition_field if not meta.custom else None)) - - if condition_field: - filters[condition_field] = 1 - - if path: - filters['route'] = path - - try: - for r in frappe.get_all(doctype, fields = ['name', 'route', 'modified'], - filters = filters, limit = 1): - - routes[r.route] = {"doctype": doctype, "name": r.name, "modified": r.modified} - - # just want one path, return it! - if path: - return routes[r.route] - except Exception as e: - if not frappe.db.is_missing_column(e): raise e - - return routes +from frappe.website.utils import extract_comment_tag, extract_title +from werkzeug.routing import Map, Rule, NotFound def get_page_info_from_web_page_with_dynamic_routes(path): ''' diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 9e98b9da9c..bfe7d5867d 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -136,14 +136,8 @@ def get_home_page_via_hooks(): return home_page -def is_signup_enabled(): - if getattr(frappe.local, "is_signup_enabled", None) is None: - frappe.local.is_signup_enabled = True - if frappe.utils.cint(frappe.db.get_value("Website Settings", - "Website Settings", "disable_signup")): - frappe.local.is_signup_enabled = False - - return frappe.local.is_signup_enabled +def is_signup_disabled(): + return frappe.db.get_single_value('Website Settings', 'disable_signup', True) def cleanup_page_name(title): """make page name from title""" @@ -353,7 +347,7 @@ def get_sidebar_items(parent_sidebar, basepath): sidebar_items = [] hooks = frappe.get_hooks('look_for_sidebar_json') - look_for_sidebar_json = hooks[0] if hooks else 0 + look_for_sidebar_json = hooks[0] if hooks else frappe.flags.look_for_sidebar if basepath and look_for_sidebar_json: sidebar_items = get_sidebar_items_from_sidebar_file(basepath, look_for_sidebar_json) diff --git a/frappe/www/list.py b/frappe/www/list.py index fc4dc602c3..28bf73e575 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe, json from frappe.utils import cint, quoted -from frappe.website.render import resolve_path +from frappe.website.path_resolver import resolve_path from frappe.model.document import get_controller, Document from frappe import _ From 1b8fcfb62821105402a4368a82b1a61e55f14f20 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 12:48:19 +0530 Subject: [PATCH 0116/1519] fix: Added Drag and delete button on Spacer and header --- frappe/public/js/frappe/wiki_blocks/card.js | 6 +- frappe/public/js/frappe/wiki_blocks/chart.js | 6 +- frappe/public/js/frappe/wiki_blocks/header.js | 59 +++++++++++++++---- .../public/js/frappe/wiki_blocks/paragraph.js | 8 +-- .../public/js/frappe/wiki_blocks/shortcut.js | 6 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 48 +++++++++++++-- frappe/public/scss/desk/wiki.scss | 31 +++++++--- 7 files changed, 127 insertions(+), 37 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 5426fd24ce..64b685ca0a 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -56,7 +56,7 @@ export default class Card { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -95,7 +95,7 @@ export default class Card { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -111,7 +111,7 @@ export default class Card { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 6c51ad873e..27aca1b29b 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -56,7 +56,7 @@ export default class Chart { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -95,7 +95,7 @@ export default class Chart { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -111,7 +111,7 @@ export default class Chart { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index f3da84a22f..e7b1b31229 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -43,13 +43,53 @@ export default class Header { } render() { + this.wrapper = document.createElement('div'); + this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - this._element.classList.add('widget', 'header'); - this._element.style.minHeight = 50 + 'px'; + let $widget_head = $(`
    `) + let $widget_control = $(`
    `) + + $widget_head[0].appendChild(this._element); + $widget_control.appendTo($widget_head); + $widget_head.appendTo(this.wrapper); + + this.wrapper.classList.add('widget', 'header'); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-header", + `${__('Delete')}`, + null, + $widget_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $widget_control + ); + + return this.wrapper; } return this._element; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + renderSettings() { const holder = document.createElement('DIV'); @@ -108,7 +148,7 @@ export default class Header { save(toolsContent) { return { - text: toolsContent.innerHTML, + text: toolsContent.innerText, level: this.currentLevel.number, col: this._getCol(), pt: this._getPadding("t"), @@ -119,7 +159,7 @@ export default class Header { } rendered() { - var e = this._element.parentNode.parentNode; + var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -130,7 +170,7 @@ export default class Header { _getCol() { var e = 12; var t = "col-12"; - var n = this._element.parentNode.parentNode; + var n = this._element.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -146,7 +186,7 @@ export default class Header { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this._element.parentNode.parentNode; + var r = this._element.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); @@ -224,9 +264,8 @@ export default class Header { this._element.innerHTML = this._data.text || ''; } - if (!this.readOnly) { - this._element.classList.add('widget', 'header'); - this._element.style.minHeight = 50 + 'px'; + if (!this.readOnly && this.wrapper) { + this.wrapper.classList.add('widget', 'header'); } } @@ -237,8 +276,6 @@ export default class Header { tag.classList.add(this._CSS.wrapper); - tag.contentEditable = this.readOnly ? 'false' : 'true'; - tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); return tag; diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index e80d300ec3..bf246c7587 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -78,7 +78,7 @@ export default class Paragraph { save(toolsContent) { return { - text: toolsContent.innerHTML, + text: toolsContent.innerText, col: this._getCol(), pt: this._getPadding("t"), pr: this._getPadding("r"), @@ -88,7 +88,7 @@ export default class Paragraph { } rendered() { - var e = this._element.parentNode.parentNode; + var e = this._element.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -99,7 +99,7 @@ export default class Paragraph { _getCol() { var e = 12; var t = "col-12"; - var n = this._element.parentNode.parentNode; + var n = this._element.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -115,7 +115,7 @@ export default class Paragraph { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this._element.parentNode.parentNode; + var r = this._element.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index ba98cbc382..b4f59ec3e5 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -55,7 +55,7 @@ export default class Shortcut { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -94,7 +94,7 @@ export default class Shortcut { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -110,7 +110,7 @@ export default class Shortcut { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 6ec33adcc2..aa51d234c8 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -25,13 +25,53 @@ export default class Spacer { render() { this.wrapper = document.createElement('div'); if (!this.readOnly) { - this.wrapper.innerText = 'Spacer'; + let $spacer = $(` +
    +
    +
    Spacer
    +
    +
    + `) + $spacer.appendTo(this.wrapper); + this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; + + let $widget_control = $spacer.find('.widget-control') + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-spacer", + `${__('Delete')}`, + null, + $widget_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $widget_control + ); } return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + save() { return { col: this._getCol(), @@ -43,7 +83,7 @@ export default class Spacer { } rendered() { - var e = this.wrapper.parentNode.parentNode; + var e = this.wrapper.closest('.ce-block'); e.classList.add("col-" + this.col); e.classList.add("pt-" + this.pt); e.classList.add("pr-" + this.pr); @@ -54,7 +94,7 @@ export default class Spacer { _getCol() { var e = 12; var t = "col-12"; - var n = this.wrapper.parentNode.parentNode; + var n = this.wrapper.closest('.ce-block'); var r = new RegExp(/\bcol-.+?\b/, "g"); if (n.className.match(r)) { n.classList.forEach(function (e) { @@ -70,7 +110,7 @@ export default class Spacer { var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; var t = 0; var n = "p" + e + "-0"; - var r = this.wrapper.parentNode.parentNode; + var r = this.wrapper.closest('.ce-block'); var a = new RegExp(/\pl-.+?\b/, "g"); var i = new RegExp(/\pr-.+?\b/, "g"); var o = new RegExp(/\pt-.+?\b/, "g"); diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 2ffdeaa15d..049fa456cf 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -55,17 +55,30 @@ .ce-header { padding: 0 !important; margin-bottom: 0 !important; + flex: 1; } -.widget.header { - display: flex; - justify-content: center; - padding-left: 12px !important; - min-height: 65px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - cursor: pointer; +.widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + cursor: pointer; + + &:focus { + outline: none; + } + } + + &.new-widget { + align-items: inherit; + } } .codex-editor { From 948d7d2b564f4b2d198d38e23a774ccca7604ba1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 13:20:05 +0530 Subject: [PATCH 0117/1519] test: Add sidebar test --- frappe/website/doctype/web_page/test_web_page.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 108b36caaa..ada42f7a75 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -82,6 +82,15 @@ class TestWebPage(unittest.TestCase): # assert template block rendered self.assertTrue('

    Test content

    ' in frappe.as_unicode(content)) + def test_json_sidebar_data(self): + frappe.flags.look_for_sidebar = False + content = get_response_content('/_test/_test_folder/_test_page') + self.assertTrue('Test Sidebar' not in frappe.as_unicode(content)) + frappe.flags.look_for_sidebar = True + content = get_response_content('/_test/_test_folder/_test_page') + self.assertTrue('Test Sidebar' in frappe.as_unicode(content)) + frappe.flags.look_for_sidebar = False + def test_home_page(self): content = get_response_content(path='/') print(content) From 5bd80106813398f4ad4ca7d0315519d3fdbdb941 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 13:24:44 +0530 Subject: [PATCH 0118/1519] style: Translate string --- frappe/website/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index bfe7d5867d..814bd0101e 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -11,6 +11,7 @@ from past.builtins import cmp from six import iteritems import frappe +from frappe import _ from frappe.model.document import Document from frappe.utils import md_to_html @@ -154,7 +155,7 @@ def cleanup_page_name(title): def get_shade(color, percent=None): - frappe.msgprint('get_shade method has been deprecated!') + frappe.msgprint(_('get_shade method has been deprecated.')) return color def abs_url(path): From 0a89c9e32e625e53cbe5ea151aff42031fb833a5 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 13:25:04 +0530 Subject: [PATCH 0119/1519] fix: Add canonical link --- frappe/website/page_controllers/base_template_page.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index c40afb7b1c..af7fc43293 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -32,6 +32,7 @@ class BaseTemplatePage(WebPage): # to be able to inspect the context dict # Use the macro "inspect" from macros.html self.context._context_dict = self.context + self.context.canonical = frappe.utils.get_url(frappe.utils.escape_html(self.path)) # context sends us a new template path if self.context.template: From d7696f5f95de82fac1a429e71d3c705d37725b32 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 20 May 2021 13:44:35 +0530 Subject: [PATCH 0120/1519] test: Add test files --- frappe/website/doctype/web_page/test_web_page.py | 7 ------- frappe/www/_test/_sidebar.json | 6 ++++++ frappe/www/_test/_test_folder/__init__.py | 0 frappe/www/_test/_test_folder/_test_page.html | 1 + frappe/www/_test/_test_folder/_test_toc.md | 9 +++++++++ frappe/www/_test/_test_folder/new.csv/index.html | 12 ++++++++++++ 6 files changed, 28 insertions(+), 7 deletions(-) create mode 100644 frappe/www/_test/_sidebar.json create mode 100644 frappe/www/_test/_test_folder/__init__.py create mode 100644 frappe/www/_test/_test_folder/_test_toc.md create mode 100644 frappe/www/_test/_test_folder/new.csv/index.html diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index ada42f7a75..c5d250a4a0 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -93,16 +93,10 @@ class TestWebPage(unittest.TestCase): def test_home_page(self): content = get_response_content(path='/') - print(content) content = get_response_content(path='/index') - print(content) def test_table_of_content(self): page = get_response(path='/_test/_test_folder/_test_toc') - print(page) - - def test_sidebar_data(self): - pass def test_meta_tags(self): pass @@ -118,5 +112,4 @@ class TestWebPage(unittest.TestCase): # breadcrumb # validate -# cache no-cache # page context caching diff --git a/frappe/www/_test/_sidebar.json b/frappe/www/_test/_sidebar.json new file mode 100644 index 0000000000..a2567e94da --- /dev/null +++ b/frappe/www/_test/_sidebar.json @@ -0,0 +1,6 @@ +[ + { + "route": "/_test/_test_folder", + "title": "Test Sidebar" + } +] diff --git a/frappe/www/_test/_test_folder/__init__.py b/frappe/www/_test/_test_folder/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/www/_test/_test_folder/_test_page.html b/frappe/www/_test/_test_folder/_test_page.html index 7364235e10..900f07459d 100644 --- a/frappe/www/_test/_test_folder/_test_page.html +++ b/frappe/www/_test/_test_folder/_test_page.html @@ -1,3 +1,4 @@ {% block content %} +{% include "templates/includes/web_sidebar.html" %}

    Test content

    {% endblock %} diff --git a/frappe/www/_test/_test_folder/_test_toc.md b/frappe/www/_test/_test_folder/_test_toc.md new file mode 100644 index 0000000000..8d05b120a5 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_toc.md @@ -0,0 +1,9 @@ +# Level 1 + +## Level 1.1 + +## Level 1.2 + +## Level 1.3 + +### Level 1.3.1 diff --git a/frappe/www/_test/_test_folder/new.csv/index.html b/frappe/www/_test/_test_folder/new.csv/index.html new file mode 100644 index 0000000000..7a1bb69558 --- /dev/null +++ b/frappe/www/_test/_test_folder/new.csv/index.html @@ -0,0 +1,12 @@ + + + + + + + Document + + + Test Page + + From 519394a84cedde95d2bcbf14eaaa37190b8cdbe0 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 16:56:17 +0530 Subject: [PATCH 0121/1519] fix: Added Drag and delete button for Paragraph --- .../public/js/frappe/wiki_blocks/paragraph.js | 43 +++++++++++++++++++ frappe/public/scss/desk/wiki.scss | 25 ++++++++--- 2 files changed, 63 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index bf246c7587..9bcc7023c7 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -57,9 +57,52 @@ export default class Paragraph { } render() { + this.wrapper = document.createElement('div'); + this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; + if (!this.readOnly) { + let $para_control = $(`
    `) + + this.wrapper.appendChild(this._element); + this._element.classList.remove('widget'); + $para_control.appendTo(this.wrapper); + + this.wrapper.classList.add('widget'); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-paragraph", + `${__('Delete')}`, + null, + $para_control + ); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $para_control + ); + + return this.wrapper; + } return this._element; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(); + }); + button.appendTo(wrapper); + } + merge(data) { let newData = { text: this.data.text + data.text diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 049fa456cf..7b20b29598 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -69,16 +69,31 @@ box-shadow: none; background-color: var(--control-bg); color: var(--text-muted); - cursor: pointer; - - &:focus { - outline: none; - } } + &:focus { + outline: none; + } + &.new-widget { align-items: inherit; } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } .codex-editor { From 6339b0f2728407c63c8734cfb6e90bc26db1e4b3 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 17:00:56 +0530 Subject: [PATCH 0122/1519] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/header.js | 8 ++++---- frappe/public/js/frappe/wiki_blocks/paragraph.js | 2 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 165371e10c..d994cb97af 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -319,10 +319,10 @@ frappe.views.Wiki = class Wiki { delete_page(name) { if (!this.deleted_sidebar_items.includes(name)) { - this.deleted_sidebar_items.push(name) + this.deleted_sidebar_items.push(name); } frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { - this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden') + this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden'); }); } diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index e7b1b31229..574a455e44 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -46,13 +46,13 @@ export default class Header { this.wrapper = document.createElement('div'); this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - let $widget_head = $(`
    `) - let $widget_control = $(`
    `) + let $widget_head = $(`
    `); + let $widget_control = $(`
    `); $widget_head[0].appendChild(this._element); $widget_control.appendTo($widget_head); $widget_head.appendTo(this.wrapper); - + this.wrapper.classList.add('widget', 'header'); this.add_custom_button( @@ -300,7 +300,7 @@ export default class Header { if (userSpecified) { return userSpecified; } else { - console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); + // console.warn('(ง\'̀-\'́)ง Heading Tool: the default level specified was not found in available levels'); } } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 9bcc7023c7..558cf5a182 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -60,7 +60,7 @@ export default class Paragraph { this.wrapper = document.createElement('div'); this.wrapper.contentEditable = this.readOnly ? 'false' : 'true'; if (!this.readOnly) { - let $para_control = $(`
    `) + let $para_control = $(`
    `); this.wrapper.appendChild(this._element); this._element.classList.remove('widget'); diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index aa51d234c8..a5a686df2f 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -31,13 +31,13 @@ export default class Spacer {
    Spacer

    - `) + `); $spacer.appendTo(this.wrapper); this.wrapper.classList.add('widget', 'new-widget'); this.wrapper.style.minHeight = 50 + 'px'; - let $widget_control = $spacer.find('.widget-control') + let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( frappe.utils.icon('delete', 'xs'), @@ -47,7 +47,7 @@ export default class Spacer { null, $widget_control ); - + this.add_custom_button( frappe.utils.icon('drag', 'xs'), null, From a1ad85a9cf284086d265dc4e20b8fa22110bcb27 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 20 May 2021 21:41:29 +0530 Subject: [PATCH 0123/1519] fix: show & hide sidebar controls --- frappe/public/js/frappe/views/wiki.js | 7 +++---- frappe/public/scss/desk/wiki.scss | 29 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index d994cb97af..cbc6eacf33 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -282,15 +282,14 @@ frappe.views.Wiki = class Wiki { } show_sidebar_actions() { - $('.sidebar-item-control .drag-handle').removeClass('hidden'); - $('.sidebar-item-control .delete-page').removeClass('hidden'); + this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } add_sidebar_actions(item, sidebar_control) { this.add_custom_button( frappe.utils.icon('drag', 'xs'), null, - "drag-handle hidden", + "drag-handle", `${__('Drag')}`, null, sidebar_control @@ -298,7 +297,7 @@ frappe.views.Wiki = class Wiki { this.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete_page(item.name), - "delete-page hidden", + "delete-page", `${__('Delete')}`, null, sidebar_control diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 7b20b29598..1a5f9376f9 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -25,6 +25,11 @@ .drag-handle { cursor: all-scroll; cursor: -webkit-grabbing; + display: none; + } + + .delete-page { + display: none; } svg { @@ -50,6 +55,30 @@ overflow: hidden; flex: 1; } + + .standard-sidebar-section.show-control { + .desk-sidebar-item.standard-sidebar-item { + &:hover { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + } + } + + &.selected { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + } + } + } + } } .ce-header { From 8294ee685d1b49165d041863d8ccd4a853d0fbc5 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 24 May 2021 12:42:18 +0530 Subject: [PATCH 0124/1519] fix: Tune button implemented on each block --- frappe/public/js/frappe/wiki_blocks/card.js | 36 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/chart.js | 36 +++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/header.js | 30 +++++++++++++--- .../public/js/frappe/wiki_blocks/paragraph.js | 30 +++++++++++++--- .../public/js/frappe/wiki_blocks/shortcut.js | 35 ++++++++++++++++++ frappe/public/js/frappe/wiki_blocks/spacer.js | 30 +++++++++++++--- frappe/public/scss/desk/wiki.scss | 12 +++++++ 7 files changed, 194 insertions(+), 15 deletions(-) diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 64b685ca0a..81fdf0e08c 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -40,9 +40,45 @@ export default class Card { if (this.data && this.data.card_name) { this._make_cards(this.data.card_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 27aca1b29b..d6629c81bd 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -40,9 +40,45 @@ export default class Chart { if (this.data && this.data.chart_name) { this._make_charts(this.data.chart_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index 574a455e44..ef6283a808 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -56,10 +56,21 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-header", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $widget_control ); @@ -73,6 +84,15 @@ export default class Header { $widget_control ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-header", + `${__('Delete')}`, + null, + $widget_control + ); + return this.wrapper; } return this._element; @@ -85,7 +105,7 @@ export default class Header { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 558cf5a182..dac3dc9d1b 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -69,10 +69,21 @@ export default class Paragraph { this.wrapper.classList.add('widget'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-paragraph", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $para_control ); @@ -86,6 +97,15 @@ export default class Paragraph { $para_control ); + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-paragraph", + `${__('Delete')}`, + null, + $para_control + ); + return this.wrapper; } return this._element; @@ -98,7 +118,7 @@ export default class Paragraph { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index b4f59ec3e5..453113d5c6 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -39,9 +39,44 @@ export default class Shortcut { if (this.data && this.data.shortcut_name) { this._make_shortcuts(this.data.shortcut_name); } + + if (!this.readOnly) { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } return this.wrapper; } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + wrapper.prepend(button); + } + save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index a5a686df2f..8282db9455 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -40,10 +40,21 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.api.blocks.delete(), - "delete-spacer", - `${__('Delete')}`, + frappe.utils.icon('dot-vertical', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50) + }, + "tune-btn", + `${__('Tune')}`, null, $widget_control ); @@ -56,6 +67,15 @@ export default class Spacer { null, $widget_control ); + + this.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.api.blocks.delete(), + "delete-spacer", + `${__('Delete')}`, + null, + $widget_control + ); } return this.wrapper; } @@ -67,7 +87,7 @@ export default class Spacer { ); button.click(event => { event.stopPropagation(); - action && action(); + action && action(event); }); button.appendTo(wrapper); } diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 1a5f9376f9..1db2c451a6 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -81,6 +81,18 @@ } } +.ce-settings { + width: fit-content; +} + +.tune-btn > * { + pointer-events: none; +} + +.ce-toolbar__settings-btn { + display: none; +} + .ce-header { padding: 0 !important; margin-bottom: 0 !important; From 1a0a095b34f33ddaba7615b9bddb1d4d8a1df30a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 24 May 2021 14:55:42 +0530 Subject: [PATCH 0125/1519] fix: Template path for document_page --- frappe/website/page_controllers/document_page.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_controllers/document_page.py index 537b8ac658..c79e385a68 100644 --- a/frappe/website/page_controllers/document_page.py +++ b/frappe/website/page_controllers/document_page.py @@ -53,8 +53,8 @@ class DocumentPage(BaseTemplatePage): self.init_context() self.update_context() self.post_process_context() - - html = frappe.get_template(self.context.template_path).render(self.context) + template_path = self.context.template_path or self.context.template or '' + html = frappe.get_template(template_path).render(self.context) html = self.add_csrf_token(html) return build_response(self.path, html, self.http_status_code or 200, self.headers) From 363b646d02c4dae3fcc1ab5a1068797ed7277151 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 24 May 2021 16:44:04 +0530 Subject: [PATCH 0126/1519] fix: Miscellaneous changes --- frappe/public/js/frappe/views/wiki.js | 67 ++--- frappe/public/js/frappe/wiki_blocks/card.js | 4 +- frappe/public/js/frappe/wiki_blocks/chart.js | 4 +- frappe/public/js/frappe/wiki_blocks/header.js | 4 +- .../public/js/frappe/wiki_blocks/paragraph.js | 4 +- .../public/js/frappe/wiki_blocks/shortcut.js | 4 +- frappe/public/js/frappe/wiki_blocks/spacer.js | 4 +- frappe/public/scss/desk/wiki.scss | 229 +++++++++--------- 8 files changed, 160 insertions(+), 160 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index cbc6eacf33..22036a8d2d 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -15,6 +15,37 @@ frappe.views.Wiki = class Wiki { this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); + + this.tools = { + header: { + class: frappe.wiki_block.blocks['header'], + inlineToolbar: true + }, + paragraph: { + class: frappe.wiki_block.blocks['paragraph'], + inlineToolbar: true + }, + chart: { + class: frappe.wiki_block.blocks['chart'], + config: { + page_data: this.page_data || [] + } + }, + card: { + class: frappe.wiki_block.blocks['card'], + config: { + page_data: this.page_data || [] + } + }, + shortcut: { + class: frappe.wiki_block.blocks['shortcut'], + config: { + page_data: this.page_data || [] + } + }, + spacer: frappe.wiki_block.blocks['spacer'], + spacingTune: frappe.wiki_block.tunes['spacing_tune'], + }; } prepare_container() { @@ -99,6 +130,11 @@ frappe.views.Wiki = class Wiki { }; const make_sidebar_child_item = item => { + + if (frappe.router.slug(item.name) == this.get_page_to_show() || item.name == this.new_page) { + child_item_section.classList.toggle("hidden"); + } + let $child_item = get_child_item(item); let sidebar_control = $child_item.find('.sidebar-item-control'); this.add_sidebar_actions(item, sidebar_control); @@ -146,36 +182,6 @@ frappe.views.Wiki = class Wiki { this.get_content(page).then(() => { this.get_data(page).then(() => { if (this.content) { - this.tools = { - header: { - class: frappe.wiki_block.blocks['header'], - inlineToolbar: true - }, - paragraph: { - class: frappe.wiki_block.blocks['paragraph'], - inlineToolbar: true - }, - chart: { - class: frappe.wiki_block.blocks['chart'], - config: { - page_data: this.page_data || [] - } - }, - card: { - class: frappe.wiki_block.blocks['card'], - config: { - page_data: this.page_data || [] - } - }, - shortcut: { - class: frappe.wiki_block.blocks['shortcut'], - config: { - page_data: this.page_data || [] - } - }, - spacer: frappe.wiki_block.blocks['spacer'], - spacingTune: frappe.wiki_block.tunes['spacing_tune'], - }; if (this.editor) { this.editor.isReady.then(() => { this.editor.configuration.tools.chart.config.page_data = this.page_data; @@ -258,6 +264,7 @@ frappe.views.Wiki = class Wiki { } setup_actions() { + if (!this.isReadOnly) return; this.page.clear_inner_toolbar(); this.page.set_secondary_action( __("Customize"), diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 81fdf0e08c..820056a6ab 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -44,7 +44,7 @@ export default class Card { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -55,7 +55,7 @@ export default class Card { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index d6629c81bd..c7f92222c0 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -44,7 +44,7 @@ export default class Chart { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -55,7 +55,7 @@ export default class Chart { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index ef6283a808..727f495a42 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -56,7 +56,7 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -67,7 +67,7 @@ export default class Header { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index dac3dc9d1b..cc05f3edbc 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -69,7 +69,7 @@ export default class Paragraph { this.wrapper.classList.add('widget'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -80,7 +80,7 @@ export default class Paragraph { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 453113d5c6..c6d01a8800 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -43,7 +43,7 @@ export default class Shortcut { if (!this.readOnly) { let $widget_control = $(this.wrapper).find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -54,7 +54,7 @@ export default class Shortcut { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 8282db9455..5f26f06ca4 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -40,7 +40,7 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); this.add_custom_button( - frappe.utils.icon('dot-vertical', 'xs'), + frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; !$('.ce-settings.ce-settings--opened').length && @@ -51,7 +51,7 @@ export default class Spacer { top: position.top + 25, left: position.left - 77 }); - }, 50) + }, 50); }, "tune-btn", `${__('Tune')}`, diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index 1db2c451a6..cb911611d8 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -36,6 +36,16 @@ margin-right: 0; } } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + flex: 1; + } } .sidebar-child-item-container { @@ -46,16 +56,6 @@ } } - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - flex: 1; - } - .standard-sidebar-section.show-control { .desk-sidebar-item.standard-sidebar-item { &:hover { @@ -81,65 +81,86 @@ } } -.ce-settings { - width: fit-content; -} - -.tune-btn > * { - pointer-events: none; -} - -.ce-toolbar__settings-btn { - display: none; -} - -.ce-header { - padding: 0 !important; - margin-bottom: 0 !important; - flex: 1; -} - -.widget{ - &.header { - display: flex; - justify-content: center; - flex: 1; - padding-left: 15px !important; - padding-right: 15px !important; - min-height: 50px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - } - - &:focus { - outline: none; - } - - &.new-widget { - align-items: inherit; - } - - .paragraph-control { - display: flex; - flex-direction: row-reverse; - position: absolute; - right: 20px; - gap: 5px; - background-color: var(--card-bg); - padding-left: 5px; - - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; - } - } - -} - .codex-editor { min-height: 630px; + .codex-editor__redactor{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + margin: 0px -7px; + padding-bottom: 20px !important; + + .ce-block{ + width: 100%; + padding-left: 0; + padding-right: 0; + + &.ce-block--selected { + .ce-block__content { + background-color: inherit; + } + } + + .ce-block__content { + max-width: 100%; + height: 100%; + padding: 7px; + + &> div { + height: 100%; + } + + .tune-btn > * { + pointer-events: none; + } + + .ce-header { + padding: 0 !important; + margin-bottom: 0 !important; + flex: 1; + } + + .widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + } + + &:focus { + outline: none; + } + + &.new-widget { + align-items: inherit; + } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } + } + } + } + svg { fill: none; } @@ -153,6 +174,29 @@ stroke: none; width: fit-content; } + + .ce-settings { + width: fit-content; + + .cdx-settings-button.disabled{ + pointer-events: none; + opacity: .5 + } + .cdx-settings-sidebar{ + position: absolute; + right: 100%; + top:0; + background: #fff; + width: 108px; + height: 145px; + box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); + border-radius: 0 4px 4px 0;z-index: 0; + } + } + + .ce-toolbar__settings-btn { + display: none; + } } .ce-inline-tool, .ce-inline-toolbar__dropdown { @@ -160,6 +204,7 @@ fill: currentColor; } } + @media (min-width: 1199px) { .ce-toolbar__content { max-width: 930px; @@ -190,57 +235,5 @@ max-width: 100%; } } - - div[card_name] { - height: inherit; - } - -} -.codex-editor__redactor{ - display: flex; - flex-wrap: wrap; - flex-direction: row; - margin: 0px -7px; -} -.ce-block{ - width: 100%; - padding-left: 0; - padding-right: 0; -} -.cdx-settings-input{ - border: 1px solid rgba(201,201,204,.48); - -webkit-box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); - box-shadow: inset 0 1px 2px 0 rgba(35,44,72,.06); - border-radius: 3px;padding: 3px 8px;outline: none; - width: 100%; - -webkit-box-sizing: border-box; - box-sizing: border-box; -} -.cdx-small{ - font-size: .6rem -} -.ce-block__content { - max-width: 100%; - height: 100%; - padding: 7px; - - &> div { - height: 100%; - } -} - -.cdx-settings-button.disabled{ - pointer-events: none; - opacity: .5 -} -.cdx-settings-sidebar{ - position: absolute; - right: 100%; - top:0; - background: #fff; - width: 108px; - height: 145px; - box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); - border-radius: 0 4px 4px 0;z-index: 0; } \ No newline at end of file From 15f5b697d312c4ee6174fd4e40828c41d3eb581c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 24 May 2021 19:52:31 +0530 Subject: [PATCH 0127/1519] fix: Website template path --- frappe/website/page_controllers/base_template_page.py | 7 +++++-- frappe/website/page_controllers/document_page.py | 11 ++++++----- frappe/website/website_generator.py | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index af7fc43293..4d282dab9d 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -5,6 +5,10 @@ from frappe.website.website_components.metatags import MetaTags class BaseTemplatePage(WebPage): + def __init__(self, path, http_status_code): + super().__init__(path=path, http_status_code=http_status_code) + self.template_path = '' + def init_context(self): self.context = frappe._dict() self.context.update(get_website_settings()) @@ -35,8 +39,7 @@ class BaseTemplatePage(WebPage): self.context.canonical = frappe.utils.get_url(frappe.utils.escape_html(self.path)) # context sends us a new template path - if self.context.template: - self.template_path = self.context.template + self.template_path = self.context.template or '' def set_base_template_if_missing(self): if not self.context.base_template_path: diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_controllers/document_page.py index c79e385a68..6ab384e77d 100644 --- a/frappe/website/page_controllers/document_page.py +++ b/frappe/website/page_controllers/document_page.py @@ -53,8 +53,7 @@ class DocumentPage(BaseTemplatePage): self.init_context() self.update_context() self.post_process_context() - template_path = self.context.template_path or self.context.template or '' - html = frappe.get_template(template_path).render(self.context) + html = frappe.get_template(self.template_path).render(self.context) html = self.add_csrf_token(html) return build_response(self.path, html, self.http_status_code or 200, self.headers) @@ -62,10 +61,12 @@ class DocumentPage(BaseTemplatePage): def update_context(self): self.context.doc = self.doc self.context.update(self.context.doc.as_dict()) - self.context.update(self.context.doc.get_website_properties()) + self.context.update(self.context.doc.get_page_info()) - if not self.context.template_path: - self.context.template_path = self.context.doc.meta.get_web_template() + self.template_path = self.context.template or self.template_path + + if not self.template_path: + self.template_path = self.context.doc.meta.get_web_template() if hasattr(self.doc, "get_context"): ret = self.doc.get_context(self.context) diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index fc08abeed9..f2638fd86d 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -129,6 +129,8 @@ class WebsiteGenerator(Document): if not route.page_title: route.page_title = self.get(self.get_title_field()) + route.title = route.page_title + return route def send_indexing_request(self, operation_type='URL_UPDATED'): From 63ce0c51361422c3386f6a62a3e3334560f5a71d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 24 May 2021 21:53:09 +0530 Subject: [PATCH 0128/1519] fix: Fallback to template_path if template is not set --- frappe/website/page_controllers/base_template_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index 4d282dab9d..012f9fccc9 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -39,7 +39,7 @@ class BaseTemplatePage(WebPage): self.context.canonical = frappe.utils.get_url(frappe.utils.escape_html(self.path)) # context sends us a new template path - self.template_path = self.context.template or '' + self.template_path = self.context.template or self.template_path def set_base_template_if_missing(self): if not self.context.base_template_path: From cbd00179cb16e0f08b8283d6f1d0f0e815cefef1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 24 May 2021 22:31:23 +0530 Subject: [PATCH 0129/1519] fix: Move set_missing_values to base_template_page - Since it is common for all inherited pages from base_template_page --- .../page_controllers/base_template_page.py | 30 ++++++++++++------- .../website/page_controllers/template_page.py | 11 +------ 2 files changed, 21 insertions(+), 20 deletions(-) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index 012f9fccc9..f06869fd5f 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -28,18 +28,10 @@ class BaseTemplatePage(WebPage): self.set_base_template_if_missing() self.set_title_with_prefix() self.update_website_context() - - # set using frappe.respond_as_web_page - if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): - self.context.update(frappe.local.response.context) - - # to be able to inspect the context dict - # Use the macro "inspect" from macros.html - self.context._context_dict = self.context - self.context.canonical = frappe.utils.get_url(frappe.utils.escape_html(self.path)) - # context sends us a new template path self.template_path = self.context.template or self.template_path + self.context._context_dict = self.context + self.set_missing_values() def set_base_template_if_missing(self): if not self.context.base_template_path: @@ -51,6 +43,24 @@ class BaseTemplatePage(WebPage): and not self.context.title.startswith(self.context.title_prefix)): self.context.title = '{0} - {1}'.format(self.context.title_prefix, self.context.title) + def set_missing_values(self): + # set using frappe.respond_as_web_page + if hasattr(frappe.local, 'response') and frappe.local.response.get('context'): + self.context.update(frappe.local.response.context) + + # to be able to inspect the context dict + # Use the macro "inspect" from macros.html + self.context.canonical = frappe.utils.get_url(frappe.utils.escape_html(self.path)) + + if "url_prefix" not in self.context: + self.context.url_prefix = "" + + if self.context.url_prefix and self.context.url_prefix[-1]!='/': + self.context.url_prefix += '/' + + self.context.path = self.path + self.context.pathname = frappe.local.path if hasattr(frappe, 'local') else self.path + def update_website_context(self): # apply context from hooks update_website_context = frappe.get_hooks('update_website_context') diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index 635b8a56fe..cd30fa02c8 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -65,7 +65,6 @@ class TemplatePage(BaseTemplatePage): def post_process_context(self): self.set_user_info() self.add_sidebar_and_breadcrumbs() - self.set_missing_values() super(TemplatePage, self).post_process_context() def add_sidebar_and_breadcrumbs(self): @@ -228,15 +227,7 @@ class TemplatePage(BaseTemplatePage): self.template_path = 'www/{path}.html'.format(path=path) def set_missing_values(self): - if "url_prefix" not in self.context: - self.context.url_prefix = "" - - if self.context.url_prefix and self.context.url_prefix[-1]!='/': - self.context.url_prefix += '/' - - self.context.path = self.path - self.context.pathname = frappe.local.path if hasattr(frappe, 'local') else self.path - + super().set_missing_values() # for backward compatibility self.context.docs_base_url = '/docs' From 70a8bd5945da8db42838cc61efe8312237d9e91d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 08:21:06 +0530 Subject: [PATCH 0130/1519] refactor: Rename validate function to can_render --- frappe/website/page_controllers/document_page.py | 2 +- frappe/website/page_controllers/error_page.py | 2 +- frappe/website/page_controllers/list_page.py | 2 +- frappe/website/page_controllers/not_found_page.py | 2 +- frappe/website/page_controllers/not_permitted_page.py | 2 +- frappe/website/page_controllers/print_page.py | 2 +- frappe/website/page_controllers/redirect_page.py | 2 +- frappe/website/page_controllers/static_page.py | 2 +- frappe/website/page_controllers/template_page.py | 2 +- frappe/website/page_controllers/web_form.py | 2 +- frappe/website/page_controllers/web_page.py | 2 +- frappe/website/path_resolver.py | 5 ++--- 12 files changed, 13 insertions(+), 14 deletions(-) diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_controllers/document_page.py index 6ab384e77d..1a42b5debb 100644 --- a/frappe/website/page_controllers/document_page.py +++ b/frappe/website/page_controllers/document_page.py @@ -7,7 +7,7 @@ from frappe.website.router import (get_doctypes_with_web_view, class DocumentPage(BaseTemplatePage): - def validate(self): + def can_render(self): ''' Find a document with matching `route` from all doctypes with `has_web_view`=1 ''' diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_controllers/error_page.py index 554949684f..52903d076b 100644 --- a/frappe/website/page_controllers/error_page.py +++ b/frappe/website/page_controllers/error_page.py @@ -6,5 +6,5 @@ class ErrorPage(TemplatePage): super().__init__(path=path, http_status_code=http_status_code) self.http_status_code = getattr(exception, 'http_status_code', None) or http_status_code or 500 - def validate(self): + def can_render(self): return True diff --git a/frappe/website/page_controllers/list_page.py b/frappe/website/page_controllers/list_page.py index cc6f150dd2..e3b92a2771 100644 --- a/frappe/website/page_controllers/list_page.py +++ b/frappe/website/page_controllers/list_page.py @@ -2,7 +2,7 @@ import frappe from frappe.website.page_controllers.template_page import TemplatePage class ListPage(TemplatePage): - def validate(self): + def can_render(self): return frappe.db.exists('DocType', self.path, True) def render(self): diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_controllers/not_found_page.py index 13c6358512..1f687ddb98 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_controllers/not_found_page.py @@ -15,7 +15,7 @@ class NotFoundPage(TemplatePage): http_status_code = 404 super().__init__(path=path, http_status_code=http_status_code) - def validate(self): + def can_render(self): return True def render(self): diff --git a/frappe/website/page_controllers/not_permitted_page.py b/frappe/website/page_controllers/not_permitted_page.py index 3ed732d80b..75a8b756d8 100644 --- a/frappe/website/page_controllers/not_permitted_page.py +++ b/frappe/website/page_controllers/not_permitted_page.py @@ -9,7 +9,7 @@ class NotPermittedPage(TemplatePage): super().__init__(path=path, http_status_code=http_status_code) self.http_status_code = 403 - def validate(self): + def can_render(self): return True def render(self): diff --git a/frappe/website/page_controllers/print_page.py b/frappe/website/page_controllers/print_page.py index 574f335f5d..790ee75585 100644 --- a/frappe/website/page_controllers/print_page.py +++ b/frappe/website/page_controllers/print_page.py @@ -6,7 +6,7 @@ class PrintPage(TemplatePage): default path returns a printable object (based on permission) /Quotation/Q-0001 ''' - def validate(self): + def can_render(self): parts = self.path.split('/', 1) if len(parts)==2: if (frappe.db.exists('DocType', parts[0], True) diff --git a/frappe/website/page_controllers/redirect_page.py b/frappe/website/page_controllers/redirect_page.py index f3a0ba6e7f..0bfa8897a3 100644 --- a/frappe/website/page_controllers/redirect_page.py +++ b/frappe/website/page_controllers/redirect_page.py @@ -6,7 +6,7 @@ class RedirectPage(object): self.path = path self.http_status_code = http_status_code - def validate(self): + def can_render(self): return True def render(self): diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_controllers/static_page.py index b292a62922..0c75d6feb3 100644 --- a/frappe/website/page_controllers/static_page.py +++ b/frappe/website/page_controllers/static_page.py @@ -23,7 +23,7 @@ class StaticPage(WebPage): if os.path.isfile(file_path): self.file_path = file_path - def validate(self): + def can_render(self): return self.is_valid_file_path() and self.file_path def is_valid_file_path(self): diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index cd30fa02c8..c9797b88c9 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -36,7 +36,7 @@ class TemplatePage(BaseTemplatePage): self.basepath = os.path.dirname(file_path) return - def validate(self): + def can_render(self): return hasattr(self, 'template_path') and bool(self.template_path) def get_index_path_options(self, search_path): diff --git a/frappe/website/page_controllers/web_form.py b/frappe/website/page_controllers/web_form.py index d7ab02d880..c1afaafbe5 100644 --- a/frappe/website/page_controllers/web_form.py +++ b/frappe/website/page_controllers/web_form.py @@ -2,5 +2,5 @@ from frappe.website.page_controllers.web_page import WebPage import frappe class WebFormPage(WebPage): - def validate(self): + def can_render(self): return bool(frappe.get_all("Web Form", filters={'route': self.path})) diff --git a/frappe/website/page_controllers/web_page.py b/frappe/website/page_controllers/web_page.py index 4d9e642b4b..0407afe532 100644 --- a/frappe/website/page_controllers/web_page.py +++ b/frappe/website/page_controllers/web_page.py @@ -13,7 +13,7 @@ class WebPage(object): if self.validate(): return self.render() - def validate(self): + def can_render(self): pass def render(self): diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 39edf0d9a8..854948740c 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -32,15 +32,14 @@ class PathResolver(): try: resolve_redirect(self.path, request.query_string) except frappe.Redirect: - return self.path, RedirectPage(self.path) + return frappe.flags.redirect_location, RedirectPage(self.path) endpoint = resolve_path(self.path) renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) for renderer in renderers: renderer_instance = renderer(endpoint, 200) - can_render = renderer_instance.validate() - if can_render: + if renderer_instance.can_render(): return endpoint, renderer_instance return endpoint, NotFoundPage(endpoint) From d0915a709bc9984bf205be66193bfd767c598944 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 08:22:45 +0530 Subject: [PATCH 0131/1519] fix: Make http_status_code non mandatory --- frappe/website/page_controllers/base_template_page.py | 2 +- frappe/website/serve.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_controllers/base_template_page.py index f06869fd5f..d7770ccd93 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_controllers/base_template_page.py @@ -5,7 +5,7 @@ from frappe.website.website_components.metatags import MetaTags class BaseTemplatePage(WebPage): - def __init__(self, path, http_status_code): + def __init__(self, path, http_status_code=None): super().__init__(path=path, http_status_code=http_status_code) self.template_path = '' diff --git a/frappe/website/serve.py b/frappe/website/serve.py index 95a49cef1a..a761f479f3 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -14,8 +14,7 @@ def get_response(path=None, http_status_code=200): try: path_resolver = PathResolver(path) endpoint, renderer_instance = path_resolver.resolve() - if renderer_instance: - response = renderer_instance.render() + response = renderer_instance.render() except frappe.Redirect: return RedirectPage(endpoint or path, http_status_code).render() except frappe.PermissionError as e: From bb68dd7323974771fec691c212a954e4f2683999 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 09:24:32 +0530 Subject: [PATCH 0132/1519] fix: Add comment properties back with deprecation warning --- .../website/page_controllers/template_page.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_controllers/template_page.py index c9797b88c9..69e9cceb9f 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_controllers/template_page.py @@ -1,5 +1,6 @@ import io import os +import click import frappe from frappe.website.page_controllers.base_template_page import BaseTemplatePage @@ -11,6 +12,17 @@ from frappe.website.utils import (extract_comment_tag, extract_title, WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") +COMMENT_PROPERTY_KEY_VALUE_MAP = { + "no-breadcrumbs": ("no_breadcrumbs", 1), + "show-sidebar": ("show_sidebar", 1), + "add-breadcrumbs": ("add_breadcrumbs", 1), + "no-header": ("no_header", 1), + "add-next-prev-links": ("add_next_prev_links", 1), + "no-cache": ("no_cache", 1), + "no-sitemap": ("sitemap", 0), + "sitemap": ("sitemap", 1) +} + class TemplatePage(BaseTemplatePage): def __init__(self, path, http_status_code=None): super().__init__(path=path, http_status_code=http_status_code) @@ -147,6 +159,15 @@ class TemplatePage(BaseTemplatePage): self.source = '''{{% extends "{0}" %}} {{% block page_content %}}{1}{{% endblock %}}'''.format(context.base_template, self.source) + self.set_properties_via_comments() + + def set_properties_via_comments(self): + for comment, (context_key, value) in COMMENT_PROPERTY_KEY_VALUE_MAP.items(): + comment_tag = f"" + if comment_tag in self.source: + self.context[context_key] = value + click.echo(f'⚠️ DEPRECATION WARNING: {comment_tag} will be deprecated on 2021-12-31.') + def run_pymodule_method(self, method): if hasattr(self.pymodule, method): try: From 8317e00712210a802e363c96d3f446f084ddb061 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 09:27:26 +0530 Subject: [PATCH 0133/1519] refactor: Rename page_controllers folder to page_renderers --- .../base_template_page.py | 2 +- .../document_page.py | 2 +- .../error_page.py | 2 +- .../list_page.py | 2 +- .../not_found_page.py | 2 +- .../not_permitted_page.py | 2 +- .../print_page.py | 2 +- .../redirect_page.py | 0 .../static_page.py | 2 +- .../template_page.py | 2 +- .../web_form.py | 2 +- .../web_page.py | 0 frappe/website/path_resolver.py | 16 ++++++++-------- frappe/website/serve.py | 6 +++--- 14 files changed, 21 insertions(+), 21 deletions(-) rename frappe/website/{page_controllers => page_renderers}/base_template_page.py (97%) rename frappe/website/{page_controllers => page_renderers}/document_page.py (96%) rename frappe/website/{page_controllers => page_renderers}/error_page.py (81%) rename frappe/website/{page_controllers => page_renderers}/list_page.py (77%) rename frappe/website/{page_controllers => page_renderers}/not_found_page.py (93%) rename frappe/website/{page_controllers => page_renderers}/not_permitted_page.py (89%) rename frappe/website/{page_controllers => page_renderers}/print_page.py (88%) rename frappe/website/{page_controllers => page_renderers}/redirect_page.py (100%) rename frappe/website/{page_controllers => page_renderers}/static_page.py (95%) rename frappe/website/{page_controllers => page_renderers}/template_page.py (99%) rename frappe/website/{page_controllers => page_renderers}/web_form.py (69%) rename frappe/website/{page_controllers => page_renderers}/web_page.py (100%) diff --git a/frappe/website/page_controllers/base_template_page.py b/frappe/website/page_renderers/base_template_page.py similarity index 97% rename from frappe/website/page_controllers/base_template_page.py rename to frappe/website/page_renderers/base_template_page.py index d7770ccd93..8405270a57 100644 --- a/frappe/website/page_controllers/base_template_page.py +++ b/frappe/website/page_renderers/base_template_page.py @@ -1,6 +1,6 @@ import frappe from frappe.website.doctype.website_settings.website_settings import get_website_settings -from frappe.website.page_controllers.web_page import WebPage +from frappe.website.page_renderers.web_page import WebPage from frappe.website.website_components.metatags import MetaTags diff --git a/frappe/website/page_controllers/document_page.py b/frappe/website/page_renderers/document_page.py similarity index 96% rename from frappe/website/page_controllers/document_page.py rename to frappe/website/page_renderers/document_page.py index 1a42b5debb..34dc42e203 100644 --- a/frappe/website/page_controllers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -1,6 +1,6 @@ import frappe from frappe.model.document import get_controller -from frappe.website.page_controllers.base_template_page import BaseTemplatePage +from frappe.website.page_renderers.base_template_page import BaseTemplatePage from frappe.website.render import build_response from frappe.website.router import (get_doctypes_with_web_view, get_page_info_from_web_page_with_dynamic_routes) diff --git a/frappe/website/page_controllers/error_page.py b/frappe/website/page_renderers/error_page.py similarity index 81% rename from frappe/website/page_controllers/error_page.py rename to frappe/website/page_renderers/error_page.py index 52903d076b..3501c77765 100644 --- a/frappe/website/page_controllers/error_page.py +++ b/frappe/website/page_renderers/error_page.py @@ -1,4 +1,4 @@ -from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_renderers.template_page import TemplatePage class ErrorPage(TemplatePage): def __init__(self, path=None, http_status_code=None, exception=None): diff --git a/frappe/website/page_controllers/list_page.py b/frappe/website/page_renderers/list_page.py similarity index 77% rename from frappe/website/page_controllers/list_page.py rename to frappe/website/page_renderers/list_page.py index e3b92a2771..61c781ea14 100644 --- a/frappe/website/page_controllers/list_page.py +++ b/frappe/website/page_renderers/list_page.py @@ -1,5 +1,5 @@ import frappe -from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_renderers.template_page import TemplatePage class ListPage(TemplatePage): def can_render(self): diff --git a/frappe/website/page_controllers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py similarity index 93% rename from frappe/website/page_controllers/not_found_page.py rename to frappe/website/page_renderers/not_found_page.py index 1f687ddb98..af510fecfc 100644 --- a/frappe/website/page_controllers/not_found_page.py +++ b/frappe/website/page_renderers/not_found_page.py @@ -2,7 +2,7 @@ import os from urllib.parse import urlparse import frappe -from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_renderers.template_page import TemplatePage from frappe.website.utils import can_cache HOMEPAGE_PATHS = ('/', '/index', 'index') diff --git a/frappe/website/page_controllers/not_permitted_page.py b/frappe/website/page_renderers/not_permitted_page.py similarity index 89% rename from frappe/website/page_controllers/not_permitted_page.py rename to frappe/website/page_renderers/not_permitted_page.py index 75a8b756d8..e69299f5c5 100644 --- a/frappe/website/page_controllers/not_permitted_page.py +++ b/frappe/website/page_renderers/not_permitted_page.py @@ -1,6 +1,6 @@ import frappe from frappe import _ -from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_renderers.template_page import TemplatePage from frappe.utils import cstr class NotPermittedPage(TemplatePage): diff --git a/frappe/website/page_controllers/print_page.py b/frappe/website/page_renderers/print_page.py similarity index 88% rename from frappe/website/page_controllers/print_page.py rename to frappe/website/page_renderers/print_page.py index 790ee75585..05d4026e2b 100644 --- a/frappe/website/page_controllers/print_page.py +++ b/frappe/website/page_renderers/print_page.py @@ -1,5 +1,5 @@ import frappe -from frappe.website.page_controllers.template_page import TemplatePage +from frappe.website.page_renderers.template_page import TemplatePage class PrintPage(TemplatePage): ''' diff --git a/frappe/website/page_controllers/redirect_page.py b/frappe/website/page_renderers/redirect_page.py similarity index 100% rename from frappe/website/page_controllers/redirect_page.py rename to frappe/website/page_renderers/redirect_page.py diff --git a/frappe/website/page_controllers/static_page.py b/frappe/website/page_renderers/static_page.py similarity index 95% rename from frappe/website/page_controllers/static_page.py rename to frappe/website/page_renderers/static_page.py index 0c75d6feb3..fc3edbe216 100644 --- a/frappe/website/page_controllers/static_page.py +++ b/frappe/website/page_renderers/static_page.py @@ -5,7 +5,7 @@ from werkzeug.wrappers import Response from werkzeug.wsgi import wrap_file import frappe -from frappe.website.page_controllers.web_page import WebPage +from frappe.website.page_renderers.web_page import WebPage UNSUPPORTED_STATIC_PAGE_TYPES = ('html', 'md', 'js', 'xml', 'css', 'txt', 'py', 'json') diff --git a/frappe/website/page_controllers/template_page.py b/frappe/website/page_renderers/template_page.py similarity index 99% rename from frappe/website/page_controllers/template_page.py rename to frappe/website/page_renderers/template_page.py index 69e9cceb9f..467d74b283 100644 --- a/frappe/website/page_controllers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -3,7 +3,7 @@ import os import click import frappe -from frappe.website.page_controllers.base_template_page import BaseTemplatePage +from frappe.website.page_renderers.base_template_page import BaseTemplatePage from frappe.website.utils import get_sidebar_items from frappe.website.render import build_response from frappe.website.router import get_base_template diff --git a/frappe/website/page_controllers/web_form.py b/frappe/website/page_renderers/web_form.py similarity index 69% rename from frappe/website/page_controllers/web_form.py rename to frappe/website/page_renderers/web_form.py index c1afaafbe5..094ae78d71 100644 --- a/frappe/website/page_controllers/web_form.py +++ b/frappe/website/page_renderers/web_form.py @@ -1,4 +1,4 @@ -from frappe.website.page_controllers.web_page import WebPage +from frappe.website.page_renderers.web_page import WebPage import frappe class WebFormPage(WebPage): diff --git a/frappe/website/page_controllers/web_page.py b/frappe/website/page_renderers/web_page.py similarity index 100% rename from frappe/website/page_controllers/web_page.py rename to frappe/website/page_renderers/web_page.py diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 854948740c..9816900677 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -3,14 +3,14 @@ import re from werkzeug.routing import Rule import frappe -from frappe.website.page_controllers.document_page import DocumentPage -from frappe.website.page_controllers.list_page import ListPage -from frappe.website.page_controllers.not_found_page import NotFoundPage -from frappe.website.page_controllers.print_page import PrintPage -from frappe.website.page_controllers.redirect_page import RedirectPage -from frappe.website.page_controllers.static_page import StaticPage -from frappe.website.page_controllers.template_page import TemplatePage -from frappe.website.page_controllers.web_form import WebFormPage +from frappe.website.page_renderers.document_page import DocumentPage +from frappe.website.page_renderers.list_page import ListPage +from frappe.website.page_renderers.not_found_page import NotFoundPage +from frappe.website.page_renderers.print_page import PrintPage +from frappe.website.page_renderers.redirect_page import RedirectPage +from frappe.website.page_renderers.static_page import StaticPage +from frappe.website.page_renderers.template_page import TemplatePage +from frappe.website.page_renderers.web_form import WebFormPage from frappe.website.router import evaluate_dynamic_routes from frappe.website.utils import can_cache, get_home_page diff --git a/frappe/website/serve.py b/frappe/website/serve.py index a761f479f3..fe7fc77064 100644 --- a/frappe/website/serve.py +++ b/frappe/website/serve.py @@ -1,7 +1,7 @@ import frappe -from frappe.website.page_controllers.error_page import ErrorPage -from frappe.website.page_controllers.not_permitted_page import NotPermittedPage -from frappe.website.page_controllers.redirect_page import RedirectPage +from frappe.website.page_renderers.error_page import ErrorPage +from frappe.website.page_renderers.not_permitted_page import NotPermittedPage +from frappe.website.page_renderers.redirect_page import RedirectPage from frappe.website.path_resolver import PathResolver From 86897c1808063efccbc8929250c3d2ca203b9c9c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 10:53:35 +0530 Subject: [PATCH 0134/1519] refactor: Remove render.py and move all utility functions to utils.py - Replace or remove all render imports --- frappe/cache_manager.py | 2 +- frappe/commands/utils.py | 8 +- frappe/core/doctype/comment/comment.py | 2 +- frappe/core/doctype/doctype/doctype.py | 9 +-- frappe/installer.py | 4 +- frappe/migrate.py | 4 +- frappe/patches.txt | 2 +- .../templates/includes/comments/comments.py | 2 +- .../about_us_settings/about_us_settings.py | 6 +- .../doctype/blog_category/blog_category.py | 2 +- frappe/website/doctype/blog_post/blog_post.py | 2 +- .../doctype/blog_settings/blog_settings.py | 4 +- .../contact_us_settings.py | 2 +- .../doctype/help_article/help_article.py | 2 +- .../portal_settings/portal_settings.py | 2 +- .../doctype/web_template/web_template.py | 2 +- .../doctype/website_script/website_script.py | 2 +- .../website_settings/website_settings.py | 2 +- .../website_slideshow/website_slideshow.py | 2 +- .../website/page_renderers/document_page.py | 2 +- .../website/page_renderers/redirect_page.py | 2 +- .../website/page_renderers/template_page.py | 6 +- frappe/website/page_renderers/web_page.py | 4 - frappe/website/render.py | 76 ------------------- frappe/website/router.py | 49 +----------- frappe/website/utils.py | 60 +++++++++++++++ frappe/website/website_generator.py | 2 +- .../_test/_test_folder/new.csv/__init__.py | 0 28 files changed, 96 insertions(+), 166 deletions(-) delete mode 100644 frappe/website/render.py create mode 100644 frappe/www/_test/_test_folder/new.csv/__init__.py diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 7330c83102..516f13de39 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -55,7 +55,7 @@ def clear_domain_cache(user=None): cache.delete_value(domain_cache_keys) def clear_global_cache(): - from frappe.website.render import clear_cache as clear_website_cache + from frappe.website.utils import clear_cache as clear_website_cache clear_doctype_cache() clear_website_cache() diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 4da0f6bb78..a6937a5dc4 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -69,14 +69,14 @@ def watch(apps=None): def clear_cache(context): "Clear cache, doctype cache and defaults" import frappe.sessions - import frappe.website.render + from frappe.website.utils import clear_cache as clear_website_cache from frappe.desk.notifications import clear_notifications for site in context.sites: try: frappe.connect(site) frappe.clear_cache() clear_notifications() - frappe.website.render.clear_cache() + clear_website_cache() finally: frappe.destroy() if not context.sites: @@ -86,12 +86,12 @@ def clear_cache(context): @pass_context def clear_website_cache(context): "Clear website cache" - import frappe.website.render + from frappe.website.utils import clear_cache as clear_website_cache for site in context.sites: try: frappe.init(site=site) frappe.connect() - frappe.website.render.clear_cache() + clear_website_cache() finally: frappe.destroy() if not context.sites: diff --git a/frappe/core/doctype/comment/comment.py b/frappe/core/doctype/comment/comment.py index ad5d60500b..6090947393 100644 --- a/frappe/core/doctype/comment/comment.py +++ b/frappe/core/doctype/comment/comment.py @@ -11,7 +11,7 @@ from frappe.core.doctype.user.user import extract_mentions from frappe.desk.doctype.notification_log.notification_log import enqueue_create_notification,\ get_title, get_title_html from frappe.utils import get_fullname -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.database.schema import add_column from frappe.exceptions import ImplicitCommitError diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index 84673f990a..8186aac2b0 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -13,7 +13,6 @@ from six import iteritems # imports - module imports import frappe -import frappe.website.render from frappe import _ from frappe.utils import now, cint from frappe.model import no_value_fields, default_fields, data_fieldtypes, table_fields, data_field_options @@ -27,6 +26,7 @@ from frappe.model.docfield import supports_translation from frappe.modules.import_file import get_file_path from frappe.model.meta import Meta from frappe.desk.utils import validate_route_conflict +from frappe.website.utils import clear_cache class InvalidFieldNameError(frappe.ValidationError): pass class UniqueFieldnameError(frappe.ValidationError): pass @@ -251,7 +251,7 @@ class DocType(Document): frappe.throw(_('Field "route" is mandatory for Web Views'), title='Missing Field') # clear website cache - frappe.website.render.clear_cache() + clear_cache() def change_modified_of_parent(self): """Change the timestamp of parent DocType if the current one is a child to clear caches.""" @@ -553,11 +553,6 @@ class DocType(Document): from frappe.modules.export_file import export_to_files export_to_files(record_list=[['DocType', self.name]], create_init=True) - def import_doc(self): - """Import from standard folder `[module]/doctype/[name]/[name].json`.""" - from frappe.modules.import_module import import_from_files - import_from_files(record_list=[[self.module, 'doctype', self.name]]) - def make_controller_template(self): """Make boilerplate controller template.""" make_boilerplate("controller._py", self) diff --git a/frappe/installer.py b/frappe/installer.py index d7d885d60e..138d5abc1b 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -282,10 +282,10 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) def post_install(rebuild_website=False): - from frappe.website import render + from frappe.website.utils import clear_cache as clear_website_cache if rebuild_website: - render.clear_cache() + clear_website_cache() init_singles() frappe.db.commit() diff --git a/frappe/migrate.py b/frappe/migrate.py index 619510fe5e..0fe7c2e034 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -15,7 +15,7 @@ from frappe.utils.connections import check_connection from frappe.utils.dashboard import sync_dashboards from frappe.cache_manager import clear_global_cache from frappe.desk.notifications import clear_notifications -from frappe.website import render +from frappe.website.utils import clear_cache as clear_website_cache from frappe.core.doctype.language.language import sync_languages from frappe.modules.utils import sync_customizations from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs @@ -78,7 +78,7 @@ Otherwise, check the server logs and ensure that all the required services are r frappe.get_doc('Portal Settings', 'Portal Settings').sync_menu() # syncs statics - render.clear_cache() + clear_website_cache() # updating installed applications data frappe.get_single('Installed Applications').update_versions() diff --git a/frappe/patches.txt b/frappe/patches.txt index e70be0a37b..a2a3f73592 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -93,7 +93,7 @@ frappe.patches.v4_0.create_custom_field_for_owner_match frappe.patches.v4_0.enable_scheduler_in_system_settings execute:frappe.db.sql("update tabReport set apply_user_permissions=1") #2014-06-03 frappe.patches.v4_0.replace_deprecated_timezones -execute:import frappe.website.render; frappe.website.render.clear_cache("login"); #2014-06-10 +execute:import frappe.website.utils; frappe.website.utils.clear_cache("login"); #2014-06-10 frappe.patches.v4_0.fix_attach_field_file_url execute:frappe.permissions.reset_perms("User") #2015-03-24 execute:frappe.db.sql("""delete from `tabUserRole` where ifnull(parentfield, '')='' or ifnull(`role`, '')=''""") #2014-08-18 diff --git a/frappe/templates/includes/comments/comments.py b/frappe/templates/includes/comments/comments.py index d08eb12ba8..b1cd98f2b9 100644 --- a/frappe/templates/includes/comments/comments.py +++ b/frappe/templates/includes/comments/comments.py @@ -4,7 +4,7 @@ from __future__ import unicode_literals import frappe import re -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.utils import add_to_date, now from frappe import _ diff --git a/frappe/website/doctype/about_us_settings/about_us_settings.py b/frappe/website/doctype/about_us_settings/about_us_settings.py index 5b93cdcede..1ef832ba99 100644 --- a/frappe/website/doctype/about_us_settings/about_us_settings.py +++ b/frappe/website/doctype/about_us_settings/about_us_settings.py @@ -9,11 +9,11 @@ import frappe from frappe.model.document import Document class AboutUsSettings(Document): - + def on_update(self): - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache("about") - + def get_args(): obj = frappe.get_doc("About Us Settings") return { diff --git a/frappe/website/doctype/blog_category/blog_category.py b/frappe/website/doctype/blog_category/blog_category.py index 375ba5b6a3..b8252c993f 100644 --- a/frappe/website/doctype/blog_category/blog_category.py +++ b/frappe/website/doctype/blog_category/blog_category.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals from frappe.website.website_generator import WebsiteGenerator -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache class BlogCategory(WebsiteGenerator): def autoname(self): diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index 5671540682..b8a443525f 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -6,7 +6,7 @@ from __future__ import unicode_literals import frappe from frappe import _ from frappe.website.website_generator import WebsiteGenerator -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.utils import today, cint, global_date_format, get_fullname, strip_html_tags, markdown, sanitize_html from math import ceil from frappe.website.utils import (find_first_image, get_html_content_based_on_type, diff --git a/frappe/website/doctype/blog_settings/blog_settings.py b/frappe/website/doctype/blog_settings/blog_settings.py index 0ed98b9b87..2580806ef1 100644 --- a/frappe/website/doctype/blog_settings/blog_settings.py +++ b/frappe/website/doctype/blog_settings/blog_settings.py @@ -9,8 +9,8 @@ import frappe from frappe.model.document import Document class BlogSettings(Document): - + def on_update(self): - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache("blog") clear_cache("writers") \ No newline at end of file diff --git a/frappe/website/doctype/contact_us_settings/contact_us_settings.py b/frappe/website/doctype/contact_us_settings/contact_us_settings.py index 24e9811a47..c237a13bda 100644 --- a/frappe/website/doctype/contact_us_settings/contact_us_settings.py +++ b/frappe/website/doctype/contact_us_settings/contact_us_settings.py @@ -11,5 +11,5 @@ from frappe.model.document import Document class ContactUsSettings(Document): def on_update(self): - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache("contact") \ No newline at end of file diff --git a/frappe/website/doctype/help_article/help_article.py b/frappe/website/doctype/help_article/help_article.py index fa26cfef99..555d6c9268 100644 --- a/frappe/website/doctype/help_article/help_article.py +++ b/frappe/website/doctype/help_article/help_article.py @@ -93,7 +93,7 @@ def get_sidebar_items(): def clear_cache(): clear_website_cache() - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache() def clear_website_cache(path=None): diff --git a/frappe/website/doctype/portal_settings/portal_settings.py b/frappe/website/doctype/portal_settings/portal_settings.py index 1bfbc70d60..84ee678c1e 100644 --- a/frappe/website/doctype/portal_settings/portal_settings.py +++ b/frappe/website/doctype/portal_settings/portal_settings.py @@ -45,7 +45,7 @@ class PortalSettings(Document): # clear web cache (for menus!) frappe.clear_cache(user='Guest') - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache() # clears role based home pages diff --git a/frappe/website/doctype/web_template/web_template.py b/frappe/website/doctype/web_template/web_template.py index 2fd5bfa179..712cf3c1e4 100644 --- a/frappe/website/doctype/web_template/web_template.py +++ b/frappe/website/doctype/web_template/web_template.py @@ -9,7 +9,7 @@ from shutil import rmtree import frappe from frappe.model.document import Document -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe import _ from frappe.modules.export_file import ( write_document_file, diff --git a/frappe/website/doctype/website_script/website_script.py b/frappe/website/doctype/website_script/website_script.py index 5648c27fd6..d1f9f595ed 100644 --- a/frappe/website/doctype/website_script/website_script.py +++ b/frappe/website/doctype/website_script/website_script.py @@ -14,5 +14,5 @@ class WebsiteScript(Document): """clear cache""" frappe.clear_cache(user = 'Guest') - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache() \ No newline at end of file diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index ae8e6bd7e1..e5dec24fbb 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -68,7 +68,7 @@ class WebsiteSettings(Document): # clear web cache (for menus!) frappe.clear_cache(user = 'Guest') - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache() # clears role based home pages diff --git a/frappe/website/doctype/website_slideshow/website_slideshow.py b/frappe/website/doctype/website_slideshow/website_slideshow.py index 90f62d1bb1..5e6353c5cd 100644 --- a/frappe/website/doctype/website_slideshow/website_slideshow.py +++ b/frappe/website/doctype/website_slideshow/website_slideshow.py @@ -15,7 +15,7 @@ class WebsiteSlideshow(Document): def on_update(self): # a slide show can be in use and any change in it should get reflected - from frappe.website.render import clear_cache + from frappe.website.utils import clear_cache clear_cache() def validate_images(self): diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index 34dc42e203..2f272ffd15 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -1,7 +1,7 @@ import frappe from frappe.model.document import get_controller from frappe.website.page_renderers.base_template_page import BaseTemplatePage -from frappe.website.render import build_response +from frappe.website.utils import build_response from frappe.website.router import (get_doctypes_with_web_view, get_page_info_from_web_page_with_dynamic_routes) diff --git a/frappe/website/page_renderers/redirect_page.py b/frappe/website/page_renderers/redirect_page.py index 0bfa8897a3..2049c375e8 100644 --- a/frappe/website/page_renderers/redirect_page.py +++ b/frappe/website/page_renderers/redirect_page.py @@ -1,5 +1,5 @@ import frappe -from frappe.website.render import build_response +from frappe.website.utils import build_response class RedirectPage(object): def __init__(self, path, http_status_code=301): diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 467d74b283..d8032c6b9c 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -4,11 +4,9 @@ import click import frappe from frappe.website.page_renderers.base_template_page import BaseTemplatePage -from frappe.website.utils import get_sidebar_items -from frappe.website.render import build_response from frappe.website.router import get_base_template -from frappe.website.utils import (extract_comment_tag, extract_title, - get_next_link, get_toc, get_frontmatter, cache_html) +from frappe.website.utils import (extract_comment_tag, extract_title, get_next_link, + get_toc, get_frontmatter, cache_html, get_sidebar_items, build_response) WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") diff --git a/frappe/website/page_renderers/web_page.py b/frappe/website/page_renderers/web_page.py index 0407afe532..5c3807c0ee 100644 --- a/frappe/website/page_renderers/web_page.py +++ b/frappe/website/page_renderers/web_page.py @@ -9,10 +9,6 @@ class WebPage(object): self.path = path.strip('/ ') self.basepath = '' - def get(self): - if self.validate(): - return self.render() - def can_render(self): pass diff --git a/frappe/website/render.py b/frappe/website/render.py deleted file mode 100644 index d5587ad98b..0000000000 --- a/frappe/website/render.py +++ /dev/null @@ -1,76 +0,0 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -import json -import mimetypes -import re - -from six import iteritems -from werkzeug.wrappers import Response - -import frappe -import frappe.sessions - - -def build_response(path, data, http_status_code, headers=None): - # build response - response = Response() - response.data = set_content_type(response, data, path) - response.status_code = http_status_code - response.headers["X-Page-Name"] = path.encode("ascii", errors="xmlcharrefreplace") - response.headers["X-From-Cache"] = frappe.local.response.from_cache or False - - add_preload_headers(response) - if headers: - for key, val in iteritems(headers): - response.headers[key] = val.encode("ascii", errors="xmlcharrefreplace") - - return response - -def set_content_type(response, data, path): - if isinstance(data, dict): - response.mimetype = 'application/json' - response.charset = 'utf-8' - data = json.dumps(data) - return data - - response.mimetype = 'text/html' - response.charset = 'utf-8' - - # ignore paths ending with .com to avoid unnecessary download - # https://bugs.python.org/issue22347 - if "." in path and not path.endswith('.com'): - content_type, encoding = mimetypes.guess_type(path) - if content_type: - response.mimetype = content_type - if encoding: - response.charset = encoding - - return data - -def add_preload_headers(response): - from bs4 import BeautifulSoup - - try: - preload = [] - soup = BeautifulSoup(response.data, "lxml") - for elem in soup.find_all('script', src=re.compile(".*")): - preload.append(("script", elem.get("src"))) - - for elem in soup.find_all('link', rel="stylesheet"): - preload.append(("style", elem.get("href"))) - - links = [] - for _type, link in preload: - links.append("<{}>; rel=preload; as={}".format(link, _type)) - - if links: - response.headers["Link"] = ",".join(links) - except Exception: - import traceback - traceback.print_exc() - -def clear_cache(path=None): - # TODO: Remove this - from frappe.website.utils import clear_cache - return clear_cache(path) diff --git a/frappe/website/router.py b/frappe/website/router.py index 9922647ebf..23fd5cb21f 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -6,7 +6,7 @@ import os import re import frappe -from frappe.website.utils import extract_comment_tag, extract_title +from frappe.website.utils import extract_title from werkzeug.routing import Map, Rule, NotFound def get_page_info_from_web_page_with_dynamic_routes(path): @@ -143,14 +143,12 @@ def get_page_info(path, app, start, basepath=None, app_path=None, fname=None): # get the source setup_source(page_info) - # extract properties from HTML comments - load_properties_from_source(page_info) + if not page_info.title: + page_info.title = extract_title(page_info.source, page_info.route) # extract properties from controller attributes load_properties_from_controller(page_info) - page_info.build_version = frappe.utils.get_build_version() - return page_info def get_frontmatter(string): @@ -252,47 +250,6 @@ def setup_index(page_info): if os.path.exists(index_txt_path): page_info.index = open(index_txt_path, 'r').read().splitlines() -def load_properties_from_source(page_info): - '''Load properties like no_cache, title from source html''' - - if not page_info.title: - page_info.title = extract_title(page_info.source, page_info.route) - - base_template = extract_comment_tag(page_info.source, 'base_template') - if base_template: - page_info.base_template = base_template - - if (page_info.base_template - and "{%- extends" not in page_info.source - and "{% extends" not in page_info.source - and "" not in page_info.source): - page_info.source = '''{{% extends "{0}" %}} - {{% block page_content %}}{1}{{% endblock %}}'''.format(page_info.base_template, page_info.source) - - if "" in page_info.source: - page_info.no_breadcrumbs = 1 - - if "" in page_info.source: - page_info.show_sidebar = 1 - - if "" in page_info.source: - page_info.add_breadcrumbs = 1 - - if "" in page_info.source: - page_info.no_header = 1 - - if "" in page_info.source: - page_info.add_next_prev_links = 1 - - if "" in page_info.source: - page_info.no_cache = 1 - - if "" in page_info.source: - page_info.sitemap = 0 - - if "" in page_info.source: - page_info.sitemap = 1 - def load_properties_from_controller(page_info): if not page_info.controller: return diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 814bd0101e..f57cfa7ec5 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -2,6 +2,7 @@ # MIT License. See license.txt import functools import json +import mimetypes import os import re from functools import wraps @@ -9,6 +10,7 @@ from functools import wraps import yaml from past.builtins import cmp from six import iteritems +from werkzeug.wrappers import Response import frappe from frappe import _ @@ -446,3 +448,61 @@ def cache_html(func): return html return cache_html_decorator + +def build_response(path, data, http_status_code, headers=None): + # build response + response = Response() + response.data = set_content_type(response, data, path) + response.status_code = http_status_code + response.headers["X-Page-Name"] = path.encode("ascii", errors="xmlcharrefreplace") + response.headers["X-From-Cache"] = frappe.local.response.from_cache or False + + add_preload_headers(response) + if headers: + for key, val in iteritems(headers): + response.headers[key] = val.encode("ascii", errors="xmlcharrefreplace") + + return response + +def set_content_type(response, data, path): + if isinstance(data, dict): + response.mimetype = 'application/json' + response.charset = 'utf-8' + data = json.dumps(data) + return data + + response.mimetype = 'text/html' + response.charset = 'utf-8' + + # ignore paths ending with .com to avoid unnecessary download + # https://bugs.python.org/issue22347 + if "." in path and not path.endswith('.com'): + content_type, encoding = mimetypes.guess_type(path) + if content_type: + response.mimetype = content_type + if encoding: + response.charset = encoding + + return data + +def add_preload_headers(response): + from bs4 import BeautifulSoup + + try: + preload = [] + soup = BeautifulSoup(response.data, "lxml") + for elem in soup.find_all('script', src=re.compile(".*")): + preload.append(("script", elem.get("src"))) + + for elem in soup.find_all('link', rel="stylesheet"): + preload.append(("style", elem.get("href"))) + + links = [] + for _type, link in preload: + links.append("<{}>; rel=preload; as={}".format(link, _type)) + + if links: + response.headers["Link"] = ",".join(links) + except Exception: + import traceback + traceback.print_exc() diff --git a/frappe/website/website_generator.py b/frappe/website/website_generator.py index f2638fd86d..8b0a1bfd2d 100644 --- a/frappe/website/website_generator.py +++ b/frappe/website/website_generator.py @@ -5,7 +5,7 @@ from __future__ import unicode_literals import frappe from frappe.model.document import Document from frappe.website.utils import cleanup_page_name -from frappe.website.render import clear_cache +from frappe.website.utils import clear_cache from frappe.modules import get_module_name from frappe.search.website_search import update_index_for_path, remove_document_from_index diff --git a/frappe/www/_test/_test_folder/new.csv/__init__.py b/frappe/www/_test/_test_folder/new.csv/__init__.py new file mode 100644 index 0000000000..e69de29bb2 From d88ce8e807fe7acbc5e8c1cb9bec8fd6c52bb432 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 13:32:20 +0530 Subject: [PATCH 0135/1519] test: Add test to check replacement of {next} & {index} identifiers --- frappe/website/doctype/web_page/test_web_page.py | 16 +++++++++++----- frappe/www/_test/_test_folder/_test_page.html | 1 + frappe/www/_test/_test_folder/index.md | 3 +++ 3 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 frappe/www/_test/_test_folder/index.md diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index c5d250a4a0..b9bd425781 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -91,12 +91,18 @@ class TestWebPage(unittest.TestCase): self.assertTrue('Test Sidebar' in frappe.as_unicode(content)) frappe.flags.look_for_sidebar = False - def test_home_page(self): - content = get_response_content(path='/') - content = get_response_content(path='/index') + def test_index_and_next_comment(self): + content = get_response_content('/_test/_test_folder') + # test if {index} was rendered + self.assertTrue(' Test Page' \ + in frappe.as_unicode(content)) + self.assertTrue(' Test Toc' \ + in frappe.as_unicode(content)) - def test_table_of_content(self): - page = get_response(path='/_test/_test_folder/_test_toc') + content = get_response_content('/_test/_test_folder/_test_page') + # test if {next} was rendered + self.assertTrue('Next: Test Toc' \ + in frappe.as_unicode(content)) def test_meta_tags(self): pass diff --git a/frappe/www/_test/_test_folder/_test_page.html b/frappe/www/_test/_test_folder/_test_page.html index 900f07459d..123d619e38 100644 --- a/frappe/www/_test/_test_folder/_test_page.html +++ b/frappe/www/_test/_test_folder/_test_page.html @@ -1,4 +1,5 @@ {% block content %} {% include "templates/includes/web_sidebar.html" %}

    Test content

    +{next} {% endblock %} diff --git a/frappe/www/_test/_test_folder/index.md b/frappe/www/_test/_test_folder/index.md new file mode 100644 index 0000000000..d0b531a642 --- /dev/null +++ b/frappe/www/_test/_test_folder/index.md @@ -0,0 +1,3 @@ +# Index + +{index} \ No newline at end of file From ca56b21290b52a1fde8c34db718ee264756274ef Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 15:01:20 +0530 Subject: [PATCH 0136/1519] test: Check all cases of setting homepage --- frappe/tests/test_website.py | 63 ++++++++++++++++++++++++----- frappe/website/utils.py | 3 ++ frappe/www/_test/_test_home_page.py | 2 + 3 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 frappe/www/_test/_test_home_page.py diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index cc500d1c02..6b9530a8ce 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -4,7 +4,7 @@ import unittest import frappe from frappe.website.serve import get_response -from frappe.website.utils import get_home_page +from frappe.website.utils import get_home_page, clear_website_cache from frappe.utils import set_request class TestWebsite(unittest.TestCase): @@ -14,32 +14,29 @@ class TestWebsite(unittest.TestCase): def tearDown(self): frappe.set_user('Administrator') - def test_home_page_for_role(self): + def test_home_page(self): frappe.set_user('Administrator') - frappe.delete_doc_if_exists('User', 'test-user-for-home-page@example.com') - frappe.delete_doc_if_exists('Role', 'home-page-test') - frappe.delete_doc_if_exists('Web Page', 'home-page-test') + # test home page via role user = frappe.get_doc(dict( doctype='User', email='test-user-for-home-page@example.com', - first_name='test')).insert() + first_name='test')).insert(ignore_if_duplicate=True) role = frappe.get_doc(dict( doctype = 'Role', role_name = 'home-page-test', desk_access = 0, - home_page = '/home-page-test' - )).insert() + )).insert(ignore_if_duplicate=True) user.add_roles(role.name) user.save() + frappe.db.set_value('Role', 'home-page-test', 'home_page', 'home-page-test') frappe.set_user('test-user-for-home-page@example.com') self.assertEqual(get_home_page(), 'home-page-test') frappe.set_user('Administrator') - role.home_page = '' - role.save() + frappe.db.set_value('Role', 'home-page-test', 'home_page', '') # home page via portal settings frappe.db.set_value('Portal Settings', None, 'default_portal_home', 'test-portal-home') @@ -48,6 +45,42 @@ class TestWebsite(unittest.TestCase): frappe.cache().hdel('home_page', frappe.session.user) self.assertEqual(get_home_page(), 'test-portal-home') + frappe.db.set_value("Portal Settings", None, "default_portal_home", '') + clear_website_cache() + + # home page via website settings + frappe.db.set_value("Website Settings", None, "home_page", 'contact') + self.assertEqual(get_home_page(), 'contact') + + frappe.db.set_value("Website Settings", None, "home_page", None) + clear_website_cache() + + # fallback homepage + self.assertEqual(get_home_page(), 'me') + + # fallback homepage for guest + frappe.set_user('Guest') + self.assertEqual(get_home_page(), 'login') + frappe.set_user('Administrator') + + # test homepage via hooks + clear_website_cache() + set_home_page_hook('get_website_user_home_page', 'frappe.www._test._test_home_page.get_website_user_home_page') + self.assertEqual(get_home_page(), '_test/_test_folder') + + clear_website_cache() + set_home_page_hook('website_user_home_page', 'login') + self.assertEqual(get_home_page(), 'login') + + clear_website_cache() + set_home_page_hook('home_page', 'about') + self.assertEqual(get_home_page(), 'about') + + clear_website_cache() + set_home_page_hook('role_home_page', {'home-page-test': 'home-page-test'}) + self.assertEqual(get_home_page(), 'home-page-test') + + def test_page_load(self): set_request(method='POST', path='login') response = get_response() @@ -147,3 +180,13 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'website_redirects') frappe.cache().delete_key('app_hooks') + + +def set_home_page_hook(key, value): + from frappe import hooks + # reset home_page hooks + for hook in ('get_website_user_home_page','website_user_home_page','role_home_page','home_page'): + if hasattr(hooks, hook): + delattr(hooks, hook) + + setattr(hooks, key, value) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index f57cfa7ec5..a6d9535ec6 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -328,6 +328,9 @@ def clear_cache(path=None): for method in frappe.get_hooks("website_clear_cache"): frappe.get_attr(method)(path) +def clear_website_cache(path=None): + clear_cache(path) + def clear_sitemap(): delete_page_cache("*") diff --git a/frappe/www/_test/_test_home_page.py b/frappe/www/_test/_test_home_page.py new file mode 100644 index 0000000000..936399c700 --- /dev/null +++ b/frappe/www/_test/_test_home_page.py @@ -0,0 +1,2 @@ +def get_website_user_home_page(user): + return '/_test/_test_folder' \ No newline at end of file From e6d701b038545fbdba72d7d968776bcb0f5f7356 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 15:02:18 +0530 Subject: [PATCH 0137/1519] refactor: Use clear_website_cache instead of clear_cache --- frappe/cache_manager.py | 2 +- frappe/commands/utils.py | 4 ++-- frappe/installer.py | 2 +- frappe/migrate.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/cache_manager.py b/frappe/cache_manager.py index 516f13de39..6b937731b0 100644 --- a/frappe/cache_manager.py +++ b/frappe/cache_manager.py @@ -55,7 +55,7 @@ def clear_domain_cache(user=None): cache.delete_value(domain_cache_keys) def clear_global_cache(): - from frappe.website.utils import clear_cache as clear_website_cache + from frappe.website.utils import clear_website_cache clear_doctype_cache() clear_website_cache() diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index a6937a5dc4..b45f36ad0b 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -69,7 +69,7 @@ def watch(apps=None): def clear_cache(context): "Clear cache, doctype cache and defaults" import frappe.sessions - from frappe.website.utils import clear_cache as clear_website_cache + from frappe.website.utils import clear_website_cache from frappe.desk.notifications import clear_notifications for site in context.sites: try: @@ -86,7 +86,7 @@ def clear_cache(context): @pass_context def clear_website_cache(context): "Clear website cache" - from frappe.website.utils import clear_cache as clear_website_cache + from frappe.website.utils import clear_website_cache for site in context.sites: try: frappe.init(site=site) diff --git a/frappe/installer.py b/frappe/installer.py index 138d5abc1b..b81d0a03b4 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -282,7 +282,7 @@ def remove_app(app_name, dry_run=False, yes=False, no_backup=False, force=False) def post_install(rebuild_website=False): - from frappe.website.utils import clear_cache as clear_website_cache + from frappe.website.utils import clear_website_cache if rebuild_website: clear_website_cache() diff --git a/frappe/migrate.py b/frappe/migrate.py index 0fe7c2e034..ada0860ae4 100644 --- a/frappe/migrate.py +++ b/frappe/migrate.py @@ -15,7 +15,7 @@ from frappe.utils.connections import check_connection from frappe.utils.dashboard import sync_dashboards from frappe.cache_manager import clear_global_cache from frappe.desk.notifications import clear_notifications -from frappe.website.utils import clear_cache as clear_website_cache +from frappe.website.utils import clear_website_cache from frappe.core.doctype.language.language import sync_languages from frappe.modules.utils import sync_customizations from frappe.core.doctype.scheduled_job_type.scheduled_job_type import sync_jobs From 78206bea8fb2894138f0c9b6076c2cedf976c827 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 25 May 2021 16:39:48 +0530 Subject: [PATCH 0138/1519] test: Clear hook cache after updating hook --- frappe/tests/test_website.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 6b9530a8ce..69425cdc45 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -146,9 +146,6 @@ class TestWebsite(unittest.TestCase): }) website_settings.save() - frappe.cache().delete_key('app_hooks') - frappe.cache().delete_key('website_redirects') - set_request(method='GET', path='/testfrom') response = get_response() self.assertEqual(response.status_code, 301) @@ -190,3 +187,5 @@ def set_home_page_hook(key, value): delattr(hooks, hook) setattr(hooks, key, value) + frappe.cache().delete_key('app_hooks') + From 3112d6d8431a6aa60d126fce23b892288769f61d Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 25 May 2021 20:42:55 +0530 Subject: [PATCH 0139/1519] fix: Sidebar Child Item Draggable & minor fixes --- .../internal_wiki_page/internal_wiki_page.py | 6 +- frappe/public/icons/timeless/symbol-defs.svg | 3 + frappe/public/js/frappe/views/wiki.js | 168 ++++++++---------- frappe/public/scss/desk/wiki.scss | 19 +- package.json | 2 +- yarn.lock | 8 +- 6 files changed, 104 insertions(+), 102 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 3fba588343..a53473e1fe 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -35,10 +35,12 @@ def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, doc.save() if json.loads(sb_items): - for d in json.loads(sb_items): + for seq, d in enumerate(json.loads(sb_items)): doc = frappe.get_doc('Internal Wiki Page', d.get('name')) - doc.sequence_id = d.get('sequence_id') + doc.sequence_id = seq + 1 + doc.parent_page = d.get('parent_page') or "" doc.save() + doc.title = title if json.loads(deleted_pages): for d in json.loads(deleted_pages): diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 5e52336bfa..87d80eef03 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -57,6 +57,9 @@ + + + diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 22036a8d2d..b0ec3c1882 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -86,11 +86,25 @@ frappe.views.Wiki = class Wiki { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); } - let sidebar_section = $(`
    `); + let sidebar_section = $(`
    `); + this.prepare_sidebar(items, sidebar_section, this.sidebar); + } - const get_sidebar_item = function (item) { + prepare_sidebar(items, child_container, item_container) { + items.forEach(item => this.append_item(item, child_container)); + child_container.appendTo(item_container); + } + + append_item(item, container) { + let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()) || item.name == this.new_page; + if (is_current_page) { + item.selected = true; + this.current_page_name = item.name; + } + + const item_container = function (item) { return $(` -
    +
    -
    `); }; - const make_sidebar_category_item = item => { - if (item.name == this.get_page_to_show()) { - item.selected = true; - this.current_page_name = item.name; - } + let $item_container = item_container(item); + let sidebar_control = $item_container.find('.sidebar-item-control'); - const get_child_item = function (item) { - return $(` -
    -
    - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
    -
    -
    - `); - }; - - const make_sidebar_child_item = item => { + this.add_sidebar_actions(item, sidebar_control); - if (frappe.router.slug(item.name) == this.get_page_to_show() || item.name == this.new_page) { - child_item_section.classList.toggle("hidden"); - } + let child_items = this.all_pages.filter(page => page.parent_page == item.name); + if (child_items.length > 0) { + let child_container = $(``); + this.prepare_sidebar(child_items, child_container, $item_container); + } - let $child_item = get_child_item(item); - let sidebar_control = $child_item.find('.sidebar-item-control'); - this.add_sidebar_actions(item, sidebar_control); - $child_item.appendTo(child_item_section); - this.sidebar_items[item.name] = $child_item; - }; + $item_container.appendTo(container); + this.sidebar_items[item.name] = $item_container; - let $item = get_sidebar_item(item); - let sidebar_control = $item.find('.sidebar-item-control'); - this.add_sidebar_actions(item, sidebar_control); - let $drop_icon = $(``); - $drop_icon.appendTo(sidebar_control); - let drop_icon = $item.find('.drop-icon').get(0); - let child_item_section = $item.find('.sidebar-child-item').get(0); - if (this.all_pages.some(e => e.parent_page == item.name)) { - drop_icon.classList.remove('hidden'); - drop_icon.addEventListener('click', () => { - child_item_section.classList.toggle("hidden"); - }); - } + if ($item_container.parent().hasClass('hidden') && is_current_page) { + $item_container.parent().toggleClass('hidden'); + } - let child_items = this.all_pages.filter(page => page.parent_page == item.name); - child_items.forEach(item => make_sidebar_child_item(item)); - - $item.appendTo(sidebar_section); - this.sidebar_items[item.name] = $item; - }; - - items.forEach(item => make_sidebar_category_item(item)); - - sidebar_section.appendTo(this.sidebar); + let $drop_icon = $(``); + $drop_icon.appendTo(sidebar_control); + let drop_icon = $item_container.find('.drop-icon').get(0); + let child_item_section = $item_container.find('.sidebar-child-item').get(0); + if (this.all_pages.some(e => e.parent_page == item.name)) { + drop_icon.classList.remove('hidden'); + drop_icon.addEventListener('click', () => { + child_item_section.classList.toggle("hidden"); + let icon = $(drop_icon).find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $(drop_icon).find("use").attr("href", icon); + }); + } } show() { @@ -275,6 +258,7 @@ frappe.views.Wiki = class Wiki { .then(() => { this.undo = new Undo({ editor: this.editor }); this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.readOnly = false; this.setup_customization_buttons(); this.show_sidebar_actions(); this.make_sidebar_sortable(); @@ -334,27 +318,28 @@ frappe.views.Wiki = class Wiki { make_sidebar_sortable() { let me = this; - this.sidebar_sortable = Sortable.create(this.page.sidebar.find(".standard-sidebar-section").get(0), { - handle: ".drag-handle", - draggable: ".standard-sidebar-item-container", - animation: 150, - onEnd: function (evt) { - let new_sb_items = []; - let old_sb_items = me.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - for (let page of evt.srcElement.childNodes) { - new_sb_items.push({ - name: page.attributes['item-name'].value, - sequence_id: parseInt(page.attributes['item-sequence'].value) - }); - } - me.sorted_sidebar_items = []; - new_sb_items.forEach((old, index) => { - if (old.sequence_id != old_sb_items[index].sequence_id) { - old.sequence_id = old_sb_items[index].sequence_id; - me.sorted_sidebar_items.push(old); + $('.nested-container').each( function() { + new Sortable(this, { + handle: ".drag-handle", + draggable: ".sidebar-item-container", + group: 'nested', + animation: 150, + fallbackOnBody: true, + swapThreshold: 0.65, + onEnd: function (evt) { + me.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + me.sorted_sidebar_items.push({ + name: page.attributes['item-name'].value, + parent_page: parent_page + }); } - }); - } + } + }); }); } @@ -383,11 +368,10 @@ frappe.views.Wiki = class Wiki { () => { this.page.clear_primary_action(); this.page.clear_secondary_action(); + this.undo.readOnly = true; this.save_page(); this.editor.readOnly.toggle(); this.isReadOnly = true; - this.page_sortable.option("disabled", true); - this.sidebar_sortable.option("disabled", true); }, null, __("Saving") @@ -400,8 +384,6 @@ frappe.views.Wiki = class Wiki { this.page.clear_secondary_action(); this.editor.readOnly.toggle(); this.isReadOnly = true; - this.page_sortable.option("disabled", true); - this.sidebar_sortable.option("disabled", true); this.deleted_sidebar_items = []; this.reload(); frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); @@ -413,8 +395,17 @@ frappe.views.Wiki = class Wiki { const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ - { label: __('Title'), fieldtype: 'Data', fieldname: 'title'}, - { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', options: this.all_pages.map(pages => pages.name)} + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title' + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: this.all_pages.filter(page => !page.parent_page).map(page => page.name) + } ], primary_action_label: __('Create'), primary_action: (values) => { @@ -439,7 +430,6 @@ frappe.views.Wiki = class Wiki { } this.make_sidebar_sortable(); this.make_blocks_sortable(); - this.dirty = false; }); } }); @@ -447,7 +437,6 @@ frappe.views.Wiki = class Wiki { } initialize_editorjs(blocks) { - this.dirty = false; const data = { blocks: blocks || [] }; @@ -456,9 +445,6 @@ frappe.views.Wiki = class Wiki { autofocus: false, data, tunes: ['spacingTune'], - onChange: () => { - this.dirty = true; - }, readOnly: true, logLevel: 'ERROR' }); @@ -516,6 +502,6 @@ frappe.views.Wiki = class Wiki { reload() { this.setup_wiki_pages(); - this.dirty = false; + this.undo.readOnly = true; } }; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index cb911611d8..e9dcb63c4e 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -14,8 +14,11 @@ .standard-sidebar-item { justify-content: space-between; + padding: 0px; .sidebar-item-control { + margin-right: 8px; + > * { align-self: center; margin-left: 3px; @@ -32,6 +35,11 @@ display: none; } + .drop-icon { + padding: 10px 12px 10px 0px; + margin-right: -8px; + } + svg { margin-right: 0; } @@ -44,15 +52,18 @@ .item-anchor { display: flex; overflow: hidden; + padding: 8px 0px 8px 12px; flex: 1; } } - .sidebar-child-item-container { - margin-left: 10px; + .sidebar-item-container { + .sidebar-item-container{ + margin-left: 10px; - .standard-sidebar-item { - justify-content: start; + .standard-sidebar-item { + justify-content: start; + } } } diff --git a/package.json b/package.json index 17f5a7b588..7a54c81149 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "@editorjs/list": "^1.6.2", "babel-runtime": "^6.26.0", "chalk": "^2.3.2", - "editorjs-undo": "^0.1.5", + "editorjs-undo": "^0.1.6", "graphlib": "^2.1.8", "less": "^3.11.1", "rollup": "^1.2.2", diff --git a/yarn.lock b/yarn.lock index 8d0b04c622..0c3909dfb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2265,10 +2265,10 @@ "jsbn" "~0.1.0" "safer-buffer" "^2.1.0" -"editorjs-undo@^0.1.5": - "integrity" "sha512-+qRmTe7Asn9KrsYHMCtNQi6rCBa+qrinJx/p7/Hj8K62HFzhMEuy7aMRbADd/KqcV2AsPVzgCj3PMHPmb6ZAkA==" - "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.5.tgz" - "version" "0.1.5" +"editorjs-undo@^0.1.6": + "integrity" "sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw==" + "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" + "version" "0.1.6" "ee-first@1.1.1": "integrity" "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" From 646612be09439eed5d05a3d66ac081553f139733 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 26 May 2021 10:40:16 +0530 Subject: [PATCH 0140/1519] fix: Colocated asset load --- frappe/templates/test/_test_base.html | 13 ++++++++++++- frappe/website/doctype/web_page/test_web_page.py | 15 ++++++--------- frappe/website/page_renderers/template_page.py | 6 ++++-- frappe/www/_test/_test_folder/_test_page.css | 3 +++ frappe/www/_test/_test_folder/_test_page.js | 1 + 5 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 frappe/www/_test/_test_folder/_test_page.css create mode 100644 frappe/www/_test/_test_folder/_test_page.js diff --git a/frappe/templates/test/_test_base.html b/frappe/templates/test/_test_base.html index a0b1a83c97..5a88584a5d 100644 --- a/frappe/templates/test/_test_base.html +++ b/frappe/templates/test/_test_base.html @@ -1,8 +1,19 @@ - + + {%- block style %} + {% if colocated_css -%} + + {%- endif %} + {%- endblock -%} +

    This is for testing

    {% block content %}{% endblock %} + {%- block script %} + {% if colocated_js -%} + + {%- endif %} + {%- endblock %} diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index b9bd425781..b5da51cca6 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -104,18 +104,15 @@ class TestWebPage(unittest.TestCase): self.assertTrue('Next: Test Toc' \ in frappe.as_unicode(content)) - def test_meta_tags(self): - pass + def test_colocated_assets(self): + content = get_response_content('/_test/_test_folder/_test_page') + self.assertTrue("" \ + in frappe.as_unicode(content)) + self.assertTrue("background-color: var(--bg-color);" \ + in frappe.as_unicode(content)) def test_breadcrumbs(self): pass def test_downloadable_file(self): pass - - - - -# breadcrumb -# validate -# page context caching diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index d8032c6b9c..682c3cda39 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -42,6 +42,7 @@ class TemplatePage(BaseTemplatePage): if os.path.exists(file_path) and not os.path.isdir(file_path): self.app = app self.app_path = app_path + self.basename = os.path.splitext(file_path)[0] self.template_path = os.path.relpath(file_path, self.app_path) self.basepath = os.path.dirname(file_path) return @@ -110,6 +111,7 @@ class TemplatePage(BaseTemplatePage): def update_context(self): self.context.base_template = self.context.base_template or get_base_template(self.path) self.context.basepath = self.basepath + self.context.basename = self.basename self.context.path = self.path self.set_page_properties() self.set_properties_from_source() @@ -197,11 +199,11 @@ class TemplatePage(BaseTemplatePage): def load_colocated_files(self): '''load co-located css/js files with the same name''' - js_path = self.basepath + '.js' + js_path = self.basename + '.js' if os.path.exists(js_path) and '{% block script %}' not in self.source: self.context.colocated_js = self.get_colocated_file(js_path) - css_path = self.basepath + '.css' + css_path = self.basename + '.css' if os.path.exists(css_path) and '{% block style %}' not in self.source: self.context.colocated_css = self.get_colocated_file(css_path) diff --git a/frappe/www/_test/_test_folder/_test_page.css b/frappe/www/_test/_test_folder/_test_page.css new file mode 100644 index 0000000000..e42b809085 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.css @@ -0,0 +1,3 @@ +body { + background-color: var(--bg-color); +} \ No newline at end of file diff --git a/frappe/www/_test/_test_folder/_test_page.js b/frappe/www/_test/_test_folder/_test_page.js new file mode 100644 index 0000000000..6e0c1f3a87 --- /dev/null +++ b/frappe/www/_test/_test_folder/_test_page.js @@ -0,0 +1 @@ +console.log('test data'); \ No newline at end of file From 40bd818c0b6e29c3b682db45fe083d1abd60d42c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 26 May 2021 10:40:43 +0530 Subject: [PATCH 0141/1519] test: Add attributes via frontmatter --- frappe/www/_test/_test_folder/_test_toc.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/www/_test/_test_folder/_test_toc.md b/frappe/www/_test/_test_folder/_test_toc.md index 8d05b120a5..02cc3c82be 100644 --- a/frappe/www/_test/_test_folder/_test_toc.md +++ b/frappe/www/_test/_test_folder/_test_toc.md @@ -1,3 +1,13 @@ +--- +title: Test TOC +add_breadcrumbs: 1 +show_sidebar: 0 + +metatags: + description: Test Description. + keywords: Frappe Framework. +--- + # Level 1 ## Level 1.1 From e19c18e5a9840ed68c4c29ccf5ecb09df03af137 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 26 May 2021 11:03:33 +0530 Subject: [PATCH 0142/1519] refactor: Move context value setting code to a separate function --- frappe/website/page_renderers/template_page.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 682c3cda39..2b326d7383 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -45,6 +45,8 @@ class TemplatePage(BaseTemplatePage): self.basename = os.path.splitext(file_path)[0] self.template_path = os.path.relpath(file_path, self.app_path) self.basepath = os.path.dirname(file_path) + self.filename = os.path.basename(file_path) + self.name = os.path.splitext(self.filename)[0] return def can_render(self): @@ -109,10 +111,6 @@ class TemplatePage(BaseTemplatePage): self.convert_from_markdown() def update_context(self): - self.context.base_template = self.context.base_template or get_base_template(self.path) - self.context.basepath = self.basepath - self.context.basename = self.basename - self.context.path = self.path self.set_page_properties() self.set_properties_from_source() self.load_colocated_files() @@ -138,8 +136,15 @@ class TemplatePage(BaseTemplatePage): self.context[prop] = getattr(self.pymodule, prop) def set_page_properties(self): + self.context.base_template = self.context.base_template \ + or get_base_template(self.path) \ + or 'templates/web.html' + self.context.basepath = self.basepath + self.context.basename = self.basename + self.context.name = self.name + self.context.path = self.path + self.context.route = self.path self.context.template = self.template_path - self.context.base_template = self.context.base_template or 'templates/web.html' def set_properties_from_source(self): if not self.source: From 38fdfc369a1a1dd0b22bda2f2eb03e10543e2b6a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 26 May 2021 11:51:12 +0530 Subject: [PATCH 0143/1519] test: Use assertIn for better error message --- .../website/doctype/web_page/test_web_page.py | 41 ++++++++++--------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index b5da51cca6..d213fd57a8 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -28,10 +28,10 @@ class TestWebPage(unittest.TestCase): content = get_page_content('/_test/_test_custom_base.html') # assert the text in base template is rendered - self.assertTrue('

    This is for testing

    ' in frappe.as_unicode(content)) + self.assertIn('

    This is for testing

    ', frappe.as_unicode(content)) # assert template block rendered - self.assertTrue('

    Test content

    ' in frappe.as_unicode(content)) + self.assertIn('

    Test content

    ', frappe.as_unicode(content)) def test_content_type(self): web_page = frappe.get_doc(dict( @@ -44,15 +44,15 @@ class TestWebPage(unittest.TestCase): main_section_html = '
    html content
    ' )).insert() - self.assertTrue('rich text' in get_page_content('/test-content-type')) + self.assertIn('rich text', get_page_content('/test-content-type')) web_page.content_type = 'Markdown' web_page.save() - self.assertTrue('markdown content' in get_page_content('/test-content-type')) + self.assertIn('markdown content', get_page_content('/test-content-type')) web_page.content_type = 'HTML' web_page.save() - self.assertTrue('html content' in get_page_content('/test-content-type')) + self.assertIn('html content', get_page_content('/test-content-type')) web_page.delete() @@ -70,46 +70,47 @@ class TestWebPage(unittest.TestCase): try: content = get_page_content('/doctype-view/DocField') - self.assertTrue('
    DocField
    ' in content) + self.assertIn('
    DocField
    ', content) finally: web_page.delete() def test_custom_base_template_path(self): content = get_response_content('/_test/_test_folder/_test_page') # assert the text in base template is rendered - self.assertTrue('

    This is for testing

    ' in frappe.as_unicode(content)) + self.assertIn('

    This is for testing

    ', frappe.as_unicode(content)) # assert template block rendered - self.assertTrue('

    Test content

    ' in frappe.as_unicode(content)) + self.assertIn('

    Test content

    ', frappe.as_unicode(content)) def test_json_sidebar_data(self): frappe.flags.look_for_sidebar = False content = get_response_content('/_test/_test_folder/_test_page') - self.assertTrue('Test Sidebar' not in frappe.as_unicode(content)) + self.assertNotIn('Test Sidebar', frappe.as_unicode(content)) frappe.flags.look_for_sidebar = True content = get_response_content('/_test/_test_folder/_test_page') - self.assertTrue('Test Sidebar' in frappe.as_unicode(content)) + self.assertIn('Test Sidebar', frappe.as_unicode(content)) frappe.flags.look_for_sidebar = False def test_index_and_next_comment(self): content = get_response_content('/_test/_test_folder') # test if {index} was rendered - self.assertTrue(' Test Page' \ - in frappe.as_unicode(content)) - self.assertTrue(' Test Toc' \ - in frappe.as_unicode(content)) + self.assertIn(' Test Page', + frappe.as_unicode(content)) + + self.assertIn('Test TOC', + frappe.as_unicode(content)) content = get_response_content('/_test/_test_folder/_test_page') # test if {next} was rendered - self.assertTrue('Next: Test Toc' \ - in frappe.as_unicode(content)) + self.assertIn('Next: Test TOC', + frappe.as_unicode(content)) def test_colocated_assets(self): content = get_response_content('/_test/_test_folder/_test_page') - self.assertTrue("" \ - in frappe.as_unicode(content)) - self.assertTrue("background-color: var(--bg-color);" \ - in frappe.as_unicode(content)) + self.assertIn("", + frappe.as_unicode(content)) + self.assertIn("background-color: var(--bg-color);", + frappe.as_unicode(content)) def test_breadcrumbs(self): pass From 33a97196e141e42bf99116f336fe8f65c7672a30 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 26 May 2021 11:51:34 +0530 Subject: [PATCH 0144/1519] fix: Init page properties in webpage --- frappe/website/page_renderers/web_page.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/website/page_renderers/web_page.py b/frappe/website/page_renderers/web_page.py index 5c3807c0ee..6e738e8df9 100644 --- a/frappe/website/page_renderers/web_page.py +++ b/frappe/website/page_renderers/web_page.py @@ -8,6 +8,9 @@ class WebPage(object): path = frappe.local.request.path self.path = path.strip('/ ') self.basepath = '' + self.basename = '' + self.name = '' + self.route = '' def can_render(self): pass From cb5543665fc7b1e1a658e60601f1b4178d84bfda Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 26 May 2021 18:27:26 +0530 Subject: [PATCH 0145/1519] fix: minor fixes --- .../internal_wiki_page/internal_wiki_page.py | 6 +- frappe/public/js/frappe/views/wiki.js | 95 +++++++++++++------ 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index a53473e1fe..6be92f835d 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -11,10 +11,8 @@ from frappe.model.document import Document class InternalWikiPage(Document): def before_insert(self): - if frappe.db.count('Internal Wiki Page') == 0: - self.sequence_id = 1 - else: - self.sequence_id = frappe.get_last_doc('Internal Wiki Page').sequence_id + 1 + sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) + self.sequence_id = max([page.sequence_id for page in sequence_id_list]) + 1 @frappe.whitelist() def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index b0ec3c1882..955476861b 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -10,12 +10,10 @@ frappe.views.Wiki = class Wiki { this.sidebar_items = {}; this.sorted_sidebar_items = []; this.deleted_sidebar_items = []; - this.tools = {}; this.isReadOnly = true; this.new_page = null; this.prepare_container(); this.setup_wiki_pages(); - this.tools = { header: { class: frappe.wiki_block.blocks['header'], @@ -63,16 +61,16 @@ frappe.views.Wiki = class Wiki { if (this.all_pages) { frappe.wiki_pages = {}; let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - for (let page of this.all_pages || []) { + for (let page of this.all_pages) { frappe.wiki_pages[frappe.router.slug(page.name)] = page; } + if (this.new_page) { + frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); + this.new_page = null; + } this.make_sidebar(root_pages); + frappe.router.route(); } - if (this.new_page) { - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); - this.new_page = null; - } - frappe.router.route(); }); } @@ -96,30 +94,13 @@ frappe.views.Wiki = class Wiki { } append_item(item, container) { - let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()) || item.name == this.new_page; + let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()); if (is_current_page) { item.selected = true; this.current_page_name = item.name; } - const item_container = function (item) { - return $(` -
    -
    - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
    -
    -
    - `); - }; - - let $item_container = item_container(item); + let $item_container = this.sidebar_item_container(item); let sidebar_control = $item_container.find('.sidebar-item-control'); this.add_sidebar_actions(item, sidebar_control); @@ -151,6 +132,23 @@ frappe.views.Wiki = class Wiki { } } + sidebar_item_container(item) { + return $(` +
    +
    + + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
    +
    +
    + `); + } + show() { if (!this.all_pages) { // pages not yet loaded, call again after a bit @@ -256,9 +254,7 @@ frappe.views.Wiki = class Wiki { this.editor.readOnly.toggle(); this.editor.isReady .then(() => { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); - this.undo.readOnly = false; + this.initialize_editorjs_undo(); this.setup_customization_buttons(); this.show_sidebar_actions(); this.make_sidebar_sortable(); @@ -272,6 +268,12 @@ frappe.views.Wiki = class Wiki { }); } + initialize_editorjs_undo() { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.readOnly = false; + } + show_sidebar_actions() { this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } @@ -326,7 +328,7 @@ frappe.views.Wiki = class Wiki { animation: 150, fallbackOnBody: true, swapThreshold: 0.65, - onEnd: function (evt) { + onEnd: function () { me.sorted_sidebar_items = []; for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { let parent_page = ""; @@ -410,6 +412,7 @@ frappe.views.Wiki = class Wiki { primary_action_label: __('Create'), primary_action: (values) => { d.hide(); + this.initialize_editorjs_undo(); this.setup_customization_buttons(); this.title = values.title; this.parent = values.parent; @@ -428,6 +431,8 @@ frappe.views.Wiki = class Wiki { this.isReadOnly = false; this.editor.readOnly.toggle(); } + this.add_page_to_sidebar(values); + this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); }); @@ -436,6 +441,32 @@ frappe.views.Wiki = class Wiki { d.show(); } + add_page_to_sidebar({title, parent}) { + let $sidebar = $('.standard-sidebar-section'); + let item = { + name: title, + parent_page: parent, + }; + let $sidebar_item = this.sidebar_item_container(item); + + this.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $sidebar_item.find('.sidebar-item-control') + ); + + if (!parent) { + $sidebar_item.appendTo($sidebar); + } else { + let $child_section = $sidebar.find(`[item-name="${parent}"] .sidebar-child-item`); + $sidebar_item.appendTo($child_section); + $child_section.removeClass('hidden'); + } + } + initialize_editorjs(blocks) { const data = { blocks: blocks || [] @@ -456,6 +487,8 @@ frappe.views.Wiki = class Wiki { if (!this.title && this.current_page_name) { this.title = this.current_page_name; save = ''; + } else { + this.current_page_name = this.title; } let me = this; this.editor.save().then((outputData) => { From d7af6173e742be615187728bc248fd8b243d41d7 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 27 May 2021 12:08:55 +0530 Subject: [PATCH 0146/1519] fix: new child page not visible fix --- frappe/public/js/desk.bundle.js | 3 + frappe/public/js/frappe/views/wiki.js | 31 +- yarn.lock | 1685 +++++++++---------------- 3 files changed, 624 insertions(+), 1095 deletions(-) diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 66eb72cda0..0f75ae2d6a 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -67,6 +67,7 @@ import "./frappe/views/container.js"; import "./frappe/views/breadcrumbs.js"; import "./frappe/views/factory.js"; import "./frappe/views/pageview.js"; +import "./frappe/views/wiki.js"; import "./frappe/ui/toolbar/awesome_bar.js"; // import "./frappe/ui/toolbar/energy_points_notifications.js"; @@ -85,6 +86,8 @@ import "./frappe/views/workspace/workspace.js"; import "./frappe/widgets/widget_group.js"; +import "./frappe/wiki_blocks/blocks.js"; + import "./frappe/ui/sort_selector.html"; import "./frappe/ui/sort_selector.js"; diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 955476861b..a0635f5494 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -118,16 +118,20 @@ frappe.views.Wiki = class Wiki { $item_container.parent().toggleClass('hidden'); } - let $drop_icon = $(``); - $drop_icon.appendTo(sidebar_control); - let drop_icon = $item_container.find('.drop-icon').get(0); - let child_item_section = $item_container.find('.sidebar-child-item').get(0); + this.add_drop_icon(item, sidebar_control, $item_container); + } + + add_drop_icon(item, sidebar_control, $item_container) { + let $child_item_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $(``) + .appendTo(sidebar_control); + if (this.all_pages.some(e => e.parent_page == item.name)) { - drop_icon.classList.remove('hidden'); - drop_icon.addEventListener('click', () => { - child_item_section.classList.toggle("hidden"); - let icon = $(drop_icon).find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; - $(drop_icon).find("use").attr("href", icon); + $drop_icon.removeClass('hidden'); + $drop_icon.on('click', () => { + let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $drop_icon.find("use").attr("href", icon); + $child_item_section.toggleClass("hidden"); }); } } @@ -461,7 +465,14 @@ frappe.views.Wiki = class Wiki { if (!parent) { $sidebar_item.appendTo($sidebar); } else { - let $child_section = $sidebar.find(`[item-name="${parent}"] .sidebar-child-item`); + let $item_container = $sidebar.find(`[item-name="${parent}"]`); + let $child_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $item_container.find('.drop-icon'); + if (!$child_section[0]) { + $child_section = $(``) + .appendTo($item_container); + $drop_icon.toggleClass('hidden'); + } $sidebar_item.appendTo($child_section); $child_section.removeClass('hidden'); } diff --git a/yarn.lock b/yarn.lock index d902fedd10..04e2d35012 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,156 +2,120 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0": - "integrity" "sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==" - "resolved" "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0.tgz" - "version" "7.0.0" - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/highlight@^7.0.0": - "integrity" "sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==" - "resolved" "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0.tgz" - "version" "7.0.0" - dependencies: - "chalk" "^2.0.0" - "esutils" "^2.0.2" - "js-tokens" "^4.0.0" - -"@babel/runtime@^7.0.0-beta.46": - "integrity" "sha512-IvfvnMdSaLBateu0jfsYIpZTxAc2cKEXEMiezGGN75QcBcecDUKd3PgLAncT0oOgxKy8dd8hrJKj9MfzgfZd6g==" - "resolved" "https://registry.npmjs.org/@babel/runtime/-/runtime-7.3.4.tgz" - "version" "7.3.4" - dependencies: - "regenerator-runtime" "^0.12.0" - -"@dabh/diagnostics@^2.0.2": - "integrity" "sha512-+A1YivoVDNNVCdfozHSR8v/jyuuLTMXwjWuxPFlFlUapXoGc+Gj9mDlTDDfrwl7rXCl2tNZ0kE8sIBO6YOn96Q==" - "resolved" "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.2.tgz" - "version" "2.0.2" - dependencies: - "colorspace" "1.1.x" - "enabled" "2.0.x" - "kuler" "^2.0.0" +"@assemblyscript/loader@^0.10.1": + version "0.10.1" + resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06" + integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg== "@deepcode/dcignore@^1.0.2": - "integrity" "sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg==" - "resolved" "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" - "version" "1.0.2" + version "1.0.2" + resolved "https://registry.npmjs.org/@deepcode/dcignore/-/dcignore-1.0.2.tgz" + integrity sha512-DPgxtHuJwBORpqRkPXzzOT+uoPRVJmaN7LR+pmeL6DQM90kj6G6GFUH1i/YpRH8NbML8ZGEDwB9f9u4UwD2pzg== "@editorjs/checklist@^1.3.0": - "integrity" "sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q==" - "resolved" "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" - "version" "1.3.0" + version "1.3.0" + resolved "https://registry.npmjs.org/@editorjs/checklist/-/checklist-1.3.0.tgz" + integrity sha512-087oW0oOIE5HX8llj4Eap/reFDFw8VCLlp6GU0E9GEp7f3zy2aV6KdFR+6dbYhZ50w7tSnkMpCAcSq1NXJeB4Q== "@editorjs/editorjs@^2.20.0": - "integrity" "sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw==" - "resolved" "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" - "version" "2.20.0" + version "2.20.0" + resolved "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.20.0.tgz" + integrity sha512-e6DWi8bMypFhovq9R6cefaDWVfrlVU++Q7ABp79+MxZIuC/SKAW5EtxBbKPL22H/Mc3bJIhZCxOqEl70HBh2yw== dependencies: - "codex-notifier" "^1.1.2" - "codex-tooltip" "^1.0.1" + codex-notifier "^1.1.2" + codex-tooltip "^1.0.1" "@editorjs/header@^2.6.1": - "integrity" "sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA==" - "resolved" "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" - "version" "2.6.1" + version "2.6.1" + resolved "https://registry.npmjs.org/@editorjs/header/-/header-2.6.1.tgz" + integrity sha512-EsnyVFv5uThpU9tbQ/dUPFCQoa/sBFy2n+9tN3wOXJGx7sjea4fdcacJ2UYhO+7pCgZ+aSgmMOyGLYHUFbchvA== "@editorjs/list@^1.6.2": - "integrity" "sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw==" - "resolved" "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" - "version" "1.6.2" + version "1.6.2" + resolved "https://registry.npmjs.org/@editorjs/list/-/list-1.6.2.tgz" + integrity sha512-OxowV0yuE11G01czYM1dEQlz1F37ehX0ak5vAbZ9ncSXrPh0fDRw/fBxTY654FlmrsQ40UFom3owSG++tLvVGw== "@nodelib/fs.scandir@2.1.4": - "integrity" "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" - "version" "2.1.4" + version "2.1.4" + resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz" + integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== dependencies: "@nodelib/fs.stat" "2.0.4" - "run-parallel" "^1.1.9" + run-parallel "^1.1.9" -"@nodelib/fs.stat@^2.0.2", "@nodelib/fs.stat@2.0.4": - "integrity" "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" - "version" "2.0.4" +"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": + version "2.0.4" + resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz" + integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== "@nodelib/fs.walk@^1.2.3": - "integrity" "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==" - "resolved" "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" - "version" "1.2.6" + version "1.2.6" + resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz" + integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== dependencies: "@nodelib/fs.scandir" "2.1.4" - "fastq" "^1.6.0" + fastq "^1.6.0" "@octetstream/promisify@2.0.2": - "integrity" "sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg==" - "resolved" "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" - "version" "2.0.2" + version "2.0.2" + resolved "https://registry.npmjs.org/@octetstream/promisify/-/promisify-2.0.2.tgz" + integrity sha512-7XHoRB61hxsz8lBQrjC1tq/3OEIgpvGWg6DKAdwi7WRzruwkmsdwmOoUXbU4Dtd4RSOMDwed0SkP3y8UlMt1Bg== "@open-policy-agent/opa-wasm@^1.2.0": - "integrity" "sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ==" - "resolved" "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" - "version" "1.2.0" + version "1.2.0" + resolved "https://registry.npmjs.org/@open-policy-agent/opa-wasm/-/opa-wasm-1.2.0.tgz" + integrity sha512-CtUBTnzvDrT0NASa8IuGQTxFGgt2vxbLnMYuTA+uDFxOcA4uK4mGFgrhHJtxUZnWHiwemOvKKSY3BMCo7qiAsQ== dependencies: - "sprintf-js" "^1.1.2" - "utf8" "^3.0.0" + sprintf-js "^1.1.2" + utf8 "^3.0.0" "@sindresorhus/is@^0.14.0": - "integrity" "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==" - "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" - "version" "0.14.0" + version "0.14.0" + resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz" + integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ== "@sindresorhus/is@^2.1.1": - "integrity" "sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==" - "resolved" "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" - "version" "2.1.1" + version "2.1.1" + resolved "https://registry.npmjs.org/@sindresorhus/is/-/is-2.1.1.tgz" + integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg== -"@snyk/cli-interface@^2.0.3": - "integrity" "sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" - "version" "2.3.2" - dependencies: - "tslib" "^1.9.3" - -"@snyk/cli-interface@^2.11.0", "@snyk/cli-interface@2.11.0": - "integrity" "sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" - "version" "2.11.0" +"@snyk/cli-interface@2.11.0", "@snyk/cli-interface@^2.11.0": + version "2.11.0" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.11.0.tgz" + integrity sha512-T3xfDqrEFKclHGdJx4/5+D5F7e76/99f33guE4RTlVITBhy7VVnjz4t/NDr3UYqcC0MgAmiC4bSVYHnlshuwJw== dependencies: "@types/graphlib" "^2" -"@snyk/cli-interface@^2.9.1": - "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" - "version" "2.9.2" +"@snyk/cli-interface@^2.0.3": + version "2.3.2" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz" + integrity sha512-jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg== dependencies: - "@snyk/dep-graph" "1.19.4" - "@types/graphlib" "^2.1.7" - "tslib" "^1.9.3" + tslib "^1.9.3" -"@snyk/cli-interface@^2.9.2": - "integrity" "sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng==" - "resolved" "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" - "version" "2.9.2" +"@snyk/cli-interface@^2.9.1", "@snyk/cli-interface@^2.9.2": + version "2.9.2" + resolved "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.9.2.tgz" + integrity sha512-C64bGtcQbh7941l7qgXFJ+FJIZdQtBHkPhKfGtUlCCMbC0FK0oaUmp6d7YPQxT4dEnkQdtlBT/eA2F6qIKbEng== dependencies: "@snyk/dep-graph" "1.19.4" "@types/graphlib" "^2.1.7" - "tslib" "^1.9.3" + tslib "^1.9.3" "@snyk/cocoapods-lockfile-parser@3.6.2": - "integrity" "sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA==" - "resolved" "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" - "version" "3.6.2" + version "3.6.2" + resolved "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.6.2.tgz" + integrity sha512-ca2JKOnSRzYHJkhOB9gYmdRZHmd02b/uBd/S0D5W+L9nIMS7sUBV5jfhKwVgrYPIpVNIc0XCI9rxK4TfkQRpiA== dependencies: "@snyk/dep-graph" "^1.23.1" "@types/js-yaml" "^3.12.1" - "js-yaml" "^3.13.1" - "tslib" "^1.10.0" + js-yaml "^3.13.1" + tslib "^1.10.0" "@snyk/code-client@3.4.0": - "integrity" "sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg==" - "resolved" "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" - "version" "3.4.0" + version "3.4.0" + resolved "https://registry.npmjs.org/@snyk/code-client/-/code-client-3.4.0.tgz" + integrity sha512-RY2IftAiWB7tp36Mcq7WiEwqoD8A/mqrD6N7oDWTxBOIqsH0t4djo/UibiWDJotaffO9aXXndOf3iZ/kTt+Rdg== dependencies: "@deepcode/dcignore" "^1.0.2" "@snyk/fast-glob" "^3.2.6-patch" @@ -162,275 +126,263 @@ "@types/micromatch" "^4.0.1" "@types/sarif" "^2.1.3" "@types/uuid" "^8.3.0" - "axios" "^0.21.1" - "ignore" "^5.1.8" - "lodash.chunk" "^4.2.0" - "lodash.omit" "^4.5.0" - "lodash.union" "^4.6.0" - "micromatch" "^4.0.2" - "queue" "^6.0.1" - "uuid" "^8.3.2" + axios "^0.21.1" + ignore "^5.1.8" + lodash.chunk "^4.2.0" + lodash.omit "^4.5.0" + lodash.union "^4.6.0" + micromatch "^4.0.2" + queue "^6.0.1" + uuid "^8.3.2" "@snyk/composer-lockfile-parser@^1.4.1": - "integrity" "sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ==" - "resolved" "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" - "version" "1.4.1" + version "1.4.1" + resolved "https://registry.npmjs.org/@snyk/composer-lockfile-parser/-/composer-lockfile-parser-1.4.1.tgz" + integrity sha512-wNANv235j95NFsQuODIXCiQZ9kcyg9fz92Kg1zoGvaP3kN/ma7fgCnvQL/dyml6iouQJR5aZovjhrrfEFoKtiQ== dependencies: - "lodash.findkey" "^4.6.0" - "lodash.get" "^4.4.2" - "lodash.invert" "^4.3.0" - "lodash.isempty" "^4.4.0" + lodash.findkey "^4.6.0" + lodash.get "^4.4.2" + lodash.invert "^4.3.0" + lodash.isempty "^4.4.0" -"@snyk/dep-graph@^1.19.3": - "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" - "version" "1.19.4" +"@snyk/dep-graph@1.19.4", "@snyk/dep-graph@^1.19.3": + version "1.19.4" + resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" + integrity sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw== dependencies: - "graphlib" "^2.1.8" - "lodash.isequal" "^4.5.0" - "object-hash" "^2.0.3" - "semver" "^6.0.0" - "source-map-support" "^0.5.19" - "tslib" "^1.13.0" + graphlib "^2.1.8" + lodash.isequal "^4.5.0" + object-hash "^2.0.3" + semver "^6.0.0" + source-map-support "^0.5.19" + tslib "^1.13.0" -"@snyk/dep-graph@^1", "@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": - "integrity" "sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" - "version" "1.28.0" +"@snyk/dep-graph@^1.21.0", "@snyk/dep-graph@^1.23.0", "@snyk/dep-graph@^1.23.1", "@snyk/dep-graph@^1.27.1", "@snyk/dep-graph@^1.28.0": + version "1.28.0" + resolved "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.28.0.tgz" + integrity sha512-Oup9nAvb558jdNvbZah/vaBtOtCcizkdeS+OBQeBIqIffyer4mc4juSn4b1SFjCpu7AG7piio8Lj8k1B9ps6Tg== dependencies: - "event-loop-spinner" "^2.1.0" - "lodash.clone" "^4.5.0" - "lodash.constant" "^3.0.0" - "lodash.filter" "^4.6.0" - "lodash.foreach" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.isequal" "^4.5.0" - "lodash.isfunction" "^3.0.9" - "lodash.isundefined" "^3.0.1" - "lodash.keys" "^4.2.0" - "lodash.map" "^4.6.0" - "lodash.reduce" "^4.6.0" - "lodash.size" "^4.2.0" - "lodash.transform" "^4.6.0" - "lodash.union" "^4.6.0" - "lodash.values" "^4.3.0" - "object-hash" "^2.0.3" - "semver" "^7.0.0" - "tslib" "^1.13.0" - -"@snyk/dep-graph@1.19.4": - "integrity" "sha512-h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw==" - "resolved" "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.19.4.tgz" - "version" "1.19.4" - dependencies: - "graphlib" "^2.1.8" - "lodash.isequal" "^4.5.0" - "object-hash" "^2.0.3" - "semver" "^6.0.0" - "source-map-support" "^0.5.19" - "tslib" "^1.13.0" + event-loop-spinner "^2.1.0" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.isempty "^4.4.0" + lodash.isequal "^4.5.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" + object-hash "^2.0.3" + semver "^7.0.0" + tslib "^1.13.0" "@snyk/docker-registry-v2-client@1.13.9": - "integrity" "sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ==" - "resolved" "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" - "version" "1.13.9" + version "1.13.9" + resolved "https://registry.npmjs.org/@snyk/docker-registry-v2-client/-/docker-registry-v2-client-1.13.9.tgz" + integrity sha512-DIFLEhr8m1GrAwsLGInJmpcQMacjuhf3jcbpQTR+LeMvZA9IuKq+B7kqw2O2FzMiHMZmUb5z+tV+BR7+IUHkFQ== dependencies: - "needle" "^2.5.0" - "parse-link-header" "^1.0.1" - "tslib" "^1.10.0" + needle "^2.5.0" + parse-link-header "^1.0.1" + tslib "^1.10.0" "@snyk/fast-glob@^3.2.6-patch": - "integrity" "sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg==" - "resolved" "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" - "version" "3.2.6-patch" + version "3.2.6-patch" + resolved "https://registry.npmjs.org/@snyk/fast-glob/-/fast-glob-3.2.6-patch.tgz" + integrity sha512-E/Pfdze/WFfxwyuTFcfhQN1SwyUsc43yuCoW63RVBCaxTD6OzhVD2Pvc/Sy7BjiWUfmelzyKkIBpoow8zZX7Zg== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" "@snyk/glob-parent" "^5.1.2-patch.1" - "merge2" "^1.3.0" - "micromatch" "^4.0.2" - "picomatch" "^2.2.1" + merge2 "^1.3.0" + micromatch "^4.0.2" + picomatch "^2.2.1" "@snyk/fix@1.518.0": - "integrity" "sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA==" - "resolved" "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" - "version" "1.518.0" + version "1.518.0" + resolved "https://registry.npmjs.org/@snyk/fix/-/fix-1.518.0.tgz" + integrity sha512-Cwh0wU8SxZgx1+qRgcGkMctNx9F6UCdUJYcCvKaYJNDEYQwpQat4nsLZsJeODYNx7Byh0ZnPrqakUck4qFrPvA== dependencies: "@snyk/dep-graph" "^1.21.0" - "chalk" "4.1.0" - "debug" "^4.3.1" - "micromatch" "4.0.2" - "ora" "5.3.0" - "p-map" "^4.0.0" - "strip-ansi" "6.0.0" + chalk "4.1.0" + debug "^4.3.1" + micromatch "4.0.2" + ora "5.3.0" + p-map "^4.0.0" + strip-ansi "6.0.0" "@snyk/gemfile@1.2.0": - "integrity" "sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA==" - "resolved" "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" - "version" "1.2.0" + version "1.2.0" + resolved "https://registry.npmjs.org/@snyk/gemfile/-/gemfile-1.2.0.tgz" + integrity sha512-nI7ELxukf7pT4/VraL4iabtNNMz8mUo7EXlqCFld8O5z6mIMLX9llps24iPpaIZOwArkY3FWA+4t+ixyvtTSIA== "@snyk/glob-parent@^5.1.2-patch.1": - "integrity" "sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ==" - "resolved" "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" - "version" "5.1.2-patch.1" + version "5.1.2-patch.1" + resolved "https://registry.npmjs.org/@snyk/glob-parent/-/glob-parent-5.1.2-patch.1.tgz" + integrity sha512-OkUPdHgxIWKAAzceG1nraNA0kgI+eS0I9wph8tll9UL0slD2mIWSj4mAqroGovaEXm8nHedoUfuDRGEb6wnzCQ== dependencies: - "is-glob" "^4.0.1" + is-glob "^4.0.1" -"@snyk/graphlib@^2.1.9-patch.3", "@snyk/graphlib@2.1.9-patch.3": - "integrity" "sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q==" - "resolved" "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" - "version" "2.1.9-patch.3" +"@snyk/graphlib@2.1.9-patch.3", "@snyk/graphlib@^2.1.9-patch.3": + version "2.1.9-patch.3" + resolved "https://registry.npmjs.org/@snyk/graphlib/-/graphlib-2.1.9-patch.3.tgz" + integrity sha512-bBY9b9ulfLj0v2Eer0yFYa3syVeIxVKl2EpxSrsVeT4mjA0CltZyHsF0JjoaGXP27nItTdJS5uVsj1NA+3aE+Q== dependencies: - "lodash.clone" "^4.5.0" - "lodash.constant" "^3.0.0" - "lodash.filter" "^4.6.0" - "lodash.foreach" "^4.5.0" - "lodash.has" "^4.5.2" - "lodash.isempty" "^4.4.0" - "lodash.isfunction" "^3.0.9" - "lodash.isundefined" "^3.0.1" - "lodash.keys" "^4.2.0" - "lodash.map" "^4.6.0" - "lodash.reduce" "^4.6.0" - "lodash.size" "^4.2.0" - "lodash.transform" "^4.6.0" - "lodash.union" "^4.6.0" - "lodash.values" "^4.3.0" + lodash.clone "^4.5.0" + lodash.constant "^3.0.0" + lodash.filter "^4.6.0" + lodash.foreach "^4.5.0" + lodash.has "^4.5.2" + lodash.isempty "^4.4.0" + lodash.isfunction "^3.0.9" + lodash.isundefined "^3.0.1" + lodash.keys "^4.2.0" + lodash.map "^4.6.0" + lodash.reduce "^4.6.0" + lodash.size "^4.2.0" + lodash.transform "^4.6.0" + lodash.union "^4.6.0" + lodash.values "^4.3.0" "@snyk/inquirer@^7.3.3-patch": - "integrity" "sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q==" - "resolved" "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" - "version" "7.3.3-patch" + version "7.3.3-patch" + resolved "https://registry.npmjs.org/@snyk/inquirer/-/inquirer-7.3.3-patch.tgz" + integrity sha512-aWiQSOacH2lOpJ1ard9ErABcH4tdJogdr+mg1U67iZJOPO9n2gFgAwz1TQJDyPkv4/A5mh4hT2rg03Uq+KBn2Q== dependencies: - "ansi-escapes" "^4.2.1" - "chalk" "^4.1.0" - "cli-cursor" "^3.1.0" - "cli-width" "^3.0.0" - "external-editor" "^3.0.3" - "figures" "^3.0.0" - "lodash.assign" "^4.2.0" - "lodash.assignin" "^4.2.0" - "lodash.clone" "^4.5.0" - "lodash.defaults" "^4.2.0" - "lodash.filter" "^4.6.0" - "lodash.find" "^4.6.0" - "lodash.findindex" "^4.6.0" - "lodash.flatten" "^4.4.0" - "lodash.isboolean" "^3.0.3" - "lodash.isfunction" "^3.0.9" - "lodash.isnumber" "^3.0.3" - "lodash.isplainobject" "^4.0.6" - "lodash.isstring" "^4.0.1" - "lodash.last" "^3.0.0" - "lodash.map" "^4.6.0" - "lodash.omit" "^4.5.0" - "lodash.set" "^4.3.2" - "lodash.sum" "^4.0.2" - "lodash.uniq" "^4.5.0" - "mute-stream" "0.0.8" - "run-async" "^2.4.0" - "rxjs" "^6.6.0" - "string-width" "^4.1.0" - "strip-ansi" "^6.0.0" - "through" "^2.3.6" + ansi-escapes "^4.2.1" + chalk "^4.1.0" + cli-cursor "^3.1.0" + cli-width "^3.0.0" + external-editor "^3.0.3" + figures "^3.0.0" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.defaults "^4.2.0" + lodash.filter "^4.6.0" + lodash.find "^4.6.0" + lodash.findindex "^4.6.0" + lodash.flatten "^4.4.0" + lodash.isboolean "^3.0.3" + lodash.isfunction "^3.0.9" + lodash.isnumber "^3.0.3" + lodash.isplainobject "^4.0.6" + lodash.isstring "^4.0.1" + lodash.last "^3.0.0" + lodash.map "^4.6.0" + lodash.omit "^4.5.0" + lodash.set "^4.3.2" + lodash.sum "^4.0.2" + lodash.uniq "^4.5.0" + mute-stream "0.0.8" + run-async "^2.4.0" + rxjs "^6.6.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + through "^2.3.6" "@snyk/java-call-graph-builder@1.19.1": - "integrity" "sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg==" - "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" - "version" "1.19.1" + version "1.19.1" + resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.19.1.tgz" + integrity sha512-bxjHef5Qm3pNc+BrFlxMudmSSbOjA395ZqBddc+dvsFHoHeyNbiY56Y1JSGUlTgjRM+PKNPBiCuELTSMaROeZg== dependencies: "@snyk/graphlib" "2.1.9-patch.3" - "ci-info" "^2.0.0" - "debug" "^4.1.1" - "glob" "^7.1.6" - "jszip" "^3.2.2" - "needle" "^2.3.3" - "progress" "^2.0.3" - "snyk-config" "^4.0.0-rc.2" - "source-map-support" "^0.5.7" - "temp-dir" "^2.0.0" - "tmp" "^0.2.1" - "tslib" "^1.9.3" - "xml-js" "^1.6.11" + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" "@snyk/java-call-graph-builder@1.20.0": - "integrity" "sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww==" - "resolved" "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" - "version" "1.20.0" + version "1.20.0" + resolved "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.20.0.tgz" + integrity sha512-NX8bpIu7oG5cuSSm6WvtxqcCuJs2gRjtKhtuSeF1p5TYXyESs3FXQ0nHjfY90LiyTTc+PW/UBq6SKbBA6bCBww== dependencies: "@snyk/graphlib" "2.1.9-patch.3" - "ci-info" "^2.0.0" - "debug" "^4.1.1" - "glob" "^7.1.6" - "jszip" "^3.2.2" - "needle" "^2.3.3" - "progress" "^2.0.3" - "snyk-config" "^4.0.0-rc.2" - "source-map-support" "^0.5.7" - "temp-dir" "^2.0.0" - "tmp" "^0.2.1" - "tslib" "^1.9.3" - "xml-js" "^1.6.11" + ci-info "^2.0.0" + debug "^4.1.1" + glob "^7.1.6" + jszip "^3.2.2" + needle "^2.3.3" + progress "^2.0.3" + snyk-config "^4.0.0-rc.2" + source-map-support "^0.5.7" + temp-dir "^2.0.0" + tmp "^0.2.1" + tslib "^1.9.3" + xml-js "^1.6.11" "@snyk/mix-parser@^1.1.0": - "integrity" "sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg==" - "resolved" "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" - "version" "1.1.1" + version "1.1.1" + resolved "https://registry.npmjs.org/@snyk/mix-parser/-/mix-parser-1.1.1.tgz" + integrity sha512-KmX4Le+1M01m6kM2UeDColzMZctrSqoMGajqcRHR3dLpCyHE3nzZzPeOWjbUVgjQlTX07oQvq9udSJGZJ/+Gdg== dependencies: "@snyk/dep-graph" "^1.28.0" - "tslib" "^2.0.0" + tslib "^2.0.0" "@snyk/rpm-parser@^2.0.0": - "integrity" "sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ==" - "resolved" "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" - "version" "2.0.0" + version "2.0.0" + resolved "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.0.0.tgz" + integrity sha512-bWjQY5Xk3TcfVpeo8M5BhhSUEdPr2P19AWW13CHPu6sFZkckLWEcjQycnBsVD6RBmxGXecJ1YNui8dq6soHoYQ== dependencies: - "event-loop-spinner" "^2.0.0" + event-loop-spinner "^2.0.0" "@snyk/snyk-cocoapods-plugin@2.5.2": - "integrity" "sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" - "version" "2.5.2" + version "2.5.2" + resolved "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.2.tgz" + integrity sha512-WHhnwyoGOhjFOjBXqUfszD84SErrtjHjium/4xFbqKpEE+yuwxs8OwV/S29BtxhYiGtjpD1azv5QtH30VUMl0A== dependencies: "@snyk/cli-interface" "^2.11.0" "@snyk/cocoapods-lockfile-parser" "3.6.2" "@snyk/dep-graph" "^1.23.1" - "source-map-support" "^0.5.7" - "tslib" "^2.0.0" + source-map-support "^0.5.7" + tslib "^2.0.0" "@snyk/snyk-docker-pull@3.2.3": - "integrity" "sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" - "version" "3.2.3" + version "3.2.3" + resolved "https://registry.npmjs.org/@snyk/snyk-docker-pull/-/snyk-docker-pull-3.2.3.tgz" + integrity sha512-hiFiSmWGLc2tOI7FfgIhVdFzO2f69im8O6p3OV4xEZ/Ss1l58vwtqudItoswsk7wj/azRlgfBW8wGu2MjoudQg== dependencies: "@snyk/docker-registry-v2-client" "1.13.9" - "child-process" "^1.0.2" - "tar-stream" "^2.1.2" - "tmp" "^0.1.0" + child-process "^1.0.2" + tar-stream "^2.1.2" + tmp "^0.1.0" "@snyk/snyk-hex-plugin@1.0.0": - "integrity" "sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ==" - "resolved" "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" - "version" "1.0.0" + version "1.0.0" + resolved "https://registry.npmjs.org/@snyk/snyk-hex-plugin/-/snyk-hex-plugin-1.0.0.tgz" + integrity sha512-ZydVdZ5kDpPDoehQnNHN3wZ6c470k5DPLJtWMoyfzlnCU2+y1rsUEdn4yhttn60RPx3JiLGwmckeDvZw8BqnGQ== dependencies: "@snyk/dep-graph" "^1.28.0" "@snyk/mix-parser" "^1.1.0" - "debug" "^4.3.1" - "tslib" "^2.0.0" + debug "^4.3.1" + tslib "^2.0.0" "@szmarczak/http-timer@^1.1.2": - "integrity" "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==" - "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" - "version" "1.1.2" + version "1.1.2" + resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz" + integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA== dependencies: - "defer-to-connect" "^1.0.1" + defer-to-connect "^1.0.1" "@szmarczak/http-timer@^4.0.5": - "integrity" "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==" - "resolved" "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" - "version" "4.0.5" + version "4.0.5" + resolved "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz" + integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ== dependencies: - "defer-to-connect" "^2.0.0" + defer-to-connect "^2.0.0" "@types/babel-types@*", "@types/babel-types@^7.0.0": version "7.0.9" @@ -445,14 +397,14 @@ "@types/babel-types" "*" "@types/braces@*": - "integrity" "sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw==" - "resolved" "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" - "version" "3.0.0" + version "3.0.0" + resolved "https://registry.npmjs.org/@types/braces/-/braces-3.0.0.tgz" + integrity sha512-TbH79tcyi9FHwbyboOKeRachRq63mSuWYXOflsNO9ZyE5ClQ/JaozNKl+aWUq87qPNsXasXxi2AbgfwIJ+8GQw== "@types/cacheable-request@^6.0.1": - "integrity" "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==" - "resolved" "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" - "version" "6.0.1" + version "6.0.1" + resolved "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz" + integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ== dependencies: "@types/http-cache-semantics" "*" "@types/keyv" "*" @@ -460,106 +412,101 @@ "@types/responselike" "*" "@types/color-name@^1.1.1": - "integrity" "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==" - "resolved" "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" - "version" "1.1.1" + version "1.1.1" + resolved "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz" + integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== "@types/debug@^4.1.4": - "integrity" "sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==" - "resolved" "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" - "version" "4.1.5" + version "4.1.5" + resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz" + integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ== "@types/flat-cache@^2.0.0": - "integrity" "sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww==" - "resolved" "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" - "version" "2.0.0" + version "2.0.0" + resolved "https://registry.npmjs.org/@types/flat-cache/-/flat-cache-2.0.0.tgz" + integrity sha512-fHeEsm9hvmZ+QHpw6Fkvf19KIhuqnYLU6vtWLjd5BsMd/qVi7iTkMioDZl0mQmfNRA1A6NwvhrSRNr9hGYZGww== "@types/graphlib@^2", "@types/graphlib@^2.1.7": - "integrity" "sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg==" - "resolved" "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" - "version" "2.1.7" + version "2.1.7" + resolved "https://registry.npmjs.org/@types/graphlib/-/graphlib-2.1.7.tgz" + integrity sha512-K7T1n6U2HbTYu+SFHlBjz/RH74OA2D/zF1qlzn8uXbvB4uRg7knOM85ugS2bbXI1TXMh7rLqk4OVRwIwEBaixg== "@types/http-cache-semantics@*": - "integrity" "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==" - "resolved" "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" - "version" "4.0.0" + version "4.0.0" + resolved "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz" + integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A== "@types/js-yaml@^3.12.1": - "integrity" "sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug==" - "resolved" "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" - "version" "3.12.2" + version "3.12.2" + resolved "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-3.12.2.tgz" + integrity sha512-0CFu/g4mDSNkodVwWijdlr8jH7RoplRWNgovjFLEZeT+QEbbZXjBmCe3HwaWheAlCbHwomTwzZoSedeOycABug== "@types/keyv@*": - "integrity" "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==" - "resolved" "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" - "version" "3.1.1" + version "3.1.1" + resolved "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz" + integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw== dependencies: "@types/node" "*" "@types/lodash.chunk@^4.2.6": - "integrity" "sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ==" - "resolved" "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" - "version" "4.2.6" + version "4.2.6" + resolved "https://registry.npmjs.org/@types/lodash.chunk/-/lodash.chunk-4.2.6.tgz" + integrity sha512-SPlusB7jxXyGcTXYcUdWr7WmhArO/rmTq54VN88iKMxGUhyg79I4Q8n4riGn3kjaTjOJrVlHhxgX/d7woak5BQ== dependencies: "@types/lodash" "*" "@types/lodash.omit@^4.5.6": - "integrity" "sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ==" - "resolved" "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" - "version" "4.5.6" + version "4.5.6" + resolved "https://registry.npmjs.org/@types/lodash.omit/-/lodash.omit-4.5.6.tgz" + integrity sha512-KXPpOSNX2h0DAG2w7ajpk7TXvWF28ZHs5nJhOJyP0BQHkehgr948RVsToItMme6oi0XJkp19CbuNXkIX8FiBlQ== dependencies: "@types/lodash" "*" "@types/lodash.union@^4.6.6": - "integrity" "sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw==" - "resolved" "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" - "version" "4.6.6" + version "4.6.6" + resolved "https://registry.npmjs.org/@types/lodash.union/-/lodash.union-4.6.6.tgz" + integrity sha512-Wu0ZEVNcyCz8eAn6TlUbYWZoGbH9E+iOHxAZbwUoCEXdUiy6qpcz5o44mMXViM4vlPLLCPlkAubEP1gokoSZaw== dependencies: "@types/lodash" "*" "@types/lodash@*": - "integrity" "sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==" - "resolved" "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" - "version" "4.14.168" + version "4.14.168" + resolved "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.168.tgz" + integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== "@types/micromatch@^4.0.1": - "integrity" "sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw==" - "resolved" "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" - "version" "4.0.1" + version "4.0.1" + resolved "https://registry.npmjs.org/@types/micromatch/-/micromatch-4.0.1.tgz" + integrity sha512-my6fLBvpY70KattTNzYOK6KU1oR1+UCz9ug/JbcF5UrEmeCt9P7DV2t7L8+t18mMPINqGQCE4O8PLOPbI84gxw== dependencies: "@types/braces" "*" "@types/node@*": - "integrity" "sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw==" - "resolved" "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" - "version" "13.7.4" + version "13.7.4" + resolved "https://registry.npmjs.org/@types/node/-/node-13.7.4.tgz" + integrity sha512-oVeL12C6gQS/GAExndigSaLxTrKpQPxewx9bOcwfvJiJge4rr7wNaph4J+ns5hrmIV2as5qxqN8YKthn9qh0jw== "@types/q@^1.5.1": - "integrity" "sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==" - "resolved" "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz" - "version" "1.5.1" + version "1.5.1" + resolved "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz" + integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA== "@types/responselike@*", "@types/responselike@^1.0.0": - "integrity" "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==" - "resolved" "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" - "version" "1.0.0" + version "1.0.0" + resolved "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz" + integrity sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA== dependencies: "@types/node" "*" "@types/sarif@^2.1.3": - "integrity" "sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w==" - "resolved" "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" - "version" "2.1.3" + version "2.1.3" + resolved "https://registry.npmjs.org/@types/sarif/-/sarif-2.1.3.tgz" + integrity sha512-zf+EoIplTkQW2TV2mwtJtlI0g540Z3Rs9tX9JqRAtyjnDCqkP+eMTgWCj3PGNbQpi+WXAjvC3Ou/dvvX2sLK4w== "@types/uuid@^8.3.0": - "integrity" "sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==" - "resolved" "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" - "version" "8.3.0" - -"editorjs-undo@^0.1.6": - "integrity" "sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw==" - "resolved" "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" - "version" "0.1.6" + version "8.3.0" + resolved "https://registry.npmjs.org/@types/uuid/-/uuid-8.3.0.tgz" + integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ== "@vue/component-compiler-utils@^3.0.0": version "3.2.0" @@ -1403,6 +1350,16 @@ code-point-at@^1.0.0: resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c= +codex-notifier@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/codex-notifier/-/codex-notifier-1.1.2.tgz#a733079185f4c927fa296f1d71eb8753fe080895" + integrity sha512-DCp6xe/LGueJ1N5sXEwcBc3r3PyVkEEDNWCVigfvywAkeXcZMk9K41a31tkEFBW0Ptlwji6/JlAb49E3Yrxbtg== + +codex-tooltip@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/codex-tooltip/-/codex-tooltip-1.0.2.tgz#81a9d3e2937658c6e5312106b47b9f094ff7be63" + integrity sha512-oC+Bu5X/zyhbPydgMSLWKoM/+vkJMqaLWu3Dt/jZgXS3MWK23INwC5DMBrVXZSufAFk0i0SUni38k9rLMyZn/w== + color-convert@^1.9.0, color-convert@^1.9.1: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -2079,6 +2036,11 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" +editorjs-undo@^0.1.6: + version "0.1.6" + resolved "https://registry.npmjs.org/editorjs-undo/-/editorjs-undo-0.1.6.tgz" + integrity sha512-zVHPnBf2mcI8hWT9Eu8H3bGDEcMj4gppXbQjJW11Aa8Kdy2SVBGhM6fS59OUlBsm8iHWLxuoG2NUIfy9Rd30sw== + ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -3747,7 +3709,7 @@ latest-version@^5.0.0: resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face" integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA== dependencies: - "package-json" "^6.3.0" + package-json "^6.3.0" launch-editor@^2.2.1: version "2.2.1" @@ -4547,13 +4509,6 @@ node-sass@^4.14.1: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" -"nopt@~1.0.10": - "integrity" "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=" - "resolved" "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz" - "version" "1.0.10" - dependencies: - "abbrev" "1" - "nopt@2 || 3": version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" @@ -6323,271 +6278,271 @@ snyk-cpp-plugin@2.2.1: integrity sha512-NFwVLMCqKTocY66gcim0ukF6e31VRDJqDapg5sy3vCHqlD1OCNUXSK/aI4VQEEndDrsnFmQepsL5KpEU0dDRIQ== dependencies: "@snyk/dep-graph" "^1.19.3" - "chalk" "^4.1.0" - "debug" "^4.1.1" - "hosted-git-info" "^3.0.7" - "tslib" "^2.0.0" + chalk "^4.1.0" + debug "^4.1.1" + hosted-git-info "^3.0.7" + tslib "^2.0.0" -"snyk-docker-plugin@4.19.3": - "integrity" "sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg==" - "resolved" "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" - "version" "4.19.3" +snyk-docker-plugin@4.19.3: + version "4.19.3" + resolved "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.19.3.tgz" + integrity sha512-5WkXyT7uY5NrTOvEqxeMqb6dDcskT3c/gbHUTOyPuvE6tMut+OOYK8RRXbwZFeLzpS8asq4e1R7U7syYG3VXwg== dependencies: "@snyk/dep-graph" "^1.21.0" "@snyk/rpm-parser" "^2.0.0" "@snyk/snyk-docker-pull" "3.2.3" - "chalk" "^2.4.2" - "debug" "^4.1.1" - "docker-modem" "2.1.3" - "dockerfile-ast" "0.2.0" - "elfy" "^1.0.0" - "event-loop-spinner" "^2.0.0" - "gunzip-maybe" "^1.4.2" - "mkdirp" "^1.0.4" - "semver" "^7.3.4" - "snyk-nodejs-lockfile-parser" "1.30.2" - "tar-stream" "^2.1.0" - "tmp" "^0.2.1" - "tslib" "^1" - "uuid" "^8.2.0" + chalk "^2.4.2" + debug "^4.1.1" + docker-modem "2.1.3" + dockerfile-ast "0.2.0" + elfy "^1.0.0" + event-loop-spinner "^2.0.0" + gunzip-maybe "^1.4.2" + mkdirp "^1.0.4" + semver "^7.3.4" + snyk-nodejs-lockfile-parser "1.30.2" + tar-stream "^2.1.0" + tmp "^0.2.1" + tslib "^1" + uuid "^8.2.0" -"snyk-go-parser@1.4.1": - "integrity" "sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w==" - "resolved" "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" - "version" "1.4.1" +snyk-go-parser@1.4.1: + version "1.4.1" + resolved "https://registry.npmjs.org/snyk-go-parser/-/snyk-go-parser-1.4.1.tgz" + integrity sha512-StU3uHB85VMEkcgXta63M0Fgd+9cs5sMCjQXTBoYTdE4dxarPn7U67yCuwkRRdZdny1ZXtzfY8LKns9i0+dy9w== dependencies: - "toml" "^3.0.0" - "tslib" "^1.10.0" + toml "^3.0.0" + tslib "^1.10.0" -"snyk-go-plugin@1.17.0": - "integrity" "sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q==" - "resolved" "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" - "version" "1.17.0" +snyk-go-plugin@1.17.0: + version "1.17.0" + resolved "https://registry.npmjs.org/snyk-go-plugin/-/snyk-go-plugin-1.17.0.tgz" + integrity sha512-1jAYPRgMapO2BYL+HWsUq5gsAiDGmI0Pn7omc0lk24tcUOMhUB+1hb0u9WBMNzHvXBjevBkjOctjpnt2hMKN6Q== dependencies: "@snyk/dep-graph" "^1.23.1" "@snyk/graphlib" "2.1.9-patch.3" - "debug" "^4.1.1" - "snyk-go-parser" "1.4.1" - "tmp" "0.2.1" - "tslib" "^1.10.0" + debug "^4.1.1" + snyk-go-parser "1.4.1" + tmp "0.2.1" + tslib "^1.10.0" -"snyk-gradle-plugin@3.14.0": - "integrity" "sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg==" - "resolved" "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" - "version" "3.14.0" +snyk-gradle-plugin@3.14.0: + version "3.14.0" + resolved "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.14.0.tgz" + integrity sha512-2A8ifM91TyzSx/U2fYvHXbaCRVsEx60hGFQjbSH9Hl9AokxEzMi2qti7wsObs1jUX2m198D1mdXu4k/Y1jWxXg== dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.28.0" "@snyk/java-call-graph-builder" "1.20.0" "@types/debug" "^4.1.4" - "chalk" "^3.0.0" - "debug" "^4.1.1" - "tmp" "0.2.1" - "tslib" "^2.0.0" + chalk "^3.0.0" + debug "^4.1.1" + tmp "0.2.1" + tslib "^2.0.0" -"snyk-module@^3.0.0", "snyk-module@^3.1.0", "snyk-module@3.1.0": - "integrity" "sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw==" - "resolved" "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" - "version" "3.1.0" +snyk-module@3.1.0, snyk-module@^3.0.0, snyk-module@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/snyk-module/-/snyk-module-3.1.0.tgz" + integrity sha512-HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw== dependencies: - "debug" "^4.1.1" - "hosted-git-info" "^3.0.4" + debug "^4.1.1" + hosted-git-info "^3.0.4" -"snyk-mvn-plugin@2.25.3": - "integrity" "sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg==" - "resolved" "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" - "version" "2.25.3" +snyk-mvn-plugin@2.25.3: + version "2.25.3" + resolved "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.25.3.tgz" + integrity sha512-JAxOThX51JDbgMMjp3gQDVi07G9VgTYSF06QC7f5LNA0zoXNr743e2rm78RGw5bqE3JRjZxEghiLHPPuvS5DDg== dependencies: "@snyk/cli-interface" "2.11.0" "@snyk/dep-graph" "^1.23.1" "@snyk/java-call-graph-builder" "1.19.1" - "debug" "^4.1.1" - "glob" "^7.1.6" - "needle" "^2.5.0" - "tmp" "^0.1.0" - "tslib" "1.11.1" + debug "^4.1.1" + glob "^7.1.6" + needle "^2.5.0" + tmp "^0.1.0" + tslib "1.11.1" -"snyk-nodejs-lockfile-parser@1.30.2": - "integrity" "sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw==" - "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" - "version" "1.30.2" +snyk-nodejs-lockfile-parser@1.30.2: + version "1.30.2" + resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.30.2.tgz" + integrity sha512-wI3VXVYO/ok0uaQm5i+Koo4rKBNilYC/QRIQFlyGbZXf+WBdRcTBKVDfTy8uNfUhMRSGzd84lNclMnetU9Y+vw== dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - "event-loop-spinner" "^2.0.0" - "got" "11.4.0" - "lodash.clonedeep" "^4.5.0" - "lodash.flatmap" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.set" "^4.3.2" - "lodash.topairs" "^4.3.0" - "p-map" "2.1.0" - "snyk-config" "^4.0.0-rc.2" - "tslib" "^1.9.3" - "uuid" "^8.3.0" - "yaml" "^1.9.2" + event-loop-spinner "^2.0.0" + got "11.4.0" + lodash.clonedeep "^4.5.0" + lodash.flatmap "^4.5.0" + lodash.isempty "^4.4.0" + lodash.set "^4.3.2" + lodash.topairs "^4.3.0" + p-map "2.1.0" + snyk-config "^4.0.0-rc.2" + tslib "^1.9.3" + uuid "^8.3.0" + yaml "^1.9.2" -"snyk-nodejs-lockfile-parser@1.31.1": - "integrity" "sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ==" - "resolved" "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" - "version" "1.31.1" +snyk-nodejs-lockfile-parser@1.31.1: + version "1.31.1" + resolved "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.31.1.tgz" + integrity sha512-MU1V2zS5ziLGMUL6PXxPvJuZ281wvawjQQ1c8TW697Jjkhd8hPZcW4IzMu52ok0zsmQcVZh8sVniBEHIePCfLQ== dependencies: "@snyk/graphlib" "2.1.9-patch.3" "@yarnpkg/lockfile" "^1.1.0" - "event-loop-spinner" "^2.0.0" - "got" "11.4.0" - "lodash.clonedeep" "^4.5.0" - "lodash.flatmap" "^4.5.0" - "lodash.isempty" "^4.4.0" - "lodash.set" "^4.3.2" - "lodash.topairs" "^4.3.0" - "p-map" "2.1.0" - "snyk-config" "^4.0.0-rc.2" - "tslib" "^1.9.3" - "uuid" "^8.3.0" - "yaml" "^1.9.2" + event-loop-spinner "^2.0.0" + got "11.4.0" + lodash.clonedeep "^4.5.0" + lodash.flatmap "^4.5.0" + lodash.isempty "^4.4.0" + lodash.set "^4.3.2" + lodash.topairs "^4.3.0" + p-map "2.1.0" + snyk-config "^4.0.0-rc.2" + tslib "^1.9.3" + uuid "^8.3.0" + yaml "^1.9.2" -"snyk-nuget-plugin@1.21.0": - "integrity" "sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw==" - "resolved" "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" - "version" "1.21.0" +snyk-nuget-plugin@1.21.0: + version "1.21.0" + resolved "https://registry.npmjs.org/snyk-nuget-plugin/-/snyk-nuget-plugin-1.21.0.tgz" + integrity sha512-c/JYF3sZzMN/lYz171zrEkVcPqDVcUTVgKIKHiL8nhhuFKxZQ1gzqOgk+lnfN31TLoTNQsZ3DhW/WY+4zEALvw== dependencies: - "debug" "^4.1.1" - "dotnet-deps-parser" "5.0.0" - "jszip" "3.4.0" - "snyk-paket-parser" "1.6.0" - "tslib" "^1.11.2" - "xml2js" "^0.4.17" + debug "^4.1.1" + dotnet-deps-parser "5.0.0" + jszip "3.4.0" + snyk-paket-parser "1.6.0" + tslib "^1.11.2" + xml2js "^0.4.17" -"snyk-paket-parser@1.6.0": - "integrity" "sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q==" - "resolved" "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" - "version" "1.6.0" +snyk-paket-parser@1.6.0: + version "1.6.0" + resolved "https://registry.npmjs.org/snyk-paket-parser/-/snyk-paket-parser-1.6.0.tgz" + integrity sha512-6htFynjBe/nakclEHUZ1A3j5Eu32/0pNve5Qm4MFn3YQmJgj7UcAO8hdyK3QfzEY29/kAv/rkJQg+SKshn+N9Q== dependencies: - "tslib" "^1.9.3" + tslib "^1.9.3" -"snyk-php-plugin@1.9.2": - "integrity" "sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA==" - "resolved" "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" - "version" "1.9.2" +snyk-php-plugin@1.9.2: + version "1.9.2" + resolved "https://registry.npmjs.org/snyk-php-plugin/-/snyk-php-plugin-1.9.2.tgz" + integrity sha512-IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA== dependencies: "@snyk/cli-interface" "^2.9.1" "@snyk/composer-lockfile-parser" "^1.4.1" - "tslib" "1.11.1" + tslib "1.11.1" -"snyk-poetry-lockfile-parser@^1.1.6": - "integrity" "sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA==" - "resolved" "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" - "version" "1.1.6" +snyk-poetry-lockfile-parser@^1.1.6: + version "1.1.6" + resolved "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.6.tgz" + integrity sha512-MoekbWOZPj9umfukjk2bd2o3eRj0OyO+58sxq9crMtHmTlze4h0/Uj4+fb0JFPBOtBO3c2zwbA+dvFQmpKoOTA== dependencies: "@snyk/cli-interface" "^2.9.2" "@snyk/dep-graph" "^1.23.0" - "debug" "^4.2.0" - "toml" "^3.0.0" - "tslib" "^2.0.0" + debug "^4.2.0" + toml "^3.0.0" + tslib "^2.0.0" -"snyk-policy@1.19.0": - "integrity" "sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg==" - "resolved" "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" - "version" "1.19.0" +snyk-policy@1.19.0: + version "1.19.0" + resolved "https://registry.npmjs.org/snyk-policy/-/snyk-policy-1.19.0.tgz" + integrity sha512-XYjhOTRPFA7NfDUsH6uH1fbML2OgSFsqdUPbud7x01urNP9CHXgUgAD4NhKMi3dVQK+7IdYadWt0wrFWw4y+qg== dependencies: - "debug" "^4.1.1" - "email-validator" "^2.0.4" - "js-yaml" "^3.13.1" - "lodash.clonedeep" "^4.5.0" - "promise-fs" "^2.1.1" - "semver" "^6.0.0" - "snyk-module" "^3.0.0" - "snyk-resolve" "^1.1.0" - "snyk-try-require" "^2.0.0" + debug "^4.1.1" + email-validator "^2.0.4" + js-yaml "^3.13.1" + lodash.clonedeep "^4.5.0" + promise-fs "^2.1.1" + semver "^6.0.0" + snyk-module "^3.0.0" + snyk-resolve "^1.1.0" + snyk-try-require "^2.0.0" -"snyk-python-plugin@1.19.7": - "integrity" "sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A==" - "resolved" "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" - "version" "1.19.7" +snyk-python-plugin@1.19.7: + version "1.19.7" + resolved "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.19.7.tgz" + integrity sha512-twAGoIgJVSLVzMkuT/n5l9ZDvhMbWH7De6flWiHQB/grthfl3vJDzLCxiTa+6H/IEEYNSv6F/nSrfNh9UbW5/A== dependencies: "@snyk/cli-interface" "^2.0.3" - "snyk-poetry-lockfile-parser" "^1.1.6" - "tmp" "0.0.33" + snyk-poetry-lockfile-parser "^1.1.6" + tmp "0.0.33" -"snyk-resolve-deps@4.7.2": - "integrity" "sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg==" - "resolved" "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" - "version" "4.7.2" +snyk-resolve-deps@4.7.2: + version "4.7.2" + resolved "https://registry.npmjs.org/snyk-resolve-deps/-/snyk-resolve-deps-4.7.2.tgz" + integrity sha512-Bmtr7QdRL2b3Js+mPDmvXbkprOpzO8aUFXqR0nJKAOlUVQqZ84yiuT0n/mssEiJJ0vP+k0kZvTeiTwgio4KZRg== dependencies: - "ansicolors" "^0.3.2" - "debug" "^4.1.1" - "lodash.assign" "^4.2.0" - "lodash.assignin" "^4.2.0" - "lodash.clone" "^4.5.0" - "lodash.flatten" "^4.4.0" - "lodash.get" "^4.4.2" - "lodash.set" "^4.3.2" - "lru-cache" "^4.0.0" - "semver" "^5.5.1" - "snyk-module" "^3.1.0" - "snyk-resolve" "^1.0.0" - "snyk-tree" "^1.0.0" - "snyk-try-require" "^1.1.1" - "then-fs" "^2.0.0" + ansicolors "^0.3.2" + debug "^4.1.1" + lodash.assign "^4.2.0" + lodash.assignin "^4.2.0" + lodash.clone "^4.5.0" + lodash.flatten "^4.4.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lru-cache "^4.0.0" + semver "^5.5.1" + snyk-module "^3.1.0" + snyk-resolve "^1.0.0" + snyk-tree "^1.0.0" + snyk-try-require "^1.1.1" + then-fs "^2.0.0" -"snyk-resolve@^1.0.0": - "integrity" "sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw==" - "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" - "version" "1.0.1" +snyk-resolve@1.1.0, snyk-resolve@^1.1.0: + version "1.1.0" + resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" + integrity sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw== dependencies: - "debug" "^3.1.0" - "then-fs" "^2.0.0" + debug "^4.1.1" + promise-fs "^2.1.1" -"snyk-resolve@^1.1.0", "snyk-resolve@1.1.0": - "integrity" "sha512-OZMF8I8TOu0S58Z/OS9mr8jkEzGAPByCsAkrWlcmZgPaE0RsxVKVIFPhbMNy/JlYswgGDYYIEsNw+e0j1FnTrw==" - "resolved" "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.1.0.tgz" - "version" "1.1.0" +snyk-resolve@^1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/snyk-resolve/-/snyk-resolve-1.0.1.tgz" + integrity sha512-7+i+LLhtBo1Pkth01xv+RYJU8a67zmJ8WFFPvSxyCjdlKIcsps4hPQFebhz+0gC5rMemlaeIV6cqwqUf9PEDpw== dependencies: - "debug" "^4.1.1" - "promise-fs" "^2.1.1" + debug "^3.1.0" + then-fs "^2.0.0" -"snyk-sbt-plugin@2.11.0": - "integrity" "sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA==" - "resolved" "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" - "version" "2.11.0" +snyk-sbt-plugin@2.11.0: + version "2.11.0" + resolved "https://registry.npmjs.org/snyk-sbt-plugin/-/snyk-sbt-plugin-2.11.0.tgz" + integrity sha512-wUqHLAa3MzV6sVO+05MnV+lwc+T6o87FZZaY+43tQPytBI2Wq23O3j4POREM4fa2iFfiQJoEYD6c7xmhiEUsSA== dependencies: - "debug" "^4.1.1" - "semver" "^6.1.2" - "tmp" "^0.1.0" - "tree-kill" "^1.2.2" - "tslib" "^1.10.0" + debug "^4.1.1" + semver "^6.1.2" + tmp "^0.1.0" + tree-kill "^1.2.2" + tslib "^1.10.0" -"snyk-tree@^1.0.0": - "integrity" "sha1-D7cxdtvzLngvGRAClBYESPkRHMg=" - "resolved" "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" - "version" "1.0.0" +snyk-tree@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/snyk-tree/-/snyk-tree-1.0.0.tgz" + integrity sha1-D7cxdtvzLngvGRAClBYESPkRHMg= dependencies: - "archy" "^1.0.0" + archy "^1.0.0" -"snyk-try-require@^1.1.1", "snyk-try-require@1.3.1": - "integrity" "sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI=" - "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" - "version" "1.3.1" +snyk-try-require@1.3.1, snyk-try-require@^1.1.1: + version "1.3.1" + resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-1.3.1.tgz" + integrity sha1-bgJvkuZK9/zM6h7lPVJIQeQYohI= dependencies: - "debug" "^3.1.0" - "lodash.clonedeep" "^4.3.0" - "lru-cache" "^4.0.0" - "then-fs" "^2.0.0" + debug "^3.1.0" + lodash.clonedeep "^4.3.0" + lru-cache "^4.0.0" + then-fs "^2.0.0" -"snyk-try-require@^2.0.0": - "integrity" "sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA==" - "resolved" "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" - "version" "2.0.1" +snyk-try-require@^2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/snyk-try-require/-/snyk-try-require-2.0.1.tgz" + integrity sha512-VCOfFIvqLMXgCXEdooQgu3A40XYIFBnj0X8Y01RJ5iAbu08b4WKGN/uAKaRVF30dABS4EcjsalmCO+YlKUPEIA== dependencies: - "debug" "^4.1.1" - "lodash.clonedeep" "^4.3.0" - "lru-cache" "^5.1.1" + debug "^4.1.1" + lodash.clonedeep "^4.3.0" + lru-cache "^5.1.1" -"snyk@^1.518.0": - "integrity" "sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q==" - "resolved" "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" - "version" "1.520.0" +snyk@^1.518.0: + version "1.520.0" + resolved "https://registry.npmjs.org/snyk/-/snyk-1.520.0.tgz" + integrity sha512-+NSZDb1sbG+AxzK//GLAKHF0oyPyDlUzQgwy8tyet4tiUsnDKKEruCsX4R9c0outy5qfAExKG77aZego3N9p/Q== dependencies: "@open-policy-agent/opa-wasm" "^1.2.0" "@snyk/cli-interface" "2.11.0" @@ -6920,7 +6875,7 @@ string-width@^4.2.0: string.prototype.trimend@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913" + resolved "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g== dependencies: define-properties "^1.1.3" @@ -6928,7 +6883,7 @@ string.prototype.trimend@^1.0.0: string.prototype.trimleft@^2.1.1: version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz#4408aa2e5d6ddd0c9a80739b087fbc067c03b3cc" + resolved "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" integrity sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw== dependencies: define-properties "^1.1.3" @@ -6937,7 +6892,7 @@ string.prototype.trimleft@^2.1.1: string.prototype.trimright@^2.1.1: version "2.1.2" - resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz#c76f1cef30f21bbad8afeb8db1511496cfb0f2a3" + resolved "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" integrity sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg== dependencies: define-properties "^1.1.3" @@ -6946,7 +6901,7 @@ string.prototype.trimright@^2.1.1: string.prototype.trimstart@^1.0.0: version "1.0.1" - resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54" + resolved "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw== dependencies: define-properties "^1.1.3" @@ -6968,59 +6923,59 @@ string_decoder@~1.1.1: strip-ansi@6.0.0, strip-ansi@^6.0.0: version "6.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== dependencies: ansi-regex "^5.0.0" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= dependencies: ansi-regex "^2.0.0" strip-ansi@^4.0.0: version "4.0.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8= dependencies: ansi-regex "^3.0.0" strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0: version "5.2.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" + resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA== dependencies: ansi-regex "^4.1.0" strip-bom@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e" + resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4= dependencies: is-utf8 "^0.2.0" strip-eof@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" + resolved "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= strip-indent@^1.0.1: version "1.0.1" - resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2" + resolved "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI= dependencies: get-stdin "^4.0.1" strip-json-comments@~2.0.1: version "2.0.1" - resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" + resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo= stylehacks@^4.0.0: version "4.0.3" - resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5" + resolved "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz" integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g== dependencies: browserslist "^4.0.0" @@ -7043,7 +6998,7 @@ stylus@^0.54.5, stylus@^0.x: superagent@^3.8.2: version "3.8.3" - resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" + resolved "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" integrity sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA== dependencies: component-emitter "^1.2.0" @@ -7059,40 +7014,40 @@ superagent@^3.8.2: supports-color@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= supports-color@^3.2.3: version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= dependencies: has-flag "^1.0.0" supports-color@^5.3.0, supports-color@^5.4.0: version "5.5.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== dependencies: has-flag "^3.0.0" supports-color@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ== dependencies: has-flag "^3.0.0" supports-color@^7.1.0: version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" + resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== dependencies: has-flag "^4.0.0" svgo@^1.0.0: version "1.2.0" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3" + resolved "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz" integrity sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw== dependencies: chalk "^2.4.1" @@ -7112,7 +7067,7 @@ svgo@^1.0.0: tar-stream@^2.1.0: version "2.1.0" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw== dependencies: bl "^3.0.0" @@ -7123,7 +7078,7 @@ tar-stream@^2.1.0: tar-stream@^2.1.2: version "2.1.3" - resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.3.tgz#1e2022559221b7866161660f118255e20fa79e41" + resolved "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" integrity sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA== dependencies: bl "^4.0.1" @@ -7134,7 +7089,7 @@ tar-stream@^2.1.2: tar@^2.0.0: version "2.2.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.2.tgz#0ca8848562c7299b8b446ff6a4d60cdbb23edc40" + resolved "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" integrity sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA== dependencies: block-stream "*" @@ -7143,7 +7098,7 @@ tar@^2.0.0: tar@^6.1.0: version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" + resolved "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== dependencies: chownr "^2.0.0" @@ -7155,17 +7110,17 @@ tar@^6.1.0: temp-dir@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d" + resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0= temp-dir@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-2.0.0.tgz#bde92b05bdfeb1516e804c9c00ad45177f31321e" + resolved "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" integrity sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg== tempfile@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265" + resolved "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" integrity sha1-awRGhWqbERTRhW/8vlCczLCXcmU= dependencies: temp-dir "^1.0.0" @@ -7173,19 +7128,19 @@ tempfile@^2.0.0: term-size@^2.1.0: version "2.2.0" - resolved "https://registry.yarnpkg.com/term-size/-/term-size-2.2.0.tgz#1f16adedfe9bdc18800e1776821734086fcc6753" + resolved "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" integrity sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw== then-fs@^2.0.0: version "2.0.0" - resolved "https://registry.yarnpkg.com/then-fs/-/then-fs-2.0.0.tgz#72f792dd9d31705a91ae19ebfcf8b3f968c81da2" + resolved "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" integrity sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI= dependencies: promise ">=3.2 <8" through2@^2.0.3: version "2.0.5" - resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd" + resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ== dependencies: readable-stream "~2.3.6" @@ -7193,38 +7148,38 @@ through2@^2.0.3: through@^2.3.4, through@^2.3.6: version "2.3.8" - resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" + resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= timsort@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4" + resolved "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q= tmp@0.0.33, tmp@^0.0.33: version "0.0.33" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw== dependencies: os-tmpdir "~1.0.2" tmp@0.2.1, tmp@^0.2.1: version "0.2.1" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ== dependencies: rimraf "^3.0.0" tmp@^0.1.0: version "0.1.0" - resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877" + resolved "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw== dependencies: rimraf "^2.6.3" to-array@0.1.4: version "0.1.4" - resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890" + resolved "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA= to-fast-properties@^1.0.3: @@ -7234,26 +7189,26 @@ to-fast-properties@^1.0.3: to-object-path@^0.3.0: version "0.3.0" - resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" + resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= dependencies: kind-of "^3.0.2" to-readable-stream@^1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771" + resolved "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q== to-regex-range@^5.0.1: version "5.0.1" - resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" + resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ== dependencies: is-number "^7.0.0" toidentifier@1.0.0: version "1.0.0" - resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553" + resolved "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw== token-stream@0.0.1: @@ -7263,481 +7218,41 @@ token-stream@0.0.1: toml@^3.0.0: version "3.0.0" - resolved "https://registry.yarnpkg.com/toml/-/toml-3.0.0.tgz#342160f1af1904ec9d204d03a5d61222d762c5ee" + resolved "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" integrity sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w== -"string.prototype.trimend@^1.0.0": - "integrity" "sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==" - "resolved" "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz" - "version" "1.0.1" +touch@^3.1.0: + version "3.1.0" + resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" + integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA== dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" + nopt "~1.0.10" -"string.prototype.trimleft@^2.1.1": - "integrity" "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==" - "resolved" "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz" - "version" "2.1.2" +tough-cookie@~2.4.3: + version "2.4.3" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz" + integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ== dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - "string.prototype.trimstart" "^1.0.0" + psl "^1.1.24" + punycode "^1.4.1" -"string.prototype.trimright@^2.1.1": - "integrity" "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==" - "resolved" "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz" - "version" "2.1.2" +tough-cookie@~2.5.0: + version "2.5.0" + resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" + integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" - "string.prototype.trimend" "^1.0.0" + psl "^1.1.28" + punycode "^2.1.1" -"string.prototype.trimstart@^1.0.0": - "integrity" "sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==" - "resolved" "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "define-properties" "^1.1.3" - "es-abstract" "^1.17.5" +tree-kill@^1.2.2: + version "1.2.2" + resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" + integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A== -"strip-ansi@^3.0.0", "strip-ansi@^3.0.1": - "integrity" "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz" - "version" "3.0.1" - dependencies: - "ansi-regex" "^2.0.0" - -"strip-ansi@^4.0.0": - "integrity" "sha1-qEeQIusaw2iocTibY1JixQXuNo8=" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz" - "version" "4.0.0" - dependencies: - "ansi-regex" "^3.0.0" - -"strip-ansi@^5.0.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^5.1.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^5.2.0": - "integrity" "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz" - "version" "5.2.0" - dependencies: - "ansi-regex" "^4.1.0" - -"strip-ansi@^6.0.0": - "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" - "version" "6.0.0" - dependencies: - "ansi-regex" "^5.0.0" - -"strip-ansi@6.0.0": - "integrity" "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==" - "resolved" "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz" - "version" "6.0.0" - dependencies: - "ansi-regex" "^5.0.0" - -"strip-bom@^2.0.0": - "integrity" "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=" - "resolved" "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz" - "version" "2.0.0" - dependencies: - "is-utf8" "^0.2.0" - -"strip-eof@^1.0.0": - "integrity" "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" - "resolved" "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz" - "version" "1.0.0" - -"strip-indent@^1.0.1": - "integrity" "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=" - "resolved" "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz" - "version" "1.0.1" - dependencies: - "get-stdin" "^4.0.1" - -"strip-json-comments@~2.0.1": - "integrity" "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" - "resolved" "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz" - "version" "2.0.1" - -"style-inject@^0.3.0": - "integrity" "sha512-IezA2qp+vcdlhJaVm5SOdPPTUu0FCEqfNSli2vRuSIBbu5Nq5UvygTk/VzeCqfLz2Atj3dVII5QBKGZRZ0edzw==" - "resolved" "https://registry.npmjs.org/style-inject/-/style-inject-0.3.0.tgz" - "version" "0.3.0" - -"stylehacks@^4.0.0": - "integrity" "sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==" - "resolved" "https://registry.npmjs.org/stylehacks/-/stylehacks-4.0.3.tgz" - "version" "4.0.3" - dependencies: - "browserslist" "^4.0.0" - "postcss" "^7.0.0" - "postcss-selector-parser" "^3.0.0" - -"superagent@^3.8.2": - "integrity" "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==" - "resolved" "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz" - "version" "3.8.3" - dependencies: - "component-emitter" "^1.2.0" - "cookiejar" "^2.1.0" - "debug" "^3.1.0" - "extend" "^3.0.0" - "form-data" "^2.3.1" - "formidable" "^1.2.0" - "methods" "^1.1.1" - "mime" "^1.4.1" - "qs" "^6.5.1" - "readable-stream" "^2.3.5" - -"supports-color@^2.0.0": - "integrity" "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz" - "version" "2.0.0" - -"supports-color@^3.2.3": - "integrity" "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz" - "version" "3.2.3" - dependencies: - "has-flag" "^1.0.0" - -"supports-color@^5.3.0": - "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - "version" "5.5.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^5.4.0": - "integrity" "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - "version" "5.5.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^6.1.0": - "integrity" "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz" - "version" "6.1.0" - dependencies: - "has-flag" "^3.0.0" - -"supports-color@^7.1.0": - "integrity" "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz" - "version" "7.1.0" - dependencies: - "has-flag" "^4.0.0" - -"supports-color@5.4.0": - "integrity" "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==" - "resolved" "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz" - "version" "5.4.0" - dependencies: - "has-flag" "^3.0.0" - -"svg-sprite@^1.5.0": - "integrity" "sha512-0mE5BLY3K8wg3+HrYfzpiKbIM44IGcg8uINED8ri22EdQbLvGecOHjRtkrNAlphbiU5kyGyqoBlIaukL45fs2Q==" - "resolved" "https://registry.npmjs.org/svg-sprite/-/svg-sprite-1.5.0.tgz" - "version" "1.5.0" - dependencies: - "async" "^2.6.1" - "css-selector-parser" "^1.3.0" - "cssmin" "^0.4.3" - "cssom" "^0.3.4" - "dateformat" "^3.0.3" - "glob" "^7.1.3" - "js-yaml" "^3.12.0" - "lodash" "^4.17.11" - "lodash.pluck" "^3.1.2" - "mkdirp" "^0.5.1" - "mocha" "^5.2.0" - "mustache" "^3.0.0" - "phantomjs-prebuilt" "^2.1.16" - "prettysize" "^1.1.0" - "should" "^13.2.3" - "svgo" "^1.1.1" - "vinyl" "^2.2.0" - "winston" "^3.1.0" - "xmldom" "0.1.27" - "xpath" "^0.0.27" - "yargs" "^12.0.2" - -"svgo@^1.0.0": - "integrity" "sha512-xBfxJxfk4UeVN8asec9jNxHiv3UAMv/ujwBWGYvQhhMb2u3YTGKkiybPcLFDLq7GLLWE9wa73e0/m8L5nTzQbw==" - "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.2.0.tgz" - "version" "1.2.0" - dependencies: - "chalk" "^2.4.1" - "coa" "^2.0.2" - "css-select" "^2.0.0" - "css-select-base-adapter" "^0.1.1" - "css-tree" "1.0.0-alpha.28" - "css-url-regex" "^1.1.0" - "csso" "^3.5.1" - "js-yaml" "^3.12.0" - "mkdirp" "~0.5.1" - "object.values" "^1.1.0" - "sax" "~1.2.4" - "stable" "^0.1.8" - "unquote" "~1.1.1" - "util.promisify" "~1.0.0" - -"svgo@^1.1.1": - "integrity" "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==" - "resolved" "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz" - "version" "1.3.2" - dependencies: - "chalk" "^2.4.1" - "coa" "^2.0.2" - "css-select" "^2.0.0" - "css-select-base-adapter" "^0.1.1" - "css-tree" "1.0.0-alpha.37" - "csso" "^4.0.2" - "js-yaml" "^3.13.1" - "mkdirp" "~0.5.1" - "object.values" "^1.1.0" - "sax" "~1.2.4" - "stable" "^0.1.8" - "unquote" "~1.1.1" - "util.promisify" "~1.0.0" - -"tar-stream@^2.1.0": - "integrity" "sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==" - "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.0.tgz" - "version" "2.1.0" - dependencies: - "bl" "^3.0.0" - "end-of-stream" "^1.4.1" - "fs-constants" "^1.0.0" - "inherits" "^2.0.3" - "readable-stream" "^3.1.1" - -"tar-stream@^2.1.2": - "integrity" "sha512-Z9yri56Dih8IaK8gncVPx4Wqt86NDmQTSh49XLZgjWpGZL9GK9HKParS2scqHCC4w6X9Gh2jwaU45V47XTKwVA==" - "resolved" "https://registry.npmjs.org/tar-stream/-/tar-stream-2.1.3.tgz" - "version" "2.1.3" - dependencies: - "bl" "^4.0.1" - "end-of-stream" "^1.4.1" - "fs-constants" "^1.0.0" - "inherits" "^2.0.3" - "readable-stream" "^3.1.1" - -"tar@^2.0.0": - "integrity" "sha512-FCEhQ/4rE1zYv9rYXJw/msRqsnmlje5jHP6huWeBZ704jUTy02c5AZyWujpMR1ax6mVw9NyJMfuK2CMDWVIfgA==" - "resolved" "https://registry.npmjs.org/tar/-/tar-2.2.2.tgz" - "version" "2.2.2" - dependencies: - "block-stream" "*" - "fstream" "^1.0.12" - "inherits" "2" - -"tar@^6.1.0": - "integrity" "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==" - "resolved" "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz" - "version" "6.1.0" - dependencies: - "chownr" "^2.0.0" - "fs-minipass" "^2.0.0" - "minipass" "^3.0.0" - "minizlib" "^2.1.1" - "mkdirp" "^1.0.3" - "yallist" "^4.0.0" - -"temp-dir@^1.0.0": - "integrity" "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=" - "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz" - "version" "1.0.0" - -"temp-dir@^2.0.0": - "integrity" "sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==" - "resolved" "https://registry.npmjs.org/temp-dir/-/temp-dir-2.0.0.tgz" - "version" "2.0.0" - -"tempfile@^2.0.0": - "integrity" "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=" - "resolved" "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz" - "version" "2.0.0" - dependencies: - "temp-dir" "^1.0.0" - "uuid" "^3.0.1" - -"term-size@^2.1.0": - "integrity" "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==" - "resolved" "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz" - "version" "2.2.0" - -"terser@^3.14.1": - "integrity" "sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==" - "resolved" "https://registry.npmjs.org/terser/-/terser-3.17.0.tgz" - "version" "3.17.0" - dependencies: - "commander" "^2.19.0" - "source-map" "~0.6.1" - "source-map-support" "~0.5.10" - -"text-hex@1.0.x": - "integrity" "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==" - "resolved" "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz" - "version" "1.0.0" - -"then-fs@^2.0.0": - "integrity" "sha1-cveS3Z0xcFqRrhnr/Piz+WjIHaI=" - "resolved" "https://registry.npmjs.org/then-fs/-/then-fs-2.0.0.tgz" - "version" "2.0.0" - dependencies: - "promise" ">=3.2 <8" - -"throttleit@^1.0.0": - "integrity" "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=" - "resolved" "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz" - "version" "1.0.0" - -"through@^2.3.4", "through@^2.3.6": - "integrity" "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" - "resolved" "https://registry.npmjs.org/through/-/through-2.3.8.tgz" - "version" "2.3.8" - -"through2@^2.0.3": - "integrity" "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==" - "resolved" "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz" - "version" "2.0.5" - dependencies: - "readable-stream" "~2.3.6" - "xtend" "~4.0.1" - -"timsort@^0.3.0": - "integrity" "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=" - "resolved" "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz" - "version" "0.3.0" - -"tmp@^0.0.33": - "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" - "version" "0.0.33" - dependencies: - "os-tmpdir" "~1.0.2" - -"tmp@^0.1.0": - "integrity" "sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.1.0.tgz" - "version" "0.1.0" - dependencies: - "rimraf" "^2.6.3" - -"tmp@^0.2.1", "tmp@0.2.1": - "integrity" "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz" - "version" "0.2.1" - dependencies: - "rimraf" "^3.0.0" - -"tmp@0.0.33": - "integrity" "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==" - "resolved" "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz" - "version" "0.0.33" - dependencies: - "os-tmpdir" "~1.0.2" - -"to-array@0.1.4": - "integrity" "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=" - "resolved" "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz" - "version" "0.1.4" - -"to-object-path@^0.3.0": - "integrity" "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=" - "resolved" "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz" - "version" "0.3.0" - dependencies: - "kind-of" "^3.0.2" - -"to-readable-stream@^1.0.0": - "integrity" "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==" - "resolved" "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz" - "version" "1.0.0" - -"to-regex-range@^2.1.0": - "integrity" "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=" - "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz" - "version" "2.1.1" - dependencies: - "is-number" "^3.0.0" - "repeat-string" "^1.6.1" - -"to-regex-range@^5.0.1": - "integrity" "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==" - "resolved" "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz" - "version" "5.0.1" - dependencies: - "is-number" "^7.0.0" - -"to-regex@^3.0.1", "to-regex@^3.0.2": - "integrity" "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==" - "resolved" "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz" - "version" "3.0.2" - dependencies: - "define-property" "^2.0.2" - "extend-shallow" "^3.0.2" - "regex-not" "^1.0.2" - "safe-regex" "^1.1.0" - -"toidentifier@1.0.0": - "integrity" "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" - "resolved" "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz" - "version" "1.0.0" - -"toml@^3.0.0": - "integrity" "sha512-y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w==" - "resolved" "https://registry.npmjs.org/toml/-/toml-3.0.0.tgz" - "version" "3.0.0" - -"touch@^3.1.0": - "integrity" "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==" - "resolved" "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz" - "version" "3.1.0" - dependencies: - "nopt" "~1.0.10" - -"tough-cookie@~2.4.3": - "integrity" "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==" - "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz" - "version" "2.4.3" - dependencies: - "psl" "^1.1.24" - "punycode" "^1.4.1" - -"tough-cookie@~2.5.0": - "integrity" "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==" - "resolved" "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz" - "version" "2.5.0" - dependencies: - "psl" "^1.1.28" - "punycode" "^2.1.1" - -"tree-kill@^1.2.2": - "integrity" "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" - "resolved" "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz" - "version" "1.2.2" - -"trim-newlines@^1.0.0": - "integrity" "sha1-WIeWa7WCpFA6QetST301ARgVphM=" - "resolved" "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" - "version" "1.0.0" +trim-newlines@^1.0.0: + version "1.0.0" + resolved "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz" + integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= "true-case-path@^1.0.2": version "1.0.3" From d13eac6f50ad727c1e77a66b828c7f60f5b4bbcc Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 12:56:38 +0530 Subject: [PATCH 0147/1519] fix: Breadcrumbs for a page --- .../website/page_renderers/template_page.py | 25 +++++++++++++------ frappe/website/page_renderers/web_page.py | 9 ++++--- frappe/website/router.py | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 2b326d7383..8f613ae9bd 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -3,6 +3,7 @@ import os import click import frappe +from frappe.website.router import get_page_info from frappe.website.page_renderers.base_template_page import BaseTemplatePage from frappe.website.router import get_base_template from frappe.website.utils import (extract_comment_tag, extract_title, get_next_link, @@ -37,11 +38,11 @@ class TemplatePage(BaseTemplatePage): for dirname in folders: search_path = os.path.join(app_path, dirname, self.path) - for p in self.get_index_path_options(search_path): - file_path = frappe.as_unicode(p) - if os.path.exists(file_path) and not os.path.isdir(file_path): + for file_path in self.get_index_path_options(search_path): + if os.path.isfile(file_path): self.app = app self.app_path = app_path + self.file_dir = dirname self.basename = os.path.splitext(file_path)[0] self.template_path = os.path.relpath(file_path, self.app_path) self.basepath = os.path.dirname(file_path) @@ -52,8 +53,9 @@ class TemplatePage(BaseTemplatePage): def can_render(self): return hasattr(self, 'template_path') and bool(self.template_path) - def get_index_path_options(self, search_path): - return (f'{search_path}{d}' for d in ('', '.html', '.md', '/index.html', '/index.md')) + @staticmethod + def get_index_path_options(search_path): + return (frappe.as_unicode(f'{search_path}{d}') for d in ('.html', '.md', '/index.html', '/index.md')) def render(self): return build_response(self.path, self.get_html(), self.http_status_code, self.headers) @@ -85,9 +87,18 @@ class TemplatePage(BaseTemplatePage): self.context.sidebar_items = get_sidebar_items(self.context.website_sidebar, self.basepath) if self.context.add_breadcrumbs and not self.context.parents: - # TODO: set correct title and route for breadcrumbs parent_path = os.path.dirname(self.path) - self.context.parents = [dict(route=parent_path, title=extract_title(source='', path=parent_path))] + if self.path.endswith('index'): + # in case of index page move one directory up for parent path + parent_path = os.path.dirname(parent_path) + + for parent_file_path in self.get_index_path_options(parent_path): + parent_file_path = os.path.join(self.app_path, self.file_dir, parent_file_path) + if os.path.isfile(parent_file_path): + parent_page_context = get_page_info(parent_file_path, self.app, self.file_dir) + if parent_page_context: + self.context.parents = [dict(route=os.path.dirname(self.path), title=parent_page_context.title)] + break def set_pymodule(self): ''' diff --git a/frappe/website/page_renderers/web_page.py b/frappe/website/page_renderers/web_page.py index 6e738e8df9..1814a9615a 100644 --- a/frappe/website/page_renderers/web_page.py +++ b/frappe/website/page_renderers/web_page.py @@ -7,10 +7,11 @@ class WebPage(object): if not path: path = frappe.local.request.path self.path = path.strip('/ ') - self.basepath = '' - self.basename = '' - self.name = '' - self.route = '' + self.basepath = None + self.basename = None + self.name = None + self.route = None + self.file_dir = None def can_render(self): pass diff --git a/frappe/website/router.py b/frappe/website/router.py index 23fd5cb21f..6d803886ef 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -107,7 +107,7 @@ def get_page_info(path, app, start, basepath=None, app_path=None, fname=None): if basepath is None: basepath = os.path.dirname(path) - page_name, extn = fname.rsplit(".", 1) + page_name, extn = os.path.splitext(fname) # add website route page_info = frappe._dict() From 9ec451b28e2e92589bb7d29a3aaf861776f75a98 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 12:57:55 +0530 Subject: [PATCH 0148/1519] test: Add test case to check breadcrumbs --- frappe/templates/includes/full_index.html | 5 ----- frappe/templates/test/_test_base.html | 1 + frappe/website/doctype/web_page/test_web_page.py | 8 +++++++- frappe/www/_test/_test_folder/_test_page.py | 1 + frappe/www/_test/_test_folder/index.md | 6 ++++++ frappe/www/_test/index.html | 1 + 6 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 frappe/www/_test/index.html diff --git a/frappe/templates/includes/full_index.html b/frappe/templates/includes/full_index.html index a7443c482a..eb8fb322f6 100644 --- a/frappe/templates/includes/full_index.html +++ b/frappe/templates/includes/full_index.html @@ -3,11 +3,6 @@ {% for item in children_map[route] %}
  • {{ item.title }} - {# - {% if children_map[item.route] %} - {{ make_item_list(item.route, children_map) }} - {% endif %} - #}
    • {% endfor %} diff --git a/frappe/templates/test/_test_base.html b/frappe/templates/test/_test_base.html index 5a88584a5d..17caf8df1b 100644 --- a/frappe/templates/test/_test_base.html +++ b/frappe/templates/test/_test_base.html @@ -8,6 +8,7 @@ {%- endblock -%} + {% include "templates/includes/breadcrumbs.html" %}

    This is for testing

    {% block content %}{% endblock %} {%- block script %} diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index d213fd57a8..d097ceb083 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -113,7 +113,13 @@ class TestWebPage(unittest.TestCase): frappe.as_unicode(content)) def test_breadcrumbs(self): - pass + content = get_response_content('/_test/_test_folder/_test_page') + self.assertIn('Test TOC', content) + self.assertIn(' Test Page', content) + + content = get_response_content('/_test/_test_folder/index') + self.assertIn(' Test', content) + self.assertIn('Test TOC', content) def test_downloadable_file(self): pass diff --git a/frappe/www/_test/_test_folder/_test_page.py b/frappe/www/_test/_test_folder/_test_page.py index fa7b5f5727..1813a06bac 100644 --- a/frappe/www/_test/_test_folder/_test_page.py +++ b/frappe/www/_test/_test_folder/_test_page.py @@ -1,2 +1,3 @@ def get_context(context): context.base_template_path = 'frappe/templates/test/_test_base.html' + context.add_breadcrumbs = 1 diff --git a/frappe/www/_test/_test_folder/index.md b/frappe/www/_test/_test_folder/index.md index d0b531a642..1a5a9e7f81 100644 --- a/frappe/www/_test/_test_folder/index.md +++ b/frappe/www/_test/_test_folder/index.md @@ -1,3 +1,9 @@ +--- +title: Test TOC +add_breadcrumbs: 1 +show_sidebar: 1 +--- + # Index {index} \ No newline at end of file diff --git a/frappe/www/_test/index.html b/frappe/www/_test/index.html new file mode 100644 index 0000000000..0dff60b400 --- /dev/null +++ b/frappe/www/_test/index.html @@ -0,0 +1 @@ +{index} \ No newline at end of file From 6e9207cd626a373d7e6488c56ec4d027458ede9e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 12:58:48 +0530 Subject: [PATCH 0149/1519] test: Refactor webpage test to remove unnecessary operations --- .../website/doctype/web_page/test_web_page.py | 47 +++++++------------ 1 file changed, 18 insertions(+), 29 deletions(-) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index d097ceb083..67b3cdbe89 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -2,16 +2,10 @@ from __future__ import unicode_literals import unittest import frappe from frappe.website.path_resolver import PathResolver -from frappe.website.serve import get_response, get_response_content -from frappe.utils import set_request +from frappe.website.serve import get_response_content test_records = frappe.get_test_records('Web Page') -def get_page_content(route): - set_request(method='GET', path = route) - response = get_response() - return frappe.as_unicode(response.data) - class TestWebPage(unittest.TestCase): def setUp(self): frappe.db.sql("delete from `tabWeb Page`") @@ -25,13 +19,13 @@ class TestWebPage(unittest.TestCase): self.assertFalse(PathResolver("test-web-page-1/test-web-page-Random").is_valid_path()) def test_base_template(self): - content = get_page_content('/_test/_test_custom_base.html') + content = get_response_content('/_test/_test_custom_base.html') # assert the text in base template is rendered - self.assertIn('

    This is for testing

    ', frappe.as_unicode(content)) + self.assertIn('

    This is for testing

    ', content) # assert template block rendered - self.assertIn('

    Test content

    ', frappe.as_unicode(content)) + self.assertIn('

    Test content

    ', content) def test_content_type(self): web_page = frappe.get_doc(dict( @@ -44,15 +38,15 @@ class TestWebPage(unittest.TestCase): main_section_html = '
    html content
    ' )).insert() - self.assertIn('rich text', get_page_content('/test-content-type')) + self.assertIn('rich text', get_response_content('/test-content-type')) web_page.content_type = 'Markdown' web_page.save() - self.assertIn('markdown content', get_page_content('/test-content-type')) + self.assertIn('markdown content', get_response_content('/test-content-type')) web_page.content_type = 'HTML' web_page.save() - self.assertIn('html content', get_page_content('/test-content-type')) + self.assertIn('html content', get_response_content('/test-content-type')) web_page.delete() @@ -67,9 +61,9 @@ class TestWebPage(unittest.TestCase): dynamic_template = 1, main_section_html = '
    {{ frappe.form_dict.doctype }}
    ' )).insert() - try: - content = get_page_content('/doctype-view/DocField') + from frappe.utils import get_html_for_route + content = get_html_for_route('/doctype-view/DocField') self.assertIn('
    DocField
    ', content) finally: web_page.delete() @@ -77,40 +71,35 @@ class TestWebPage(unittest.TestCase): def test_custom_base_template_path(self): content = get_response_content('/_test/_test_folder/_test_page') # assert the text in base template is rendered - self.assertIn('

    This is for testing

    ', frappe.as_unicode(content)) + self.assertIn('

    This is for testing

    ', content) # assert template block rendered - self.assertIn('

    Test content

    ', frappe.as_unicode(content)) + self.assertIn('

    Test content

    ', content) def test_json_sidebar_data(self): frappe.flags.look_for_sidebar = False content = get_response_content('/_test/_test_folder/_test_page') - self.assertNotIn('Test Sidebar', frappe.as_unicode(content)) + self.assertNotIn('Test Sidebar', content) frappe.flags.look_for_sidebar = True content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn('Test Sidebar', frappe.as_unicode(content)) + self.assertIn('Test Sidebar', content) frappe.flags.look_for_sidebar = False def test_index_and_next_comment(self): content = get_response_content('/_test/_test_folder') # test if {index} was rendered - self.assertIn(' Test Page', - frappe.as_unicode(content)) + self.assertIn(' Test Page', content) - self.assertIn('Test TOC', - frappe.as_unicode(content)) + self.assertIn('Test TOC', content) content = get_response_content('/_test/_test_folder/_test_page') # test if {next} was rendered - self.assertIn('Next: Test TOC', - frappe.as_unicode(content)) + self.assertIn('Next: Test TOC', content) def test_colocated_assets(self): content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn("", - frappe.as_unicode(content)) - self.assertIn("background-color: var(--bg-color);", - frappe.as_unicode(content)) + self.assertIn("", content) + self.assertIn("background-color: var(--bg-color);", content) def test_breadcrumbs(self): content = get_response_content('/_test/_test_folder/_test_page') From c8749bcc72a48abd7815dea3c4fc2aa59d223e2a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 14:27:30 +0530 Subject: [PATCH 0150/1519] fix: get_index_path_options method --- frappe/website/page_renderers/template_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 8f613ae9bd..d1f0b47032 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -55,7 +55,7 @@ class TemplatePage(BaseTemplatePage): @staticmethod def get_index_path_options(search_path): - return (frappe.as_unicode(f'{search_path}{d}') for d in ('.html', '.md', '/index.html', '/index.md')) + return (frappe.as_unicode(f'{search_path}{d}') for d in ('', '.html', '.md', '/index.html', '/index.md')) def render(self): return build_response(self.path, self.get_html(), self.http_status_code, self.headers) From 369adf5a3a303612edf9f0169c7b37b7c711a852 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 14:44:47 +0530 Subject: [PATCH 0151/1519] fix: Set default value as empty string --- frappe/website/page_renderers/web_page.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/website/page_renderers/web_page.py b/frappe/website/page_renderers/web_page.py index 1814a9615a..20e5bab062 100644 --- a/frappe/website/page_renderers/web_page.py +++ b/frappe/website/page_renderers/web_page.py @@ -7,10 +7,10 @@ class WebPage(object): if not path: path = frappe.local.request.path self.path = path.strip('/ ') - self.basepath = None - self.basename = None - self.name = None - self.route = None + self.basepath = '' + self.basename = '' + self.name = '' + self.route = '' self.file_dir = None def can_render(self): From 1a41e16e2a5d724b04b5ef0acaced5887f2db658 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 27 May 2021 15:14:27 +0530 Subject: [PATCH 0152/1519] fix: Blog post style --- frappe/public/scss/website/blog.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/frappe/public/scss/website/blog.scss b/frappe/public/scss/website/blog.scss index 9918b490c5..ea82efed21 100644 --- a/frappe/public/scss/website/blog.scss +++ b/frappe/public/scss/website/blog.scss @@ -14,6 +14,10 @@ position: relative; width: 100%; + .card { + border: 1px solid var(--border-color) + } + .card-body { display: flex; flex-direction: column; From 821e7513fff3f9386782c0492aae24e24c91d94e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 27 May 2021 15:59:03 +0530 Subject: [PATCH 0153/1519] fix: tune button missing & sidebar drop-icon fix --- frappe/desk/doctype/workspace/workspace.py | 2 +- frappe/public/js/frappe/views/wiki.js | 7 +++ frappe/public/js/frappe/wiki_blocks/card.js | 53 ++++++++++++------- frappe/public/js/frappe/wiki_blocks/chart.js | 53 ++++++++++++------- frappe/public/js/frappe/wiki_blocks/header.js | 4 ++ .../public/js/frappe/wiki_blocks/shortcut.js | 53 ++++++++++++------- 6 files changed, 111 insertions(+), 61 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index d9bf5fa618..52007b00cd 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -116,7 +116,7 @@ class Workspace(Document): "icon": card.get('icon'), "hidden": card.get('hidden') or False, "link_count": card.get('link_count'), - "idx": self.links[-1].idx + 1 + "idx": 1 if not self.links else self.links[-1].idx + 1 }) for link in links: diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index a0635f5494..83f80e8769 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -233,6 +233,12 @@ frappe.views.Wiki = class Wiki { if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); this.sidebar_items[page][0].firstElementChild.classList.add("selected"); + if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { + this.sidebar_items[page] + .parents('.sidebar-item-container') + .find('.drop-icon use') + .attr("href", "#icon-small-up"); + } } this.current_page_name = page; localStorage.current_wiki_page = page; @@ -475,6 +481,7 @@ frappe.views.Wiki = class Wiki { } $sidebar_item.appendTo($child_section); $child_section.removeClass('hidden'); + $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); } } diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 820056a6ab..ecde804be2 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -42,31 +42,35 @@ export default class Card { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -79,6 +83,14 @@ export default class Card { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.card_name) { + return false; + } + + return true; + } + save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), @@ -120,6 +132,7 @@ export default class Card { this.card_widget.customize(this.options); this.wrapper.setAttribute("card_name", this.card_widget.label); this.new_card_widget = this.card_widget.get_config(); + this._add_tune_button(); }, }); diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index c7f92222c0..c562b453ed 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -42,31 +42,35 @@ export default class Chart { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -79,6 +83,14 @@ export default class Chart { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.chart_name) { + return false; + } + + return true; + } + save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), @@ -120,6 +132,7 @@ export default class Chart { this.chart_widget.customize(this.options); this.wrapper.setAttribute("chart_name", this.chart_widget.label); this.new_chart_widget = this.chart_widget.get_config(); + this._add_tune_button(); }, }); diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index 727f495a42..a3fcc39175 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -296,6 +296,10 @@ export default class Header { tag.classList.add(this._CSS.wrapper); + if (!this.readOnly) { + tag.contentEditable = true; + } + tag.dataset.placeholder = this.api.i18n.t(this._settings.placeholder || ''); return tag; diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index c6d01a8800..dc1cbb5b5a 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -41,30 +41,34 @@ export default class Shortcut { } if (!this.readOnly) { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); + this._add_tune_button(); } return this.wrapper; } + _add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + this.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control + ); + } + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { if (!btn_type) btn_type = 'btn-secondary'; let button = $( @@ -77,6 +81,14 @@ export default class Shortcut { wrapper.prepend(button); } + validate(savedData) { + if (!savedData.shortcut_name) { + return false; + } + + return true; + } + save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), @@ -118,6 +130,7 @@ export default class Shortcut { this.shortcut_widget.customize(this.options); this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); this.new_shortcut_widget = this.shortcut_widget.get_config(); + this._add_tune_button(); }, }); From 6bdcae1201de560971dc882c901ad18eb7f71f26 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Fri, 28 May 2021 21:19:21 +0530 Subject: [PATCH 0154/1519] feat: add number format parameter in doc.get_formatted --- frappe/model/base_document.py | 4 ++-- frappe/utils/formatters.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py index 54d77ba988..1ac07f5fb7 100644 --- a/frappe/model/base_document.py +++ b/frappe/model/base_document.py @@ -862,7 +862,7 @@ class BaseDocument(object): return self._precision[cache_key][fieldname] - def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False, translated=False): + def get_formatted(self, fieldname, doc=None, currency=None, absolute_value=False, translated=False, format=None): from frappe.utils.formatters import format_value df = self.meta.get_field(fieldname) @@ -886,7 +886,7 @@ class BaseDocument(object): if (absolute_value or doc.get('absolute_value')) and isinstance(val, (int, float)): val = abs(self.get(fieldname)) - return format_value(val, df=df, doc=doc, currency=currency) + return format_value(val, df=df, doc=doc, currency=currency, format=format) def is_print_hide(self, fieldname, df=None, for_print=True): """Returns true if fieldname is to be hidden for print. diff --git a/frappe/utils/formatters.py b/frappe/utils/formatters.py index 7913413878..c0c7e4bca0 100644 --- a/frappe/utils/formatters.py +++ b/frappe/utils/formatters.py @@ -9,7 +9,7 @@ from frappe.model.meta import get_field_currency, get_field_precision import re from six import string_types -def format_value(value, df=None, doc=None, currency=None, translated=False): +def format_value(value, df=None, doc=None, currency=None, translated=False, format=None): '''Format value based on given fieldtype, document reference, currency reference. If docfield info (df) is not given, it will try and guess based on the datatype of the value''' if isinstance(df, string_types): @@ -58,7 +58,7 @@ def format_value(value, df=None, doc=None, currency=None, translated=False): elif df.get("fieldtype") == "Currency": default_currency = frappe.db.get_default("currency") currency = currency or get_field_currency(df, doc) or default_currency - return fmt_money(value, precision=get_field_precision(df, doc), currency=currency) + return fmt_money(value, precision=get_field_precision(df, doc), currency=currency, format=format) elif df.get("fieldtype") == "Float": precision = get_field_precision(df, doc) From 799397abae5c594c47e9e7d8085156f8bb845a58 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 10:23:22 +0530 Subject: [PATCH 0155/1519] refactor: Refactor code --- .../internal_wiki_page/internal_wiki_page.py | 11 +- frappe/public/js/frappe/utils/utils.js | 13 ++ frappe/public/js/frappe/views/wiki.js | 189 ++++++++--------- .../public/js/frappe/widgets/base_widget.js | 43 ++-- frappe/public/js/frappe/wiki_blocks/block.js | 150 +++++++++++++ frappe/public/js/frappe/wiki_blocks/card.js | 196 ++--------------- frappe/public/js/frappe/wiki_blocks/chart.js | 197 ++---------------- frappe/public/js/frappe/wiki_blocks/header.js | 96 ++------- .../public/js/frappe/wiki_blocks/paragraph.js | 98 ++------- .../public/js/frappe/wiki_blocks/shortcut.js | 196 ++--------------- frappe/public/js/frappe/wiki_blocks/spacer.js | 105 ++-------- 11 files changed, 355 insertions(+), 939 deletions(-) create mode 100644 frappe/public/js/frappe/wiki_blocks/block.js diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 6be92f835d..5d119e364d 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -52,13 +52,4 @@ def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, if json.loads(new_widgets): save_new_widget(title, new_widgets) - return doc.title - -@frappe.whitelist() -def get_page_content(page): - return frappe.db.get_value("Internal Wiki Page", page, "content") - -@frappe.whitelist() -def get_pages(): - return frappe.db.get_list('Internal Wiki Page', fields=['name', 'icon', 'private', 'parent_page', 'sequence_id'], - order_by="sequence_id asc") \ No newline at end of file + return doc.title \ No newline at end of file diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index 484d9c65f1..9e20e419be 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1319,5 +1319,18 @@ Object.assign(frappe.utils, { let e = clipboard_paste_event; let clipboard_data = e.clipboardData || window.clipboardData || e.originalEvent.clipboardData; return clipboard_data.getData('Text'); + }, + + add_custom_button(html, action, class_name = "", title="", btn_type, wrapper, prepend) { + if (!btn_type) btn_type = 'btn-secondary'; + let button = $( + `` + ); + button.click(event => { + event.stopPropagation(); + action && action(event); + }); + !prepend && button.appendTo(wrapper); + prepend && wrapper.prepend(button); } }); diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 83f80e8769..f247f34330 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -57,7 +57,8 @@ frappe.views.Wiki = class Wiki { } setup_wiki_pages() { - this.get_pages().then(() => { + this.get_pages().then(pages => { + this.all_pages = pages; if (this.all_pages) { frappe.wiki_pages = {}; let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); @@ -75,11 +76,29 @@ frappe.views.Wiki = class Wiki { } get_pages() { - return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_pages").then(data => { - this.all_pages = data; + return frappe.db.get_list('Internal Wiki Page', { + fields: ['name', 'icon', 'private', 'parent_page', 'sequence_id'], + order_by: "sequence_id asc" }); } + sidebar_item_container(item) { + return $(` +
    +
    + + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.label || item.name} + +
    +
    +
    + `); + } + make_sidebar(items) { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); @@ -136,60 +155,19 @@ frappe.views.Wiki = class Wiki { } } - sidebar_item_container(item) { - return $(` -
    -
    - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - -
    -
    -
    - `); - } - show() { if (!this.all_pages) { // pages not yet loaded, call again after a bit setTimeout(() => { this.show(); - }, 500); + }, 100); return; } + let page = this.get_page_to_show(); this.page.set_title(`${__(page)}`); - this.show_page(page); - this.get_content(page).then(() => { - this.get_data(page).then(() => { - if (this.content) { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: JSON.parse(this.content) || [] - }); - }); - } else { - this.initialize_editorjs(JSON.parse(this.content)); - } - } - }); - }); - } - get_content(page) { - return frappe.xcall("frappe.desk.doctype.internal_wiki_page.internal_wiki_page.get_page_content", { - page: page - }).then(data => { - this.content = data; - }); + this.show_page(page); } get_data(page) { @@ -233,6 +211,7 @@ frappe.views.Wiki = class Wiki { if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); this.sidebar_items[page][0].firstElementChild.classList.add("selected"); + if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { this.sidebar_items[page] .parents('.sidebar-item-container') @@ -240,6 +219,7 @@ frappe.views.Wiki = class Wiki { .attr("href", "#icon-small-up"); } } + this.current_page_name = page; localStorage.current_wiki_page = page; @@ -252,6 +232,28 @@ frappe.views.Wiki = class Wiki { } this.setup_actions(); + this.prepare_editorjs(page); + } + + prepare_editorjs(page) { + frappe.db.get_value("Internal Wiki Page", page, "content") + .then(content => { + this.content = JSON.parse(content.message["content"]); + this.get_data(page).then(() => { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: this.content || [] + }); + }); + } else { + this.initialize_editorjs(this.content); + } + }); + }); } setup_actions() { @@ -280,16 +282,49 @@ frappe.views.Wiki = class Wiki { initialize_editorjs_undo() { this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: JSON.parse(this.content)}); + this.undo.initialize({blocks: this.content}); this.undo.readOnly = false; } + setup_customization_buttons() { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + this.page.set_primary_action( + __("Save Customizations"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.undo.readOnly = true; + this.save_page(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + }, + null, + __("Saving") + ); + + this.page.set_secondary_action( + __("Discard"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.deleted_sidebar_items = []; + this.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); + } + ); + } + show_sidebar_actions() { this.sidebar.find('.standard-sidebar-section').addClass('show-control'); } add_sidebar_actions(item, sidebar_control) { - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -297,7 +332,7 @@ frappe.views.Wiki = class Wiki { null, sidebar_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete_page(item.name), "delete-page", @@ -307,18 +342,6 @@ frappe.views.Wiki = class Wiki { ); } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(); - }); - button.appendTo(wrapper); - } - delete_page(name) { if (!this.deleted_sidebar_items.includes(name)) { this.deleted_sidebar_items.push(name); @@ -370,39 +393,6 @@ frappe.views.Wiki = class Wiki { }); } - setup_customization_buttons() { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - this.page.set_primary_action( - __("Save Customizations"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.undo.readOnly = true; - this.save_page(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - }, - null, - __("Saving") - ); - - this.page.set_secondary_action( - __("Discard"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - this.deleted_sidebar_items = []; - this.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - } - ); - } - initialize_new_page() { const d = new frappe.ui.Dialog({ title: __('Set Title'), @@ -459,7 +449,7 @@ frappe.views.Wiki = class Wiki { }; let $sidebar_item = this.sidebar_item_container(item); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -486,13 +476,12 @@ frappe.views.Wiki = class Wiki { } initialize_editorjs(blocks) { - const data = { - blocks: blocks || [] - }; this.editor = new EditorJS({ + data: { + blocks: blocks || [] + }, tools: this.tools, autofocus: false, - data, tunes: ['spacingTune'], readOnly: true, logLevel: 'ERROR' diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 821df609ef..90a2c1e641 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -25,18 +25,23 @@ export default class Widget { this.action_area.empty(); options.allow_sorting && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", + `${__('Drag')}`, + null, + this.action_area ); options.allow_delete && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.delete(), "", - `${__('Delete')}` + `${__('Delete')}`, + null, + this.action_area ); if (options.allow_hiding) { @@ -48,11 +53,13 @@ export default class Widget { } const classname = this.hidden ? 'fa fa-eye' : 'fa fa-eye-slash'; const title = this.hidden ? `${__('Show')}` : `${__('Hide')}`; - this.add_custom_button( + frappe.utils.add_custom_button( ``, () => this.hide_or_show(), "show-or-hide-button", - title + title, + null, + this.action_area ); this.show_or_hide_button = this.action_area.find( @@ -61,18 +68,24 @@ export default class Widget { } options.allow_edit && - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon("edit", "xs"), - () => this.edit() + () => this.edit(), + null, + `${__('Edit')}`, + null, + this.action_area ); if (options.allow_resize) { const title = this.width == 'Full'? `${__('Collapse')}` : `${__('Expand')}`; - this.add_custom_button( + frappe.utils.add_custom_button( '', () => this.toggle_width(), "resize-button", - title + title, + null, + this.action_area ); this.resize_button = this.action_area.find( @@ -129,18 +142,6 @@ export default class Widget { this.subtitle && this.subtitle_field.html(this.subtitle); } - add_custom_button(html, action, class_name = "", title="", btn_type) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(); - }); - button.appendTo(this.action_area); - } - delete(animate=true) { let remove_widget = (setup_new) => { this.widget.remove(); diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js new file mode 100644 index 0000000000..1f8cdf1f21 --- /dev/null +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -0,0 +1,150 @@ +import get_dialog_constructor from "../widgets/widget_dialog.js"; + +export default class Block { + constructor(opts) { + Object.assign(this, opts); + } + + make(block, block_name, widget_type = block) { + let block_data = this.config.page_data[block+'s'].items.find(obj => { + return obj.label == block_name; + }); + if (!block_data) return; + this.wrapper.innerHTML = ''; + block_data.in_customize_mode = !this.readOnly; + this.block_widget = new frappe.widget.SingleWidgetGroup({ + container: this.wrapper, + type: widget_type, + class_name: block == 'chart' ? 'widget-charts' : '', + options: this.options, + widgets: block_data, + api: this.api, + block: this.block + }); + this.wrapper.setAttribute(block+'_name', block_name); + if (!this.readOnly) { + this.block_widget.customize(); + } + } + + rendered() { + var e = this.wrapper.closest('.ce-block'); + e.classList.add("col-" + this.col); + e.classList.add("pt-" + this.pt); + e.classList.add("pr-" + this.pr); + e.classList.add("pb-" + this.pb); + e.classList.add("pl-" + this.pl); + } + + new(block, widget_type = block) { + const dialog_class = get_dialog_constructor(widget_type); + let block_name = block+'_name'; + this.dialog = new dialog_class({ + label: this.label, + type: widget_type, + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.block_widget = frappe.widget.make_widget({ + ...widget, + widget_type: widget_type, + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + } + }); + this.block_widget.customize(this.options); + this.wrapper.setAttribute(block_name, this.block_widget.label); + this.new_block_widget = this.block_widget.get_config(); + this.add_tune_button(); + }, + }); + + if (!this.readOnly && this.data && !this.data[block_name]) { + this.dialog.make(); + } + } + + on_edit(block_obj) { + let block_name = block_obj.edit_dialog.type+'_name'; + if (block_obj.edit_dialog.type == 'links') { + block_name = 'card_name'; + } + let block = block_obj.get_config(); + this.block_widget.widgets = block; + this.wrapper.setAttribute(block_name, block.label); + this.new_block_widget = block_obj.get_config(); + } + + add_tune_button() { + let $widget_control = $(this.wrapper).find('.widget-control'); + frappe.utils.add_custom_button( + frappe.utils.icon('dot-horizontal', 'xs'), + (event) => { + let evn = event; + !$('.ce-settings.ce-settings--opened').length && + setTimeout(() => { + this.api.toolbar.toggleBlockSettings(); + var position = $(evn.target).offset(); + $('.ce-settings.ce-settings--opened').offset({ + top: position.top + 25, + left: position.left - 77 + }); + }, 50); + }, + "tune-btn", + `${__('Tune')}`, + null, + $widget_control, + true + ); + } + + get_col() { + let col = 12; + let class_name = "col-12"; + let wrapper = this.wrapper.closest('.ce-block'); + const col_class = new RegExp(/\bcol-.+?\b/, "g"); + if (wrapper.className.match(col_class)) { + wrapper.classList.forEach(function (cn) { + cn.match(col_class) && (class_name = cn); + }); + let parts = class_name.split("-"); + col = parseInt(parts[1]); + } + return col; + } + + get_padding() { + let direction = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; + let padding = 0; + let pad_name = "p" + direction + "-0"; + let wrapper = this.wrapper.closest('.ce-block'); + let pad_left = new RegExp(/\pl-.+?\b/, "g"); + let pad_right = new RegExp(/\pr-.+?\b/, "g"); + let pad_top = new RegExp(/\pt-.+?\b/, "g"); + let pad_bottom = new RegExp(/\pb-.+?\b/, "g"); + + const get_padding = (pad_direction) => { + if (wrapper.className.match(pad_direction)) { + wrapper.classList.forEach(function (cn) { + cn.match(pad_direction) && (pad_name = cn); + }); + let parts = pad_name.split("-"); + padding = parseInt(parts[1]); + } + } + + if ("l" == direction) { + get_padding(pad_left); + } else if ("r" == direction) { + get_padding(pad_right); + } else if ("t" == direction) { + get_padding(pad_top); + } else if ("b" == direction) { + get_padding(pad_bottom); + } + return padding; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index ecde804be2..ed3704cc2d 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Card { +import Block from "./block.js"; +export default class Card extends Block { static get toolbox() { return { title: 'Card', @@ -11,12 +11,8 @@ export default class Card { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts) this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; @@ -35,54 +31,19 @@ export default class Card { render() { this.wrapper = document.createElement('div'); - this._new_card(); + this.new('card', 'links'); if (this.data && this.data.card_name) { - this._make_cards(this.data.card_name); + this.make('card', this.data.card_name, 'links'); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.card_name) { return false; @@ -94,143 +55,12 @@ export default class Card { save(blockContent) { return { card_name: blockContent.getAttribute('card_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_card_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_card() { - const dialog_class = get_dialog_constructor('links'); - this.dialog = new dialog_class({ - label: this.label, - type: 'card', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.card_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'links', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.card_widget) - } - }); - this.card_widget.customize(this.options); - this.wrapper.setAttribute("card_name", this.card_widget.label); - this.new_card_widget = this.card_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.card_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.card_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.card_field.make(); - } - - on_edit(card_obj) { - let card = card_obj.get_config(); - this.card_widget.widgets = card; - this.wrapper.setAttribute("card_name", card.label); - this.new_card_widget = card_obj.get_config(); - } - - _make_cards(card_name) { - let card = this.config.page_data.cards.items.find(obj => { - return obj.label == card_name; - }); - this.wrapper.innerHTML = ''; - card.in_customize_mode = !this.readOnly; - this.card_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "links", - options: this.options, - widgets: card, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("card_name", card_name); - if (!this.readOnly) { - this.card_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index c562b453ed..cf43cc5455 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Chart { +import Block from "./block.js"; +export default class Chart extends Block { static get toolbox() { return { title: 'Chart', @@ -11,12 +11,8 @@ export default class Chart { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts) this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -35,54 +31,19 @@ export default class Chart { render() { this.wrapper = document.createElement('div'); - this._new_chart(); + this.new('chart'); if (this.data && this.data.chart_name) { - this._make_charts(this.data.chart_name); + this.make('chart', this.data.chart_name); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.chart_name) { return false; @@ -94,144 +55,12 @@ export default class Chart { save(blockContent) { return { chart_name: blockContent.getAttribute('chart_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_chart_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_chart() { - const dialog_class = get_dialog_constructor('chart'); - this.dialog = new dialog_class({ - label: this.label, - type: 'chart', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.chart_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'chart', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.chart_widget) - } - }); - this.chart_widget.customize(this.options); - this.wrapper.setAttribute("chart_name", this.chart_widget.label); - this.new_chart_widget = this.chart_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.chart_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.chart_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.chart_field.make(); - } - - on_edit(chart_obj) { - let chart = chart_obj.get_config(); - this.chart_widget.widgets = chart; - this.wrapper.setAttribute("chart_name", chart.label); - this.new_chart_widget = chart_obj.get_config(); - } - - _make_charts(chart_name) { - let chart = this.config.page_data.charts.items.find(obj => { - return obj.label == chart_name; - }); - if (!chart) return; - this.wrapper.innerHTML = ''; - this.chart_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "chart", - class_name: "widget-charts", - options: this.options, - widgets: chart, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("chart_name", chart_name); - if (!this.readOnly) { - this.chart_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/wiki_blocks/header.js index a3fcc39175..eeb6054e63 100644 --- a/frappe/public/js/frappe/wiki_blocks/header.js +++ b/frappe/public/js/frappe/wiki_blocks/header.js @@ -1,8 +1,9 @@ -export default class Header { +import Block from "./block.js"; +export default class Header extends Block { constructor({ data, config, api, readOnly }) { - this.api = api; - this.readOnly = readOnly; + let opts = { config, api, readOnly }; + super(opts); this._CSS = { block: this.api.styles.block, @@ -11,7 +12,7 @@ export default class Header { wrapper: 'ce-header', }; - this._settings = config; + this._settings = this.config; this._data = this.normalizeData(data); this.settingsButtons = []; this._element = this.getTag(); @@ -55,7 +56,7 @@ export default class Header { this.wrapper.classList.add('widget', 'header'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -75,7 +76,7 @@ export default class Header { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -84,7 +85,7 @@ export default class Header { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-header", @@ -98,18 +99,6 @@ export default class Header { return this._element; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - renderSettings() { const holder = document.createElement('DIV'); @@ -167,14 +156,15 @@ export default class Header { } save(toolsContent) { + this.wrapper = this._element; return { text: toolsContent.innerText, level: this.currentLevel.number, - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } @@ -187,64 +177,6 @@ export default class Header { e.classList.add("pl-" + this.pl); } - _getCol() { - var e = 12; - var t = "col-12"; - var n = this._element.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this._element.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - static get conversionConfig() { return { export: 'text', // use 'text' property for other blocks diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index cc05f3edbc..3a5f411954 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -1,12 +1,13 @@ -export default class Paragraph { +import Block from "./block.js"; +export default class Paragraph extends Block{ static get DEFAULT_PLACEHOLDER() { return ''; } constructor({data, config, api, readOnly}) { - this.api = api; - this.readOnly = readOnly; + let opts = {config, api, readOnly}; + super(opts); this._CSS = { block: this.api.styles.block, @@ -17,10 +18,10 @@ export default class Paragraph { this.onKeyUp = this.onKeyUp.bind(this); } - this._placeholder = config.placeholder ? config.placeholder : Paragraph.DEFAULT_PLACEHOLDER; + this._placeholder = this.config.placeholder ? this.config.placeholder : Paragraph.DEFAULT_PLACEHOLDER; this._data = {}; this._element = this.drawView(); - this._preserveBlank = config.preserveBlank !== undefined ? config.preserveBlank : false; + this._preserveBlank = this.config.preserveBlank !== undefined ? this.config.preserveBlank : false; this.data = data; this.col = this.data.col ? this.data.col : "12"; @@ -68,7 +69,7 @@ export default class Paragraph { this.wrapper.classList.add('widget'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -88,7 +89,7 @@ export default class Paragraph { $para_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -97,7 +98,7 @@ export default class Paragraph { $para_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-paragraph", @@ -111,18 +112,6 @@ export default class Paragraph { return this._element; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - merge(data) { let newData = { text: this.data.text + data.text @@ -140,13 +129,14 @@ export default class Paragraph { } save(toolsContent) { + this.wrapper = this._element; return { text: toolsContent.innerText, - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } @@ -159,64 +149,6 @@ export default class Paragraph { e.classList.add("pl-" + this.pl); } - _getCol() { - var e = 12; - var t = "col-12"; - var n = this._element.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this._element.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - onPaste(event) { const data = { text: event.detail.data.innerHTML diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index dc1cbb5b5a..d7b4a9b4f1 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -1,5 +1,5 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; -export default class Shortcut { +import Block from "./block.js"; +export default class Shortcut extends Block { static get toolbox() { return { title: 'Shortcut', @@ -11,12 +11,8 @@ export default class Shortcut { return true; } - constructor({data, api, config, readOnly, block}) { - this.data = data; - this.api = api; - this.block = block; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly, block}) { + super(opts); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -34,53 +30,18 @@ export default class Shortcut { render() { this.wrapper = document.createElement('div'); - this._new_shortcut(); + this.new('shortcut'); if (this.data && this.data.shortcut_name) { - this._make_shortcuts(this.data.shortcut_name); + this.make('shortcut', this.data.shortcut_name); } if (!this.readOnly) { - this._add_tune_button(); + this.add_tune_button(); } return this.wrapper; } - _add_tune_button() { - let $widget_control = $(this.wrapper).find('.widget-control'); - this.add_custom_button( - frappe.utils.icon('dot-horizontal', 'xs'), - (event) => { - let evn = event; - !$('.ce-settings.ce-settings--opened').length && - setTimeout(() => { - this.api.toolbar.toggleBlockSettings(); - var position = $(evn.target).offset(); - $('.ce-settings.ce-settings--opened').offset({ - top: position.top + 25, - left: position.left - 77 - }); - }, 50); - }, - "tune-btn", - `${__('Tune')}`, - null, - $widget_control - ); - } - - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - wrapper.prepend(button); - } - validate(savedData) { if (!savedData.shortcut_name) { return false; @@ -92,143 +53,12 @@ export default class Shortcut { save(blockContent) { return { shortcut_name: blockContent.getAttribute('shortcut_name'), - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l"), - new: this.new_shortcut_widget + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _new_shortcut() { - const dialog_class = get_dialog_constructor('shortcut'); - this.dialog = new dialog_class({ - label: this.label, - type: 'shortcut', - primary_action: (widget) => { - widget.in_customize_mode = 1; - this.shortcut_widget = frappe.widget.make_widget({ - ...widget, - widget_type: 'shortcut', - container: this.wrapper, - options: { - ...this.options, - on_delete: () => this.api.blocks.delete(), - on_edit: () => this.on_edit(this.shortcut_widget) - } - }); - this.shortcut_widget.customize(this.options); - this.wrapper.setAttribute("shortcut_name", this.shortcut_widget.label); - this.new_shortcut_widget = this.shortcut_widget.get_config(); - this._add_tune_button(); - }, - }); - - if (!this.readOnly && this.data && !this.data.shortcut_name) { - this.dialog.make(); - } - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } - - _make_fieldgroup(parent, ddf_list) { - this.shortcut_field = new frappe.ui.FieldGroup({ - "fields": ddf_list, - "parent": parent - }); - this.shortcut_field.make(); - } - - on_edit(shortcut_obj) { - let shortcut = shortcut_obj.get_config(); - this.shortcut_widget.widgets = shortcut; - this.wrapper.setAttribute("shortcut_name", shortcut.label); - this.new_shortcut_widget = shortcut_obj.get_config(); - } - - _make_shortcuts(shortcut_name) { - let shortcut = this.config.page_data.shortcuts.items.find(obj => { - return obj.label == shortcut_name; - }); - this.wrapper.innerHTML = ''; - shortcut.in_customize_mode = !this.readOnly; - this.shortcut_widget = new frappe.widget.SingleWidgetGroup({ - container: this.wrapper, - type: "shortcut", - options: this.options, - widgets: shortcut, - api: this.api, - block: this.block - }); - this.wrapper.setAttribute("shortcut_name", shortcut_name); - if (!this.readOnly) { - this.shortcut_widget.customize(); - } - } } \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index 5f26f06ca4..d2b7707ced 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -1,4 +1,5 @@ -export default class Spacer { +import Block from './block.js'; +export default class Spacer extends Block { static get toolbox() { return { title: 'Spacer', @@ -10,11 +11,8 @@ export default class Spacer { return true; } - constructor({data, api, config, readOnly}) { - this.data = data; - this.api = api; - this.config = config; - this.readOnly = readOnly; + constructor(opts = {data, api, config, readOnly}) { + super(opts); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; @@ -39,7 +37,7 @@ export default class Spacer { let $widget_control = $spacer.find('.widget-control'); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('dot-horizontal', 'xs'), (event) => { let evn = event; @@ -59,7 +57,7 @@ export default class Spacer { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, "drag-handle", @@ -68,7 +66,7 @@ export default class Spacer { $widget_control ); - this.add_custom_button( + frappe.utils.add_custom_button( frappe.utils.icon('delete', 'xs'), () => this.api.blocks.delete(), "delete-spacer", @@ -80,92 +78,13 @@ export default class Spacer { return this.wrapper; } - add_custom_button(html, action, class_name = "", title="", btn_type, wrapper) { - if (!btn_type) btn_type = 'btn-secondary'; - let button = $( - `` - ); - button.click(event => { - event.stopPropagation(); - action && action(event); - }); - button.appendTo(wrapper); - } - save() { return { - col: this._getCol(), - pt: this._getPadding("t"), - pr: this._getPadding("r"), - pb: this._getPadding("b"), - pl: this._getPadding("l") + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l") }; } - - rendered() { - var e = this.wrapper.closest('.ce-block'); - e.classList.add("col-" + this.col); - e.classList.add("pt-" + this.pt); - e.classList.add("pr-" + this.pr); - e.classList.add("pb-" + this.pb); - e.classList.add("pl-" + this.pl); - } - - _getCol() { - var e = 12; - var t = "col-12"; - var n = this.wrapper.closest('.ce-block'); - var r = new RegExp(/\bcol-.+?\b/, "g"); - if (n.className.match(r)) { - n.classList.forEach(function (e) { - e.match(r) && (t = e); - }); - var a = t.split("-"); - e = parseInt(a[1]); - } - return e; - } - - _getPadding() { - var e = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : "l"; - var t = 0; - var n = "p" + e + "-0"; - var r = this.wrapper.closest('.ce-block'); - var a = new RegExp(/\pl-.+?\b/, "g"); - var i = new RegExp(/\pr-.+?\b/, "g"); - var o = new RegExp(/\pt-.+?\b/, "g"); - var c = new RegExp(/\pb-.+?\b/, "g"); - if ("l" == e) { - if (r.className.match(a)) { - r.classList.forEach(function (e) { - e.match(a) && (n = e); - }); - var s = n.split("-"); - t = parseInt(s[1]); - } - } else if ("r" == e) { - if (r.className.match(i)) { - r.classList.forEach(function (e) { - e.match(i) && (n = e); - }); - var l = n.split("-"); - t = parseInt(l[1]); - } - } else if ("t" == e) { - if (r.className.match(o)) { - r.classList.forEach(function (e) { - e.match(o) && (n = e); - }); - var u = n.split("-"); - t = parseInt(u[1]); - } - } else if ("b" == e && r.className.match(c)) { - r.classList.forEach(function (e) { - e.match(c) && (n = e); - }); - var p = n.split("-"); - t = parseInt(p[1]); - } - return t; - } } \ No newline at end of file From 2cc90ceafe725f177f22f223d40c437c164b715c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 11:13:51 +0530 Subject: [PATCH 0156/1519] fix: sider fix --- frappe/public/js/frappe/views/wiki.js | 9 +++++---- frappe/public/js/frappe/wiki_blocks/block.js | 2 +- frappe/public/js/frappe/wiki_blocks/card.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/chart.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/paragraph.js | 2 +- frappe/public/js/frappe/wiki_blocks/shortcut.js | 4 ++-- frappe/public/js/frappe/wiki_blocks/spacer.js | 4 ++-- 7 files changed, 15 insertions(+), 14 deletions(-) diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index f247f34330..06964a9d38 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -140,8 +140,8 @@ frappe.views.Wiki = class Wiki { this.add_drop_icon(item, sidebar_control, $item_container); } - add_drop_icon(item, sidebar_control, $item_container) { - let $child_item_section = $item_container.find('.sidebar-child-item'); + add_drop_icon(item, sidebar_control, item_container) { + let $child_item_section = item_container.find('.sidebar-child-item'); let $drop_icon = $(``) .appendTo(sidebar_control); @@ -400,7 +400,8 @@ frappe.views.Wiki = class Wiki { { label: __('Title'), fieldtype: 'Data', - fieldname: 'title' + fieldname: 'title', + "reqd": 1 }, { label: __('Parent'), @@ -422,7 +423,7 @@ frappe.views.Wiki = class Wiki { type: "header", data: { text: this.title, - level: 2 + level: 4 } } ] diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js index 1f8cdf1f21..a3f95890c7 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -134,7 +134,7 @@ export default class Block { let parts = pad_name.split("-"); padding = parseInt(parts[1]); } - } + }; if ("l" == direction) { get_padding(pad_left); diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index ed3704cc2d..0c8dc4ca82 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -11,8 +11,8 @@ export default class Card extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts) + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.sections = {}; this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index cf43cc5455..505d03c732 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -11,8 +11,8 @@ export default class Chart extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts) + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/wiki_blocks/paragraph.js index 3a5f411954..ebabcc98b6 100644 --- a/frappe/public/js/frappe/wiki_blocks/paragraph.js +++ b/frappe/public/js/frappe/wiki_blocks/paragraph.js @@ -1,5 +1,5 @@ import Block from "./block.js"; -export default class Paragraph extends Block{ +export default class Paragraph extends Block { static get DEFAULT_PLACEHOLDER() { return ''; diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index d7b4a9b4f1..7de8097715 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -11,8 +11,8 @@ export default class Shortcut extends Block { return true; } - constructor(opts = {data, api, config, readOnly, block}) { - super(opts); + constructor({data, api, config, readOnly, block}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/wiki_blocks/spacer.js index d2b7707ced..4a97dbcb02 100644 --- a/frappe/public/js/frappe/wiki_blocks/spacer.js +++ b/frappe/public/js/frappe/wiki_blocks/spacer.js @@ -11,8 +11,8 @@ export default class Spacer extends Block { return true; } - constructor(opts = {data, api, config, readOnly}) { - super(opts); + constructor({data, api, config, readOnly}) { + super(arguments[0]); this.col = this.data.col ? this.data.col : "12"; this.pt = this.data.pt ? this.data.pt : "0"; this.pr = this.data.pr ? this.data.pr : "0"; From 63a42f54b292d8592b7eb48ddf33686d17778547 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 31 May 2021 14:55:23 +0530 Subject: [PATCH 0157/1519] fix: Deprecation warning --- frappe/website/page_renderers/template_page.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index d1f0b47032..ea92c7103c 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -70,8 +70,8 @@ class TemplatePage(BaseTemplatePage): self.setup_template() self.update_context() self.post_process_context() - html = self.render_template() + html = self.render_template() html = self.update_toc(html) html = self.add_csrf_token(html) @@ -182,7 +182,8 @@ class TemplatePage(BaseTemplatePage): comment_tag = f"" if comment_tag in self.source: self.context[context_key] = value - click.echo(f'⚠️ DEPRECATION WARNING: {comment_tag} will be deprecated on 2021-12-31.') + click.echo(f'\n⚠️ DEPRECATION WARNING: {comment_tag} will be deprecated on 2021-12-31.') + click.echo(f'Please remove it from {self.template_path} in {self.app}') def run_pymodule_method(self, method): if hasattr(self.pymodule, method): From a42fc3c5dfe674a48c91cb29acb5e61cf03dd61c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 31 May 2021 14:56:09 +0530 Subject: [PATCH 0158/1519] feat: Option to add custom renderers --- frappe/website/path_resolver.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 9816900677..0519d82735 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -35,7 +35,8 @@ class PathResolver(): return frappe.flags.redirect_location, RedirectPage(self.path) endpoint = resolve_path(self.path) - renderers = (StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage) + custom_renderers = frappe.get_hooks('page_renderer') + renderers = custom_renderers + [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] for renderer in renderers: renderer_instance = renderer(endpoint, 200) From 35590453dfa09f72c3f2cfd74a079cbb692535a9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 31 May 2021 19:45:14 +0530 Subject: [PATCH 0159/1519] fix: minor fixes --- frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 5d119e364d..392169b502 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -12,7 +12,7 @@ class InternalWikiPage(Document): def before_insert(self): sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) - self.sequence_id = max([page.sequence_id for page in sequence_id_list]) + 1 + self.sequence_id = max([page.sequence_id for page in sequence_id_list] or [0]) + 1 @frappe.whitelist() def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): From bcd6d2cb42a7e23ea274e0e3a64ff7a2f1499b4c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 1 Jun 2021 11:25:15 +0530 Subject: [PATCH 0160/1519] fix: Added link count field in Workspace Link --- .../doctype/workspace_link/workspace_link.json | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace_link/workspace_link.json b/frappe/desk/doctype/workspace_link/workspace_link.json index 53dadad83d..a7b217be9e 100644 --- a/frappe/desk/doctype/workspace_link/workspace_link.json +++ b/frappe/desk/doctype/workspace_link/workspace_link.json @@ -8,15 +8,16 @@ "type", "label", "icon", - "only_for", "hidden", "link_details_section", "link_type", "link_to", "column_break_7", "dependencies", + "only_for", "onboard", - "is_query_report" + "is_query_report", + "link_count" ], "fields": [ { @@ -99,12 +100,19 @@ "fieldname": "is_query_report", "fieldtype": "Check", "label": "Is Query Report" + }, + { + "depends_on": "eval:doc.type == \"Card Break\"", + "fieldname": "link_count", + "fieldtype": "Int", + "hidden": 1, + "label": "Link Count" } ], "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2021-05-13 13:10:18.128512", + "modified": "2021-06-01 11:23:28.990593", "modified_by": "Administrator", "module": "Desk", "name": "Workspace Link", From 6596dd612f16225c065d3fbcbda3fad1248d0b08 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 1 Jun 2021 20:33:04 +0530 Subject: [PATCH 0161/1519] fix: User based Wiki Pages --- frappe/desk/desktop.py | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index ba4a44d7d7..f4d4796aef 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -543,20 +543,40 @@ def save_customization(page, config): def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) + page_doc = get_custom_workspace_for_user(page) + + # Update field values + page_doc.update({ + "icon": original_page.icon, + "charts_label": original_page.charts_label, + "cards_label": original_page.cards_label, + "shortcuts_label": original_page.shortcuts_label, + "module": original_page.module, + "onboarding": original_page.onboarding, + "developer_mode_only": original_page.developer_mode_only, + "category": original_page.category, + "charts": original_page.charts, + "shortcuts": original_page.shortcuts, + "links": original_page.links, + }) + widgets = _dict(loads(new_widgets)) if widgets.chart: - original_page.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) + page_doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: - original_page.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + page_doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - original_page.build_links_table_from_card(widgets.card) + page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - clean_up(original_page, page) + clean_up(page_doc, page) + + # Set label + page_doc.label = page + '-' + frappe.session.user try: - original_page.save(ignore_permissions=True) + page_doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: # Create a json string to log json_config = dumps(widgets, sort_keys=True, indent=4) From 915f778538ee2bc711bfa9c47cdeb874fa0af235 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 2 Jun 2021 15:15:54 +0530 Subject: [PATCH 0162/1519] fix: minor fix --- frappe/desk/desktop.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index f4d4796aef..9df46cc7df 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -555,10 +555,13 @@ def save_new_widget(page, new_widgets): "onboarding": original_page.onboarding, "developer_mode_only": original_page.developer_mode_only, "category": original_page.category, - "charts": original_page.charts, - "shortcuts": original_page.shortcuts, - "links": original_page.links, }) + if page_doc.is_new(): + page_doc.update({ + "charts": original_page.charts, + "shortcuts": original_page.shortcuts, + "links": original_page.links, + }) widgets = _dict(loads(new_widgets)) From c36f0631ee1e1bece691039b904c7ece9dc452c9 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 2 Jun 2021 16:52:00 +0530 Subject: [PATCH 0163/1519] fix: User based Wiki Pages fix --- frappe/desk/desktop.py | 22 ++++++++++------- frappe/desk/doctype/workspace/workspace.json | 25 +++++++++++++------- frappe/public/js/frappe/views/wiki.js | 3 ++- 3 files changed, 32 insertions(+), 18 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 9df46cc7df..8ea5738caf 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -5,6 +5,7 @@ from __future__ import unicode_literals import frappe import json +from typing import Dict, List from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -30,7 +31,9 @@ def handle_not_exist(fn): class Workspace: - def __init__(self, page_name, minimal=False): + def __init__(self, page_name, minimal=False, wiki=False) -> List[Dict]: + if isinstance(wiki, str): + wiki = json.loads(wiki) self.page_name = page_name self.extended_links = [] self.extended_charts = [] @@ -39,7 +42,7 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user() + self.doc = self.get_page_for_user(wiki) if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -104,11 +107,12 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self): + def get_page_for_user(self, wiki=False): filters = { 'extends': self.page_name, 'for_user': frappe.session.user } + filters['for_wiki'] = wiki user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: return frappe.get_cached_doc("Workspace", user_pages[0]) @@ -350,7 +354,7 @@ class Workspace: @frappe.whitelist() @frappe.read_only() -def get_desktop_page(page): +def get_desktop_page(page, wiki=False): """Applies permissions, customizations and returns the configruration for a page on desk. @@ -361,7 +365,7 @@ def get_desktop_page(page): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - wspace = Workspace(page) + wspace = Workspace(page, wiki=wiki) wspace.build_workspace() return { 'charts': wspace.charts, @@ -461,7 +465,7 @@ def get_custom_report_list(module): return out -def get_custom_workspace_for_user(page): +def get_custom_workspace_for_user(page, wiki=False): """Get custom page from workspace if exists or create one Args: @@ -474,12 +478,14 @@ def get_custom_workspace_for_user(page): 'extends': page, 'for_user': frappe.session.user } + filters['for_wiki'] = wiki pages = frappe.get_list("Workspace", filters=filters) if pages: return frappe.get_doc("Workspace", pages[0]) doc = frappe.new_doc("Workspace") doc.extends = page doc.for_user = frappe.session.user + doc.for_wiki = wiki return doc @@ -543,7 +549,7 @@ def save_customization(page, config): def save_new_widget(page, new_widgets): original_page = frappe.get_doc("Workspace", page) - page_doc = get_custom_workspace_for_user(page) + page_doc = get_custom_workspace_for_user(page, True) # Update field values page_doc.update({ @@ -576,7 +582,7 @@ def save_new_widget(page, new_widgets): clean_up(page_doc, page) # Set label - page_doc.label = page + '-' + frappe.session.user + page_doc.label = page + '-Wiki-' + frappe.session.user try: page_doc.save(ignore_permissions=True) diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 386267b699..2de8eeef62 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -24,6 +24,7 @@ "pin_to_top", "pin_to_bottom", "hide_custom", + "for_wiki", "section_break_2", "charts_label", "charts", @@ -209,16 +210,22 @@ "options": "Workspace Link" }, { - "default": "0", - "depends_on": "extends_another_page", - "description": "Sets the current page as default for all users", - "fieldname": "is_default", - "fieldtype": "Check", - "label": "Is Default" - } + "default": "0", + "depends_on": "extends_another_page", + "description": "Sets the current page as default for all users", + "fieldname": "is_default", + "fieldtype": "Check", + "label": "Is Default" + }, + { + "default": "0", + "fieldname": "for_wiki", + "fieldtype": "Check", + "label": "For Wiki" + } ], "links": [], - "modified": "2021-01-21 12:09:36.156614", + "modified": "2021-06-02 15:35:08.963507", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", @@ -248,4 +255,4 @@ ], "sort_field": "modified", "sort_order": "DESC" -} +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 06964a9d38..9acf3b72c7 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -172,7 +172,8 @@ frappe.views.Wiki = class Wiki { get_data(page) { return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: page + page: page, + wiki: true }).then(data => { this.page_data = data; if (!this.page_data) return; From 879ecaacabad73ea13f583e61d85f5a086a36f6c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 3 Jun 2021 10:40:36 +0530 Subject: [PATCH 0164/1519] fix: Custom page renderer logic --- frappe/website/path_resolver.py | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 0519d82735..bedd9f19ae 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -1,4 +1,5 @@ import re +import click from werkzeug.routing import Rule @@ -35,7 +36,7 @@ class PathResolver(): return frappe.flags.redirect_location, RedirectPage(self.path) endpoint = resolve_path(self.path) - custom_renderers = frappe.get_hooks('page_renderer') + custom_renderers = self.get_custom_page_renderers() renderers = custom_renderers + [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] for renderer in renderers: @@ -49,6 +50,27 @@ class PathResolver(): _endpoint, renderer_instance = self.resolve() return not isinstance(renderer_instance, NotFoundPage) + @staticmethod + def get_custom_page_renderers(): + custom_renderers = [] + for renderer_path in frappe.get_hooks('page_renderer') or []: + try: + renderer = frappe.get_attr(renderer_path) + if not hasattr(renderer, 'can_render'): + click.echo(f'{renderer.__name__} does not have can_render method') + continue + if not hasattr(renderer, 'render'): + click.echo(f'{renderer.__name__} does not have render method') + continue + + custom_renderers.append(renderer) + + except Exception: + click.echo(f'Failed to load page renderer. Import path: {renderer_path}') + + return custom_renderers + + def resolve_redirect(path, query_string=None): ''' From 254496450163cc308db0c9a23224b041daceb07d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 3 Jun 2021 10:41:22 +0530 Subject: [PATCH 0165/1519] test: Add test case to validate custom page renderer --- frappe/tests/test_website.py | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 69425cdc45..84bf3ef8f1 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -3,9 +3,10 @@ from __future__ import unicode_literals import unittest import frappe -from frappe.website.serve import get_response -from frappe.website.utils import get_home_page, clear_website_cache from frappe.utils import set_request +from frappe.website.serve import get_response, get_response_content +from frappe.website.utils import (build_response, clear_website_cache, get_home_page) + class TestWebsite(unittest.TestCase): def setUp(self): @@ -178,6 +179,25 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'website_redirects') frappe.cache().delete_key('app_hooks') + def test_custom_page_renderer(self): + import frappe.hooks + frappe.hooks.page_renderer = ['frappe.tests.test_website.CustomPageRenderer'] + frappe.cache().delete_key('app_hooks') + set_request(method='GET', path='/custom') + response = get_response() + self.assertEqual(response.status_code, 3984) + + set_request(method='GET', path='/new') + content = get_response_content() + self.assertIn("
    Custom Page Response
    ", content) + + set_request(method='GET', path='/random') + response = get_response() + self.assertEqual(response.status_code, 404) + + delattr(frappe.hooks, 'page_renderer') + frappe.cache().delete_key('app_hooks') + def set_home_page_hook(key, value): from frappe import hooks @@ -189,3 +209,15 @@ def set_home_page_hook(key, value): setattr(hooks, key, value) frappe.cache().delete_key('app_hooks') +class CustomPageRenderer(): + def __init__(self, path, status_code=None): + self.path = path + # custom status code + self.status_code = 3984 + + def can_render(self): + if self.path in ('new', 'custom'): + return True + + def render(self): + return build_response(self.path, """
    Custom Page Response
    """, self.status_code) From 468b8fbd996142193107ecfc8f93a975646911d3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 3 Jun 2021 11:48:49 +0530 Subject: [PATCH 0166/1519] fix: Remove unnecessary import --- frappe/website/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index df3cdefa1f..0f5f182ea2 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -7,7 +7,6 @@ import re from functools import wraps import yaml -from past.builtins import cmp from six import iteritems from werkzeug.wrappers import Response From 1ef83ea15f264b785cd9981bc907d8aebbc1efa1 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 4 Jun 2021 11:50:03 +0530 Subject: [PATCH 0167/1519] test: Add printview page test --- frappe/tests/test_website.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 68ec4f1f09..6f265d9b94 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -196,6 +196,11 @@ class TestWebsite(unittest.TestCase): delattr(frappe.hooks, 'page_renderer') frappe.cache().delete_key('app_hooks') + def test_printview_page(self): + content = get_response_content('/Language/en') + self.assertIn('
    ', content) + self.assertIn('
    Language
    ', content) + def set_home_page_hook(key, value): from frappe import hooks From 0387b8f0270bf73dd64cf78c9338e69578341690 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 4 Jun 2021 14:25:48 +0530 Subject: [PATCH 0168/1519] fix: WebForm render --- frappe/website/page_renderers/document_page.py | 2 -- frappe/website/page_renderers/web_form.py | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index 2f272ffd15..f1741c681f 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -32,7 +32,6 @@ class DocumentPage(BaseTemplatePage): self.docname = frappe.db.get_value(doctype, filters, 'name') if self.docname: self.doctype = doctype - self.meta = meta return True except Exception as e: if not frappe.db.is_missing_column(e): @@ -43,7 +42,6 @@ class DocumentPage(BaseTemplatePage): if d: self.doctype = 'Web Page' self.docname = d.name - self.meta = frappe.get_meta(self.doctype) return True else: return False diff --git a/frappe/website/page_renderers/web_form.py b/frappe/website/page_renderers/web_form.py index 094ae78d71..786aeef3d1 100644 --- a/frappe/website/page_renderers/web_form.py +++ b/frappe/website/page_renderers/web_form.py @@ -1,6 +1,10 @@ -from frappe.website.page_renderers.web_page import WebPage +from frappe.website.page_renderers.document_page import DocumentPage import frappe -class WebFormPage(WebPage): +class WebFormPage(DocumentPage): def can_render(self): - return bool(frappe.get_all("Web Form", filters={'route': self.path})) + webform_name = frappe.db.exists("Web Form", {'route': self.path}, cache=True) + if webform_name: + self.doctype = 'Web Form' + self.docname = webform_name + return bool(webform_name) From 3c6744651706ed0c28d414f9ba45437593eb6b4a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 4 Jun 2021 14:26:14 +0530 Subject: [PATCH 0169/1519] test: Simple test to validate WebForm rendering --- frappe/website/doctype/web_form/test_web_form.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/frappe/website/doctype/web_form/test_web_form.py b/frappe/website/doctype/web_form/test_web_form.py index c411922594..603b0c9df7 100644 --- a/frappe/website/doctype/web_form/test_web_form.py +++ b/frappe/website/doctype/web_form/test_web_form.py @@ -3,6 +3,7 @@ import frappe import unittest, json +from frappe.website.serve import get_response_content from frappe.website.doctype.web_form.web_form import accept test_dependencies = ['Web Form'] @@ -46,3 +47,10 @@ class TestWebForm(unittest.TestCase): self.assertEqual(frappe.db.get_value("Event", self.event_name, "description"), doc.get('description')) + + def test_webform_render(self): + content = get_response_content('request-data') + self.assertIn('

    Request Data

    ', content) + self.assertIn('data-doctype="Web Form"', content) + self.assertIn('data-path="request-data"', content) + self.assertIn('source-type="Generator"', content) From 32eb4f7c22a4396b6937b9f2ec0f3b2947550389 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 7 Jun 2021 12:39:05 +0530 Subject: [PATCH 0170/1519] fix: Public & Private Pages --- frappe/desk/desktop.py | 12 +- frappe/desk/doctype/internal_wiki/__init__.py | 0 .../doctype/internal_wiki/internal_wiki.js | 8 + .../doctype/internal_wiki/internal_wiki.json | 52 ++++ .../doctype/internal_wiki/internal_wiki.py | 114 ++++++++ .../internal_wiki/test_internal_wiki.py | 8 + .../internal_wiki_page.json | 42 +-- .../internal_wiki_page/internal_wiki_page.py | 66 ++--- frappe/public/js/frappe/views/wiki.js | 244 ++++++++++-------- frappe/public/scss/desk/wiki.scss | 40 ++- 10 files changed, 385 insertions(+), 201 deletions(-) create mode 100644 frappe/desk/doctype/internal_wiki/__init__.py create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.js create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.json create mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.py create mode 100644 frappe/desk/doctype/internal_wiki/test_internal_wiki.py diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8ea5738caf..1789f04924 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -365,6 +365,8 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: + if wiki and not frappe.db.exists("Workspace", page): + return wspace = Workspace(page, wiki=wiki) wspace.build_workspace() return { @@ -547,7 +549,7 @@ def save_customization(page, config): return True -def save_new_widget(page, new_widgets): +def save_new_widget(page, blocks, new_widgets): original_page = frappe.get_doc("Workspace", page) page_doc = get_custom_workspace_for_user(page, True) @@ -579,7 +581,7 @@ def save_new_widget(page, new_widgets): page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - clean_up(page_doc, page) + if widgets: clean_up(page_doc, blocks) # Set label page_doc.label = page + '-Wiki-' + frappe.session.user @@ -602,14 +604,12 @@ def save_new_widget(page, new_widgets): return True -def clean_up(original_page, page): +def clean_up(original_page, blocks): page_widgets = {} - content = frappe.db.get_value("Internal Wiki Page", page, "content") - for wid in ['shortcut', 'card', 'chart']: # get list of widget's name from internal wiki page - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(content) if x['type'] == wid] + page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] # shortcut & chart cleanup for wid in ['shortcut', 'chart']: diff --git a/frappe/desk/doctype/internal_wiki/__init__.py b/frappe/desk/doctype/internal_wiki/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.js b/frappe/desk/doctype/internal_wiki/internal_wiki.js new file mode 100644 index 0000000000..6c86ac23df --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.js @@ -0,0 +1,8 @@ +// Copyright (c) 2021, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on('Internal Wiki', { + // refresh: function(frm) { + + // } +}); diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.json b/frappe/desk/doctype/internal_wiki/internal_wiki.json new file mode 100644 index 0000000000..64c75c47ce --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.json @@ -0,0 +1,52 @@ +{ + "actions": [], + "autoname": "field:title", + "creation": "2021-06-02 18:41:57.221425", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "wiki_pages" + ], + "fields": [ + { + "fieldname": "title", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Title", + "reqd": 1, + "unique": 1 + }, + { + "fieldname": "wiki_pages", + "fieldtype": "Table", + "label": "Wiki Pages", + "options": "Internal Wiki Page" + } + ], + "index_web_pages_for_search": 1, + "links": [], + "modified": "2021-06-03 12:47:50.146962", + "modified_by": "Administrator", + "module": "Desk", + "name": "Internal Wiki", + "owner": "Administrator", + "permissions": [ + { + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, + "write": 1 + } + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 +} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py new file mode 100644 index 0000000000..e4d08443d3 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -0,0 +1,114 @@ +# Copyright (c) 2021, Frappe Technologies and contributors +# For license information, please see license.txt + +from __future__ import unicode_literals +import frappe +from frappe import _ +import json +from frappe.desk.desktop import save_new_widget +from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page +from frappe.model.document import Document + +class InternalWiki(Document): + pass + +@frappe.whitelist() +def get_wiki_pages(): + has_access = ("System Manager" in frappe.get_roles()) + + default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages + pages = prepare_pages(default_pages) + if not frappe.db.exists("Internal Wiki", frappe.session.user): + return {"pages": pages, "has_access": has_access} + + user_pages = frappe.get_doc("Internal Wiki", frappe.session.user).wiki_pages + user_pages = prepare_pages(user_pages, True) + pages.extend(user_pages) + + return {"pages": pages, "has_access": has_access} + +def prepare_pages(pages, is_editable=False): + prepared_pages = [] + for p in pages: + page = { + "title": p.title, + "icon": p.icon, + "parent_wiki": p.parent, + "parent_page": p.parent_page, + "content": p.content, + "is_editable": is_editable or ("System Manager" in frappe.get_roles()) + } + prepared_pages.append(page) + return prepared_pages + +@frappe.whitelist() +def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save=True): + if save: + # Create Workspace if not exist + if not frappe.db.exists("Workspace", title): + wspace = frappe.new_doc('Workspace') + wspace.label = title + wspace.for_wiki = 1 + wspace.insert(ignore_permissions=True) + + # create new Internal Wiki Page + new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') + + if public: + doc = frappe.get_doc("Internal Wiki", "Default") + doc.wiki_pages.extend([new_doc]) + elif not frappe.db.exists("Internal Wiki", frappe.session.user): + doc = frappe.new_doc("Internal Wiki") + doc.title = frappe.session.user + doc.wiki_pages = [new_doc] + else: + doc = frappe.get_doc("Internal Wiki", frappe.session.user) + doc.wiki_pages.extend([new_doc]) + else: + # update the content of Internal Wiki Page of current user + doc = frappe.get_doc("Internal Wiki", frappe.session.user) + for d in doc.wiki_pages: + if d.title == title: + d.content = blocks + doc.save(ignore_permissions=True) + + if json.loads(deleted_pages): + return delete_pages(json.loads(deleted_pages)) + + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + + if json.loads(new_widgets): + save_new_widget(title, blocks, new_widgets) + + return title + +def delete_pages(deleted_pages): + for page in deleted_pages: + # delete default Internal Wiki Page + if "System Manager" in frappe.get_roles(): + delete_page("Default", page) + + # delete user's Internal Wiki Page + if frappe.db.exists("Internal Wiki", frappe.session.user): + delete_page(frappe.session.user, page) + + # delete Workspace + filters = { + 'extends': page.get("title"), + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + frappe.get_doc("Workspace", pages[0]).delete() + return 'Home' + +def sort_pages(sb_items): + # update the index of default Internal Wiki Pages based on sorted sidebar pages + if "System Manager" in frappe.get_roles(): + sort_page("Default", sb_items) + + # update the index of user's Internal Wiki Pages based on sorted sidebar pages + if frappe.db.exists("Internal Wiki", frappe.session.user): + sort_page(frappe.session.user, sb_items) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py new file mode 100644 index 0000000000..15fb04b822 --- /dev/null +++ b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, Frappe Technologies and Contributors +# See license.txt + +# import frappe +import unittest + +class TestInternalWiki(unittest.TestCase): + pass diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json index 67180de25e..3bab22dbd0 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json @@ -1,6 +1,5 @@ { "actions": [], - "autoname": "field:title", "creation": "2021-05-02 14:44:26.490935", "doctype": "DocType", "editable_grid": 1, @@ -9,9 +8,6 @@ "title", "icon", "parent_page", - "column_break_4", - "sequence_id", - "private", "section_break_7", "content" ], @@ -21,8 +17,7 @@ "fieldtype": "Data", "in_list_view": 1, "label": "Title", - "reqd": 1, - "unique": 1 + "reqd": 1 }, { "fieldname": "icon", @@ -32,23 +27,8 @@ { "fieldname": "parent_page", "fieldtype": "Data", - "label": "Parent Page" - }, - { - "fieldname": "column_break_4", - "fieldtype": "Column Break" - }, - { - "fieldname": "sequence_id", - "fieldtype": "Int", "in_list_view": 1, - "label": "Sequence Id" - }, - { - "default": "0", - "fieldname": "private", - "fieldtype": "Check", - "label": "Private" + "label": "Parent Page" }, { "fieldname": "section_break_7", @@ -61,26 +41,14 @@ } ], "index_web_pages_for_search": 1, + "istable": 1, "links": [], - "modified": "2021-05-02 16:06:35.033197", + "modified": "2021-06-03 12:46:31.540481", "modified_by": "Administrator", "module": "Desk", "name": "Internal Wiki Page", "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], + "permissions": [], "sort_field": "modified", "sort_order": "DESC", "track_changes": 1 diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py index 392169b502..b73f7e1ddc 100644 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py @@ -4,52 +4,32 @@ from __future__ import unicode_literals import frappe -import json -from frappe.desk.desktop import save_new_widget from frappe.model.document import Document class InternalWikiPage(Document): + pass - def before_insert(self): - sequence_id_list = frappe.get_all('Internal Wiki Page', {'sequence_id'}) - self.sequence_id = max([page.sequence_id for page in sequence_id_list] or [0]) + 1 +def new_internal_wiki_page(title, blocks, parent, parentfield): + new_doc = frappe.new_doc('Internal Wiki Page') + new_doc.title = title + new_doc.content = blocks + new_doc.parent_page = parent + new_doc.parentfield = parentfield + return new_doc -@frappe.whitelist() -def save_wiki_page(title, parent, sb_items, deleted_pages, new_widgets, blocks, save=True): - if save: - if not frappe.db.exists("Workspace", title): - wspace = frappe.new_doc('Workspace') - wspace.label = title - wspace.insert() +def delete_page(user, wiki_page): + doc = frappe.get_doc("Internal Wiki", user) + for idx, page in enumerate(doc.wiki_pages): + if page.title == wiki_page.get("title") and page.parent == wiki_page.get("parent_wiki"): + del doc.wiki_pages[idx] + doc.save(ignore_permissions=True) - doc = frappe.new_doc('Internal Wiki Page') - doc.title = title - doc.parent_page = parent - doc.content = blocks - doc.insert() - else: - doc = frappe.get_doc('Internal Wiki Page', title) - doc.content = blocks - doc.save() - - if json.loads(sb_items): - for seq, d in enumerate(json.loads(sb_items)): - doc = frappe.get_doc('Internal Wiki Page', d.get('name')) - doc.sequence_id = seq + 1 - doc.parent_page = d.get('parent_page') or "" - doc.save() - doc.title = title - - if json.loads(deleted_pages): - for d in json.loads(deleted_pages): - wiki_doc = frappe.get_doc('Internal Wiki Page', d) - wiki_doc.delete() - wspace_doc = frappe.get_doc('Workspace', d) - if not wspace_doc.is_standard: - wspace_doc.delete() - return 'Build' - - if json.loads(new_widgets): - save_new_widget(title, new_widgets) - - return doc.title \ No newline at end of file +def sort_page(user, pages): + doc = frappe.get_doc("Internal Wiki", user) + for seq, d in enumerate(pages): + for page in doc.wiki_pages: + if page.title == d.get('title'): + page.idx = seq + 1 + page.parent_page = d.get('parent_page') or "" + break + doc.save(ignore_permissions=True) \ No newline at end of file diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 9acf3b72c7..29a5ea792a 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -57,41 +57,41 @@ frappe.views.Wiki = class Wiki { } setup_wiki_pages() { - this.get_pages().then(pages => { - this.all_pages = pages; + this.get_wiki_pages().then(pages => { + this.all_pages = pages.pages; + this.has_access = pages.has_access; if (this.all_pages) { frappe.wiki_pages = {}; - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); for (let page of this.all_pages) { - frappe.wiki_pages[frappe.router.slug(page.name)] = page; + frappe.wiki_pages[frappe.router.slug(page.title)] = {name: page.title}; } if (this.new_page) { + if (!frappe.wiki_pages[frappe.router.slug(this.new_page)]) { + this.new_page = this.all_pages[0].title; + } frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); this.new_page = null; } - this.make_sidebar(root_pages); + this.make_sidebar(); frappe.router.route(); } }); } - get_pages() { - return frappe.db.get_list('Internal Wiki Page', { - fields: ['name', 'icon', 'private', 'parent_page', 'sequence_id'], - order_by: "sequence_id asc" - }); + get_wiki_pages() { + return frappe.xcall("frappe.desk.doctype.internal_wiki.internal_wiki.get_wiki_pages"); } sidebar_item_container(item) { return $(` -
    +
    ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} + ${item.label || item.title}
    @@ -99,12 +99,13 @@ frappe.views.Wiki = class Wiki { `); } - make_sidebar(items) { + make_sidebar() { if (this.sidebar.find('.standard-sidebar-section')[0]) { this.sidebar.find('.standard-sidebar-section')[0].remove(); } + let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); let sidebar_section = $(`
    `); - this.prepare_sidebar(items, sidebar_section, this.sidebar); + this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); } prepare_sidebar(items, child_container, item_container) { @@ -113,10 +114,10 @@ frappe.views.Wiki = class Wiki { } append_item(item, container) { - let is_current_page = frappe.router.slug(item.name) == frappe.router.slug(this.get_page_to_show()); + let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show()); if (is_current_page) { item.selected = true; - this.current_page_name = item.name; + this.current_page_name = item.title; } let $item_container = this.sidebar_item_container(item); @@ -124,14 +125,14 @@ frappe.views.Wiki = class Wiki { this.add_sidebar_actions(item, sidebar_control); - let child_items = this.all_pages.filter(page => page.parent_page == item.name); + let child_items = this.all_pages.filter(page => page.parent_page == item.title); if (child_items.length > 0) { let child_container = $(``); this.prepare_sidebar(child_items, child_container, $item_container); } $item_container.appendTo(container); - this.sidebar_items[item.name] = $item_container; + this.sidebar_items[item.title] = $item_container; if ($item_container.parent().hasClass('hidden') && is_current_page) { $item_container.parent().toggleClass('hidden'); @@ -145,7 +146,7 @@ frappe.views.Wiki = class Wiki { let $drop_icon = $(``) .appendTo(sidebar_control); - if (this.all_pages.some(e => e.parent_page == item.name)) { + if (this.all_pages.some(e => e.parent_page == item.title)) { $drop_icon.removeClass('hidden'); $drop_icon.on('click', () => { let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; @@ -176,11 +177,11 @@ frappe.views.Wiki = class Wiki { wiki: true }).then(data => { this.page_data = data; - if (!this.page_data) return; + if (!this.page_data || Object.keys(this.page_data).length === 0) return; return frappe.dashboard_utils.get_dashboard_settings().then(settings => { let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.page_data.charts.items) { + if (this.page_data.charts && this.page_data.charts.items) { this.page_data.charts.items.map(chart => { chart.chart_settings = chart_config[chart.chart_name] || {}; }); @@ -194,8 +195,8 @@ frappe.views.Wiki = class Wiki { if (localStorage.current_wiki_page) { default_page = localStorage.current_wiki_page; - } else if (this.all_pages) { - default_page = this.all_pages[0].name; + } else if (Object.keys(this.all_pages).length !== 0) { + default_page = this.all_pages[0].title; } else { default_page = "Build"; } @@ -224,75 +225,81 @@ frappe.views.Wiki = class Wiki { this.current_page_name = page; localStorage.current_wiki_page = page; - this.current_page = this.pages[page]; - if (!this.body.find('#editorjs')[0]) { this.$page = $(`
    `).appendTo(this.body); } - this.setup_actions(); + this.setup_actions(page); this.prepare_editorjs(page); } prepare_editorjs(page) { - frappe.db.get_value("Internal Wiki Page", page, "content") - .then(content => { - this.content = JSON.parse(content.message["content"]); - this.get_data(page).then(() => { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: this.content || [] - }); + if (this.all_pages) { + let this_page = this.all_pages.filter(p => p.title == page)[0]; + this.setup_actions(page); + this.content = this_page && JSON.parse(this_page.content); + this.get_data(page).then(() => { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ + blocks: this.content || [] }); - } else { - this.initialize_editorjs(this.content); - } - }); + }); + } else { + this.initialize_editorjs(this.content); + } }); + } } - setup_actions() { - if (!this.isReadOnly) return; - this.page.clear_inner_toolbar(); - this.page.set_secondary_action( - __("Customize"), - () => { - this.isReadOnly = false; - this.editor.readOnly.toggle(); - this.editor.isReady - .then(() => { - this.initialize_editorjs_undo(); - this.setup_customization_buttons(); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - }); - }, - ); + setup_actions(page) { + let this_page = this.all_pages.filter(p => p.title == page)[0]; - this.page.add_inner_button(__('Create Page'), () => { + if (!this.isReadOnly) { + this.setup_customization_buttons(this_page.is_editable); + return; + } + + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); + + this_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { + if (!this.editor || !this.editor.readOnly) return; + this.isReadOnly = false; + this.editor.readOnly.toggle(); + this.editor.isReady + .then(() => { + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + }); + }); + + this.page.add_inner_button(__("Create Page"), () => { this.initialize_new_page(); }); } initialize_editorjs_undo() { this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: this.content}); + this.undo.initialize({blocks: this.content || []}); this.undo.readOnly = false; } - setup_customization_buttons() { + setup_customization_buttons(is_editable) { this.page.clear_primary_action(); this.page.clear_secondary_action(); this.page.clear_inner_toolbar(); - this.page.set_primary_action( + is_editable && this.page.set_primary_action( __("Save Customizations"), () => { this.page.clear_primary_action(); @@ -325,30 +332,39 @@ frappe.views.Wiki = class Wiki { } add_sidebar_actions(item, sidebar_control) { - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - sidebar_control - ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.delete_page(item.name), - "delete-page", - `${__('Delete')}`, - null, - sidebar_control - ); + if (!item.is_editable) { + $(`${frappe.utils.icon("solid-info", "sm")}`) + .appendTo(sidebar_control); + sidebar_control.find('.sidebar-info').click(() => { + frappe.show_alert({ + message: __("Only owner can sort of edit this page"), + indicator: 'info' + }, 5); + }); + } else{ + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + sidebar_control + ); + frappe.utils.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item), + "delete-page", + `${__('Delete')}`, + null, + sidebar_control + ); + } } - delete_page(name) { - if (!this.deleted_sidebar_items.includes(name)) { - this.deleted_sidebar_items.push(name); - } - frappe.confirm(__("Are you sure you want to delete page {0}?", [name]), () => { - this.sidebar.find(`.standard-sidebar-section [item-name="${name}"]`).addClass('hidden'); + delete_page(item) { + frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { + this.deleted_sidebar_items.push(item); + this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"]`).addClass('hidden'); }); } @@ -357,28 +373,32 @@ frappe.views.Wiki = class Wiki { $('.nested-container').each( function() { new Sortable(this, { handle: ".drag-handle", - draggable: ".sidebar-item-container", + draggable: ".sidebar-item-container.is-draggable", group: 'nested', animation: 150, fallbackOnBody: true, swapThreshold: 0.65, onEnd: function () { - me.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { - let parent_page = ""; - if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { - parent_page = page.parentElement.parentElement.attributes["item-name"].value; - } - me.sorted_sidebar_items.push({ - name: page.attributes['item-name'].value, - parent_page: parent_page - }); - } + me.prepare_sorted_sidebar(); } }); }); } + prepare_sorted_sidebar() { + this.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + this.sorted_sidebar_items.push({ + title: page.attributes['item-name'].value, + parent_page: parent_page + }); + } + } + make_blocks_sortable() { let me = this; this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { @@ -395,6 +415,10 @@ frappe.views.Wiki = class Wiki { } initialize_new_page() { + let parent_pages = this.all_pages.filter(page => !page.parent_page && page.parent_wiki != "Default").map(page => page.title) + if (this.has_access) { + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title) + } const d = new frappe.ui.Dialog({ title: __('Set Title'), fields: [ @@ -408,16 +432,23 @@ frappe.views.Wiki = class Wiki { label: __('Parent'), fieldtype: 'Select', fieldname: 'parent', - options: this.all_pages.filter(page => !page.parent_page).map(page => page.name) + options: parent_pages + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'public', + depends_on: `eval:${this.has_access}` } ], primary_action_label: __('Create'), primary_action: (values) => { d.hide(); this.initialize_editorjs_undo(); - this.setup_customization_buttons(); + this.setup_customization_buttons(true); this.title = values.title; this.parent = values.parent; + this.public = values.public; this.editor.render({ blocks: [ { @@ -437,6 +468,7 @@ frappe.views.Wiki = class Wiki { this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); + this.prepare_sorted_sidebar(); }); } }); @@ -446,8 +478,8 @@ frappe.views.Wiki = class Wiki { add_page_to_sidebar({title, parent}) { let $sidebar = $('.standard-sidebar-section'); let item = { - name: title, - parent_page: parent, + title: title, + parent_page: parent }; let $sidebar_item = this.sidebar_item_container(item); @@ -513,10 +545,11 @@ frappe.views.Wiki = class Wiki { }); frappe.call({ - method: "frappe.desk.doctype.internal_wiki_page.internal_wiki_page.save_wiki_page", + method: "frappe.desk.doctype.internal_wiki.internal_wiki.save_wiki_page", args: { title: me.title, parent: me.parent || '', + public: me.public || false, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, @@ -529,6 +562,7 @@ frappe.views.Wiki = class Wiki { frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); me.title = ''; me.parent = ''; + me.public = false; me.sorted_sidebar_items = []; me.deleted_sidebar_items = []; me.new_page = res.message; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss index e9dcb63c4e..cf452d65c5 100644 --- a/frappe/public/scss/desk/wiki.scss +++ b/frappe/public/scss/desk/wiki.scss @@ -5,7 +5,24 @@ .layout-side-section, .layout-main-section-wrapper { height: 100%; overflow-y: auto; + padding-right: 25px; + scrollbar-color: var(--gray-200) transparent; + [data-theme="dark"] & { + scrollbar-color: var(--gray-800) transparent; + } + + &::-webkit-scrollbar-track { + background: transparent; + } + + &::-webkit-scrollbar-thumb { + background: var(--gray-200); + [data-theme="dark"] & { + background: var(--gray-800); + } + } } + .desk-sidebar { margin-bottom: var(--margin-2xl); } @@ -40,6 +57,10 @@ margin-right: -8px; } + .sidebar-info { + display: none; + } + svg { margin-right: 0; } @@ -69,7 +90,8 @@ .standard-sidebar-section.show-control { .desk-sidebar-item.standard-sidebar-item { - &:hover { + + &:hover, &.selected { .drag-handle { display: inline-block; } @@ -77,16 +99,14 @@ .delete-page { display: inline-block; } + + .sidebar-info { + display: inline-block; + } } - - &.selected { - .drag-handle { - display: inline-block; - } - - .delete-page { - display: inline-block; - } + + .block-click { + pointer-events:none; } } } From afd44ea349653b84375f523b84ded06849f8ea3b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 13:42:07 +0530 Subject: [PATCH 0171/1519] fix: sider fix --- frappe/desk/desktop.py | 3 ++- frappe/desk/doctype/internal_wiki/internal_wiki.py | 1 - frappe/public/js/frappe/views/wiki.js | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 1789f04924..042093d412 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -581,7 +581,8 @@ def save_new_widget(page, blocks, new_widgets): page_doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets - if widgets: clean_up(page_doc, blocks) + if widgets: + clean_up(page_doc, blocks) # Set label page_doc.label = page + '-Wiki-' + frappe.session.user diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index e4d08443d3..de7482e434 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -3,7 +3,6 @@ from __future__ import unicode_literals import frappe -from frappe import _ import json from frappe.desk.desktop import save_new_widget from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 29a5ea792a..5a41cf0968 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -341,7 +341,7 @@ frappe.views.Wiki = class Wiki { indicator: 'info' }, 5); }); - } else{ + } else { frappe.utils.add_custom_button( frappe.utils.icon('drag', 'xs'), null, @@ -415,9 +415,11 @@ frappe.views.Wiki = class Wiki { } initialize_new_page() { - let parent_pages = this.all_pages.filter(page => !page.parent_page && page.parent_wiki != "Default").map(page => page.title) + let parent_pages = this.all_pages + .filter(page => !page.parent_page && page.parent_wiki != "Default") + .map(page => page.title); if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title) + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); } const d = new frappe.ui.Dialog({ title: __('Set Title'), @@ -549,7 +551,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', - public: me.public || false, + public: me.public || null, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, From a8a813623b09593ce4df1da2ef05cd0f81619aba Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 18:12:44 +0530 Subject: [PATCH 0172/1519] fix: updating workspace of public page fix --- frappe/desk/desktop.py | 28 +++++++++++++++---- .../doctype/internal_wiki/internal_wiki.py | 17 ++++++----- frappe/desk/doctype/workspace/workspace.json | 9 +++++- frappe/public/js/frappe/wiki_blocks/block.js | 3 +- frappe/public/js/frappe/wiki_blocks/card.js | 3 +- frappe/public/js/frappe/wiki_blocks/chart.js | 3 +- .../public/js/frappe/wiki_blocks/shortcut.js | 3 +- 7 files changed, 49 insertions(+), 17 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 042093d412..e042e5411c 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -110,9 +110,18 @@ class Workspace: def get_page_for_user(self, wiki=False): filters = { 'extends': self.page_name, - 'for_user': frappe.session.user + 'public': 1, + 'for_wiki': wiki + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + + filters = { + 'extends': self.page_name, + 'for_user': frappe.session.user, + 'for_wiki': wiki } - filters['for_wiki'] = wiki user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: return frappe.get_cached_doc("Workspace", user_pages[0]) @@ -476,11 +485,19 @@ def get_custom_workspace_for_user(page, wiki=False): Returns: Object: Document object """ + if wiki: + filters = { + 'extends': page, + 'public': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) filters = { 'extends': page, - 'for_user': frappe.session.user + 'for_user': frappe.session.user, + 'for_wiki': wiki } - filters['for_wiki'] = wiki pages = frappe.get_list("Workspace", filters=filters) if pages: return frappe.get_doc("Workspace", pages[0]) @@ -549,7 +566,7 @@ def save_customization(page, config): return True -def save_new_widget(page, blocks, new_widgets): +def save_new_widget(page, blocks, new_widgets, public=False): original_page = frappe.get_doc("Workspace", page) page_doc = get_custom_workspace_for_user(page, True) @@ -569,6 +586,7 @@ def save_new_widget(page, blocks, new_widgets): "charts": original_page.charts, "shortcuts": original_page.shortcuts, "links": original_page.links, + "public": public }) widgets = _dict(loads(new_widgets)) diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index de7482e434..15524a668c 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -63,13 +63,16 @@ def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, else: doc = frappe.get_doc("Internal Wiki", frappe.session.user) doc.wiki_pages.extend([new_doc]) + doc.save(ignore_permissions=True) else: - # update the content of Internal Wiki Page of current user - doc = frappe.get_doc("Internal Wiki", frappe.session.user) - for d in doc.wiki_pages: - if d.title == title: - d.content = blocks - doc.save(ignore_permissions=True) + for page in ["Default", frappe.session.user]: + if frappe.db.exists("Internal Wiki", page): + doc = frappe.get_doc("Internal Wiki", page) + for d in doc.wiki_pages: + if d.title == title: + d.content = blocks + break + doc.save(ignore_permissions=True) if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) @@ -78,7 +81,7 @@ def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, sort_pages(json.loads(sb_items)) if json.loads(new_widgets): - save_new_widget(title, blocks, new_widgets) + save_new_widget(title, blocks, new_widgets, public) return title diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 2de8eeef62..6b84b73e6c 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -25,6 +25,7 @@ "pin_to_bottom", "hide_custom", "for_wiki", + "public", "section_break_2", "charts_label", "charts", @@ -222,10 +223,16 @@ "fieldname": "for_wiki", "fieldtype": "Check", "label": "For Wiki" + }, + { + "default": "0", + "fieldname": "public", + "fieldtype": "Check", + "label": "Public" } ], "links": [], - "modified": "2021-06-02 15:35:08.963507", + "modified": "2021-06-09 14:50:41.204381", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/wiki_blocks/block.js index a3f95890c7..dde93b3887 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/wiki_blocks/block.js @@ -9,7 +9,7 @@ export default class Block { let block_data = this.config.page_data[block+'s'].items.find(obj => { return obj.label == block_name; }); - if (!block_data) return; + if (!block_data) return false; this.wrapper.innerHTML = ''; block_data.in_customize_mode = !this.readOnly; this.block_widget = new frappe.widget.SingleWidgetGroup({ @@ -25,6 +25,7 @@ export default class Block { if (!this.readOnly) { this.block_widget.customize(); } + return true; } rendered() { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/wiki_blocks/card.js index 0c8dc4ca82..e8abcea424 100644 --- a/frappe/public/js/frappe/wiki_blocks/card.js +++ b/frappe/public/js/frappe/wiki_blocks/card.js @@ -34,7 +34,8 @@ export default class Card extends Block { this.new('card', 'links'); if (this.data && this.data.card_name) { - this.make('card', this.data.card_name, 'links'); + let has_data = this.make('card', this.data.card_name, 'links'); + if (!has_data) return; } if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/wiki_blocks/chart.js index 505d03c732..aeaba1d0d3 100644 --- a/frappe/public/js/frappe/wiki_blocks/chart.js +++ b/frappe/public/js/frappe/wiki_blocks/chart.js @@ -34,7 +34,8 @@ export default class Chart extends Block { this.new('chart'); if (this.data && this.data.chart_name) { - this.make('chart', this.data.chart_name); + let has_data = this.make('chart', this.data.chart_name); + if (!has_data) return; } if (!this.readOnly) { diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/wiki_blocks/shortcut.js index 7de8097715..ffed50e340 100644 --- a/frappe/public/js/frappe/wiki_blocks/shortcut.js +++ b/frappe/public/js/frappe/wiki_blocks/shortcut.js @@ -33,7 +33,8 @@ export default class Shortcut extends Block { this.new('shortcut'); if (this.data && this.data.shortcut_name) { - this.make('shortcut', this.data.shortcut_name); + let has_data = this.make('shortcut', this.data.shortcut_name); + if (!has_data) return; } if (!this.readOnly) { From 769fadac0fd767769590248006ccbd07808f5165 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 9 Jun 2021 21:43:37 +0530 Subject: [PATCH 0173/1519] fix: Multiple Workspace creation fix --- frappe/desk/desktop.py | 114 ++++++++++-------- .../doctype/internal_wiki/internal_wiki.py | 13 +- frappe/desk/doctype/workspace/workspace.json | 8 +- frappe/public/js/frappe/views/wiki.js | 13 +- 4 files changed, 86 insertions(+), 62 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index e042e5411c..01e929e3f5 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -42,7 +42,10 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user(wiki) + if wiki: + self.doc = self.get_wiki_page_for_user() + else: + self.doc = self.get_page_for_user() if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -107,20 +110,10 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self, wiki=False): - filters = { - 'extends': self.page_name, - 'public': 1, - 'for_wiki': wiki - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - + def get_page_for_user(self): filters = { 'extends': self.page_name, 'for_user': frappe.session.user, - 'for_wiki': wiki } user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: @@ -138,6 +131,25 @@ class Workspace: self.get_pages_to_extend() return frappe.get_cached_doc("Workspace", self.page_name) + def get_wiki_page_for_user(self): + filters = { + 'wiki_label': self.page_name, + 'public': 1, + 'for_wiki': 1 + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + + filters = { + 'wiki_label': self.page_name, + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + user_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if user_pages: + return frappe.get_cached_doc("Workspace", user_pages[0]) + def get_onboarding_doc(self): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): @@ -374,7 +386,11 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - if wiki and not frappe.db.exists("Workspace", page): + if wiki and not frappe.db.exists({ + 'doctype': 'Workspace', + 'wiki_label': page, + 'for_wiki': 1 + }): return wspace = Workspace(page, wiki=wiki) wspace.build_workspace() @@ -476,7 +492,7 @@ def get_custom_report_list(module): return out -def get_custom_workspace_for_user(page, wiki=False): +def get_custom_workspace_for_user(page): """Get custom page from workspace if exists or create one Args: @@ -485,18 +501,9 @@ def get_custom_workspace_for_user(page, wiki=False): Returns: Object: Document object """ - if wiki: - filters = { - 'extends': page, - 'public': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) filters = { 'extends': page, 'for_user': frappe.session.user, - 'for_wiki': wiki } pages = frappe.get_list("Workspace", filters=filters) if pages: @@ -504,9 +511,43 @@ def get_custom_workspace_for_user(page, wiki=False): doc = frappe.new_doc("Workspace") doc.extends = page doc.for_user = frappe.session.user - doc.for_wiki = wiki return doc +def get_custom_wiki_for_user(page, public): + """Get custom page from workspace if exists or create one + + Args: + page (stirng): Page name + + Returns: + Object: Document object + """ + filters = { + 'wiki_label': page, + 'public': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) + + filters = { + 'wiki_label': page, + 'for_user': frappe.session.user, + 'for_wiki': 1 + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + return frappe.get_doc("Workspace", pages[0]) + doc = frappe.new_doc("Workspace") + doc.wiki_label = page + doc.label = page + '-Wiki-' + frappe.session.user + doc.for_user = frappe.session.user + doc.for_wiki = 1 + doc.public = public + doc.charts = [] + doc.shortcuts = [] + doc.links = [] + return doc @frappe.whitelist() def save_customization(page, config): @@ -567,27 +608,7 @@ def save_customization(page, config): return True def save_new_widget(page, blocks, new_widgets, public=False): - original_page = frappe.get_doc("Workspace", page) - page_doc = get_custom_workspace_for_user(page, True) - - # Update field values - page_doc.update({ - "icon": original_page.icon, - "charts_label": original_page.charts_label, - "cards_label": original_page.cards_label, - "shortcuts_label": original_page.shortcuts_label, - "module": original_page.module, - "onboarding": original_page.onboarding, - "developer_mode_only": original_page.developer_mode_only, - "category": original_page.category, - }) - if page_doc.is_new(): - page_doc.update({ - "charts": original_page.charts, - "shortcuts": original_page.shortcuts, - "links": original_page.links, - "public": public - }) + page_doc = get_custom_wiki_for_user(page, public) widgets = _dict(loads(new_widgets)) @@ -602,9 +623,6 @@ def save_new_widget(page, blocks, new_widgets, public=False): if widgets: clean_up(page_doc, blocks) - # Set label - page_doc.label = page + '-Wiki-' + frappe.session.user - try: page_doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py index 15524a668c..a144d24c66 100644 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ b/frappe/desk/doctype/internal_wiki/internal_wiki.py @@ -13,7 +13,7 @@ class InternalWiki(Document): @frappe.whitelist() def get_wiki_pages(): - has_access = ("System Manager" in frappe.get_roles()) + has_access = "System Manager" in frappe.get_roles() default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages pages = prepare_pages(default_pages) @@ -41,15 +41,10 @@ def prepare_pages(pages, is_editable=False): return prepared_pages @frappe.whitelist() -def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save=True): +def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): + save = frappe.parse_json(save) + public = frappe.parse_json(public) if save: - # Create Workspace if not exist - if not frappe.db.exists("Workspace", title): - wspace = frappe.new_doc('Workspace') - wspace.label = title - wspace.for_wiki = 1 - wspace.insert(ignore_permissions=True) - # create new Internal Wiki Page new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 6b84b73e6c..2fe53c03be 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -10,6 +10,7 @@ "label", "for_user", "extends", + "wiki_label", "module", "category", "icon", @@ -229,10 +230,15 @@ "fieldname": "public", "fieldtype": "Check", "label": "Public" + }, + { + "fieldname": "wiki_label", + "fieldtype": "Data", + "label": "Wiki Label" } ], "links": [], - "modified": "2021-06-09 14:50:41.204381", + "modified": "2021-06-09 18:39:47.947069", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js index 5a41cf0968..9a39577315 100644 --- a/frappe/public/js/frappe/views/wiki.js +++ b/frappe/public/js/frappe/views/wiki.js @@ -333,7 +333,7 @@ frappe.views.Wiki = class Wiki { add_sidebar_actions(item, sidebar_control) { if (!item.is_editable) { - $(`${frappe.utils.icon("solid-info", "sm")}`) + $(`${frappe.utils.icon("lock", "sm")}`) .appendTo(sidebar_control); sidebar_control.find('.sidebar-info').click(() => { frappe.show_alert({ @@ -428,7 +428,7 @@ frappe.views.Wiki = class Wiki { label: __('Title'), fieldtype: 'Data', fieldname: 'title', - "reqd": 1 + reqd: 1 }, { label: __('Parent'), @@ -445,6 +445,10 @@ frappe.views.Wiki = class Wiki { ], primary_action_label: __('Create'), primary_action: (values) => { + if (this.all_pages.filter(p => p.title == values.title)[0]) { + frappe.throw(__("Page with title '{0}' already exist.", [__(values.title)])); + return; + } d.hide(); this.initialize_editorjs_undo(); this.setup_customization_buttons(true); @@ -529,7 +533,8 @@ frappe.views.Wiki = class Wiki { let save = true; if (!this.title && this.current_page_name) { this.title = this.current_page_name; - save = ''; + this.public = this.all_pages.filter(p => p.title == this.title)[0].parent_wiki == "Default"; + save = false; } else { this.current_page_name = this.title; } @@ -551,7 +556,7 @@ frappe.views.Wiki = class Wiki { args: { title: me.title, parent: me.parent || '', - public: me.public || null, + public: me.public || 0, sb_items: me.sorted_sidebar_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, From 39f504be23c97175231e44cf10b08bb962c3b5fe Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Thu, 10 Jun 2021 13:51:29 +0530 Subject: [PATCH 0174/1519] fix: number format converting to decimals --- frappe/public/js/frappe/form/controls/int.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/int.js b/frappe/public/js/frappe/form/controls/int.js index 12652bf86e..1aa4a49b9a 100644 --- a/frappe/public/js/frappe/form/controls/int.js +++ b/frappe/public/js/frappe/form/controls/int.js @@ -10,12 +10,11 @@ frappe.ui.form.ControlInt = class ControlInt extends frappe.ui.form.ControlData super.make_input(); this.$input // .addClass("text-right") - .on("focus", function () { + .on("focusout", function () { setTimeout(function () { if (!document.activeElement) return; document.activeElement.value = me.validate(document.activeElement.value); - document.activeElement.select(); }, 100); return false; }); From 1fbb22d36fcc5f04d50d088bfedb3bb9d0b0677b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 10 Jun 2021 15:45:22 +0530 Subject: [PATCH 0175/1519] fix: Allow guest to comment on Web Page & Blog Post --- frappe/templates/includes/comments/comments.html | 14 +++++++++++++- frappe/templates/includes/comments/comments.py | 9 +++------ frappe/website/doctype/blog_post/blog_post.py | 1 + frappe/website/doctype/web_page/web_page.py | 1 + 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/frappe/templates/includes/comments/comments.html b/frappe/templates/includes/comments/comments.html index c490bedd72..935fa5367e 100644 --- a/frappe/templates/includes/comments/comments.html +++ b/frappe/templates/includes/comments/comments.html @@ -49,8 +49,10 @@ {% endif %} \ No newline at end of file diff --git a/frappe/templates/includes/feedback/feedback.py b/frappe/templates/includes/feedback/feedback.py new file mode 100644 index 0000000000..cc2eb01645 --- /dev/null +++ b/frappe/templates/includes/feedback/feedback.py @@ -0,0 +1,53 @@ +# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See license.txt +from __future__ import unicode_literals + +import frappe + +from frappe import _ + +@frappe.whitelist(allow_guest=True) +def add_feedback(reference_doctype, reference_name, rating, feedback, feedback_email): + doc = frappe.new_doc('Feedback') + doc.reference_doctype = reference_doctype + doc.reference_name = reference_name + doc.rating = rating + doc.feedback = feedback + doc.email = feedback_email + doc.save(ignore_permissions=True) + + subject = _('New Feedback on {0}: {1}').format(reference_doctype, reference_name) + send_mail(doc, subject) + +@frappe.whitelist() +def update_feedback(reference_doctype, reference_name, rating, feedback, feedback_email): + filters = { + "email": feedback_email, + "reference_doctype": reference_doctype, + "reference_name": reference_name + } + d = frappe.get_all('Feedback', filters=filters, limit=1) + doc = frappe.get_doc('Feedback', d[0].name) + doc.rating = rating + doc.feedback = feedback + doc.save(ignore_permissions=True) + + subject = _('Feedback updated on {0}: {1}').format(reference_doctype, reference_name) + send_mail(doc, subject) + +def send_mail(feedback, subject): + doc = frappe.get_doc(feedback.reference_doctype, feedback.reference_name) + + message = ("

    {0} ({1})

    ".format(feedback.feedback, feedback.rating) + + "

    {2}

    ".format(frappe.utils.get_request_site_address(), + feedback.name, + _("View Feedback"))) + + # notify creator + frappe.sendmail( + recipients=frappe.db.get_value('User', doc.owner, 'email') or doc.owner, + subject=subject, + message=message, + reference_doctype=doc.doctype, + reference_name=doc.name + ) diff --git a/frappe/website/doctype/blog_post/blog_post.json b/frappe/website/doctype/blog_post/blog_post.json index 909cecf867..c2491ee5a4 100644 --- a/frappe/website/doctype/blog_post/blog_post.json +++ b/frappe/website/doctype/blog_post/blog_post.json @@ -18,6 +18,7 @@ "featured", "hide_cta", "disable_comments", + "disable_feedback", "section_break_5", "blog_intro", "content_type", @@ -191,6 +192,13 @@ "fieldtype": "Data", "label": "Meta Title", "length": 60 + }, + { + "default": "0", + "description": "Feedback on this blog post will be disabled if checked.", + "fieldname": "disable_feedback", + "fieldtype": "Check", + "label": "Disable Feedback" } ], "has_web_view": 1, @@ -200,7 +208,7 @@ "is_published_field": "published", "links": [], "max_attachments": 5, - "modified": "2020-12-23 14:28:36.311389", + "modified": "2021-06-14 13:50:02.109719", "modified_by": "Administrator", "module": "Website", "name": "Blog Post", diff --git a/frappe/website/doctype/blog_post/blog_post.py b/frappe/website/doctype/blog_post/blog_post.py index bfccc0bbc7..4dde5521d7 100644 --- a/frappe/website/doctype/blog_post/blog_post.py +++ b/frappe/website/doctype/blog_post/blog_post.py @@ -104,6 +104,7 @@ class BlogPost(WebsiteGenerator): context.metatags["image"] = self.meta_image or image or None self.load_comments(context) + self.load_feedback(context) context.category = frappe.db.get_value("Blog Category", context.doc.blog_category, ["title", "route"], as_dict=1) @@ -151,6 +152,17 @@ class BlogPost(WebsiteGenerator): else: context.comment_text = _('{0} comments').format(len(context.comment_list)) + def load_feedback(self, context): + feedback = frappe.get_all('Feedback', + fields=['email', 'feedback', 'rating'], + filters=dict( + reference_doctype=self.doctype, + reference_name=self.name, + email=frappe.session.user + ) + ) + context.user_feedback = feedback[0] if feedback else '' + def set_read_time(self): content = self.content or self.content_html or '' if self.content_type == "Markdown": diff --git a/frappe/website/doctype/blog_post/templates/blog_post.html b/frappe/website/doctype/blog_post/templates/blog_post.html index dad8b97164..4678622062 100644 --- a/frappe/website/doctype/blog_post/templates/blog_post.html +++ b/frappe/website/doctype/blog_post/templates/blog_post.html @@ -65,6 +65,11 @@ {% include 'templates/includes/comments/comments.html' %}
    {% endif %} + {% if not disable_feedback %} +
    + {% include 'templates/includes/feedback/feedback.html' %} +
    + {% endif %}
    ", content) + self.assertIn("background-color: var(--bg-color);", content) + + def test_breadcrumbs(self): + content = get_response_content('/_test/_test_folder/_test_page') + self.assertIn('Test TOC', content) + self.assertIn(' Test Page', content) + + content = get_response_content('/_test/_test_folder/index') + self.assertIn(' Test', content) + self.assertIn('Test TOC', content) + def test_get_context_without_context_object(self): content = get_response_content('/_test/_test_no_context') self.assertIn("Custom Content", content) diff --git a/frappe/website/doctype/web_page/test_web_page.py b/frappe/website/doctype/web_page/test_web_page.py index 5409edd78e..0d36d0f870 100644 --- a/frappe/website/doctype/web_page/test_web_page.py +++ b/frappe/website/doctype/web_page/test_web_page.py @@ -18,15 +18,6 @@ class TestWebPage(unittest.TestCase): self.assertTrue(PathResolver("test-web-page-1/test-web-page-3").is_valid_path()) self.assertFalse(PathResolver("test-web-page-1/test-web-page-Random").is_valid_path()) - def test_base_template(self): - content = get_response_content('/_test/_test_custom_base.html') - - # assert the text in base template is rendered - self.assertIn('

    This is for testing

    ', content) - - # assert template block rendered - self.assertIn('

    Test content

    ', content) - def test_content_type(self): web_page = frappe.get_doc(dict( doctype = 'Web Page', @@ -67,48 +58,3 @@ class TestWebPage(unittest.TestCase): self.assertIn('
    DocField
    ', content) finally: web_page.delete() - - def test_custom_base_template_path(self): - content = get_response_content('/_test/_test_folder/_test_page') - # assert the text in base template is rendered - self.assertIn('

    This is for testing

    ', content) - - # assert template block rendered - self.assertIn('

    Test content

    ', content) - - def test_json_sidebar_data(self): - frappe.flags.look_for_sidebar = False - content = get_response_content('/_test/_test_folder/_test_page') - self.assertNotIn('Test Sidebar', content) - frappe.flags.look_for_sidebar = True - content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn('Test Sidebar', content) - frappe.flags.look_for_sidebar = False - - def test_index_and_next_comment(self): - content = get_response_content('/_test/_test_folder') - # test if {index} was rendered - self.assertIn(' Test Page', content) - - self.assertIn('Test TOC', content) - - content = get_response_content('/_test/_test_folder/_test_page') - # test if {next} was rendered - self.assertIn('Next: Test TOC', content) - - def test_colocated_assets(self): - content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn("", content) - self.assertIn("background-color: var(--bg-color);", content) - - def test_breadcrumbs(self): - content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn('Test TOC', content) - self.assertIn(' Test Page', content) - - content = get_response_content('/_test/_test_folder/index') - self.assertIn(' Test', content) - self.assertIn('Test TOC', content) - - def test_downloadable_file(self): - pass From 0aabe737a361858396e6a7aeb0e04026396c530a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 10:24:20 +0530 Subject: [PATCH 0254/1519] fix: Cache document page as well --- frappe/website/page_renderers/document_page.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index f1741c681f..d20eccce8f 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -1,7 +1,7 @@ import frappe from frappe.model.document import get_controller from frappe.website.page_renderers.base_template_page import BaseTemplatePage -from frappe.website.utils import build_response +from frappe.website.utils import build_response, cache_html from frappe.website.router import (get_doctypes_with_web_view, get_page_info_from_web_page_with_dynamic_routes) @@ -51,11 +51,16 @@ class DocumentPage(BaseTemplatePage): self.init_context() self.update_context() self.post_process_context() - html = frappe.get_template(self.template_path).render(self.context) + html = self.get_html() html = self.add_csrf_token(html) return build_response(self.path, html, self.http_status_code or 200, self.headers) + @cache_html + def get_html(self): + html = frappe.get_template(self.template_path).render(self.context) + return html + def update_context(self): self.context.doc = self.doc self.context.update(self.context.doc.as_dict()) From 2584b77cf1bfcaeb7e646f62aa3e44aa8d091d59 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 10:24:47 +0530 Subject: [PATCH 0255/1519] fix: Do not cache csrf token --- frappe/website/page_renderers/template_page.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 49496c4cbe..054871a4f4 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -58,7 +58,9 @@ class TemplatePage(BaseTemplatePage): return (frappe.as_unicode(f'{search_path}{d}') for d in ('', '.html', '.md', '/index.html', '/index.md')) def render(self): - return build_response(self.path, self.get_html(), self.http_status_code, self.headers) + html = self.get_html() + html = self.add_csrf_token(html) + return build_response(self.path, html, self.http_status_code, self.headers) @cache_html def get_html(self): @@ -73,7 +75,6 @@ class TemplatePage(BaseTemplatePage): html = self.render_template() html = self.update_toc(html) - html = self.add_csrf_token(html) return html From 5531bc1e88312bfcce9f936d279374eac579e39a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 11:35:53 +0530 Subject: [PATCH 0256/1519] fix: Prioritize document page over template page --- frappe/website/path_resolver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index bedd9f19ae..5e1a99be91 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -37,7 +37,7 @@ class PathResolver(): endpoint = resolve_path(self.path) custom_renderers = self.get_custom_page_renderers() - renderers = custom_renderers + [StaticPage, WebFormPage, TemplatePage, ListPage, DocumentPage, PrintPage, NotFoundPage] + renderers = custom_renderers + [StaticPage, WebFormPage, ListPage, DocumentPage, TemplatePage, PrintPage, NotFoundPage] for renderer in renderers: renderer_instance = renderer(endpoint, 200) From 090c604b0a1d2e19cdbb9ad6cdd3d1cb20f2948e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 12:01:04 +0530 Subject: [PATCH 0257/1519] test: Add test cases to validate caching --- frappe/tests/test_website.py | 15 +++++++++++++ .../doctype/blog_post/test_blog_post.py | 21 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 3472951bbb..8c258521c8 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -256,6 +256,21 @@ class TestWebsite(unittest.TestCase): content = get_response_content('/_test/_test_no_context') self.assertIn("Custom Content", content) + def test_caching(self): + # to enable caching + dev_mode = frappe.conf.developer_mode + frappe.conf.developer_mode = 0 + + clear_website_cache() + # first response no-cache + response = get_response('/_test/_test_folder/_test_page') + self.assertIn(('X-From-Cache', 'False'), list(response.headers)) + + # first response returned from cache + response = get_response('/_test/_test_folder/_test_page') + self.assertIn(('X-From-Cache', 'True'), list(response.headers)) + + frappe.conf.developer_mode = dev_mode def set_home_page_hook(key, value): from frappe import hooks diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index d01e6174c8..95cf4bcd14 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -9,6 +9,7 @@ from frappe.utils import set_request from frappe.website.serve import get_response from frappe.utils import random_string from frappe.website.doctype.blog_post.blog_post import get_blog_list +from frappe.website.utils import clear_website_cache from frappe.website.website_generator import WebsiteGenerator from frappe.custom.doctype.customize_form.customize_form import reset_customization @@ -90,6 +91,26 @@ class TestBlogPost(unittest.TestCase): frappe.delete_doc(blog.doctype, blog.name) frappe.delete_doc("Blog Category", blogs[0].blog_category) + def test_caching(self): + # to enable caching + dev_mode = frappe.conf.developer_mode + frappe.conf.developer_mode = 0 + + clear_website_cache() + # first response no-cache + pages = frappe.get_all('Blog Post', fields=['name', 'route'], + filters={'published': 1, 'route': ('!=', '')}, limit =1) + + set_request(path=pages[0].route) + response = get_response() + self.assertIn(('X-From-Cache', 'False'), list(response.headers)) + + # first response returned from cache + response = get_response() + self.assertIn(('X-From-Cache', 'True'), list(response.headers)) + + frappe.conf.developer_mode = dev_mode + def scrub(text): return WebsiteGenerator.scrub(None, text) From 2e21d1cb66da4c53742b6a0c0dc75e079e75a95f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 12:01:49 +0530 Subject: [PATCH 0258/1519] fix: Replace deprecated method --- frappe/website/page_renderers/template_page.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 054871a4f4..0abfa307d4 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -191,7 +191,7 @@ class TemplatePage(BaseTemplatePage): try: import inspect method = getattr(self.pymodule, method_name) - if inspect.getargspec(method).args: + if inspect.getfullargspec(method).args: return method(self.context) else: return method() From 62684a70c1ddcb87a72e7af0fdb15e4a91e9888c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 12:05:24 +0530 Subject: [PATCH 0259/1519] test: Clear website cache after changing look_for_sidebar flag --- frappe/tests/test_website.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 8c258521c8..99f116ddc5 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -213,6 +213,7 @@ class TestWebsite(unittest.TestCase): frappe.flags.look_for_sidebar = False content = get_response_content('/_test/_test_folder/_test_page') self.assertNotIn('Test Sidebar', content) + clear_website_cache() frappe.flags.look_for_sidebar = True content = get_response_content('/_test/_test_folder/_test_page') self.assertIn('Test Sidebar', content) From 58859d9804c89a016befe0f80f1e047171e24472 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 24 Jun 2021 12:12:53 +0530 Subject: [PATCH 0260/1519] style: Improve readability for request_otp --- frappe/templates/includes/login/login.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 93bf95bdb7..355e8151f9 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -291,10 +291,13 @@ var verify_token = function (event) { } var request_otp = function (r) { + const otp_form_template = '{{ _("Verification") }}{{ _("Verify") }}'; $('.login-content').empty(); - $('.login-content:visible').append($('
    ').attr({ 'id': 'twofactor_div' }).html('{{ _("Verification") }}{{ _("Verify") }}')); - // add event handler for submit button - verify_token(); + $('.login-content:visible').append( + $('
    ').attr({ 'id': 'twofactor_div' }).html(otp_form_template) + ); + // add event handler for submit button + verify_token(); } var continue_otp_app = function (setup, qrcode) { From 9ad276767ff11e6ea9d52e1c95d7016e83ab35db Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 13:30:11 +0530 Subject: [PATCH 0261/1519] test: Reset no_cache flag --- frappe/tests/test_website.py | 6 +++--- frappe/website/doctype/blog_post/test_blog_post.py | 7 +++---- frappe/website/utils.py | 2 ++ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 99f116ddc5..5c19d3935c 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -259,8 +259,7 @@ class TestWebsite(unittest.TestCase): def test_caching(self): # to enable caching - dev_mode = frappe.conf.developer_mode - frappe.conf.developer_mode = 0 + frappe.flags.force_website_cache = True clear_website_cache() # first response no-cache @@ -271,7 +270,8 @@ class TestWebsite(unittest.TestCase): response = get_response('/_test/_test_folder/_test_page') self.assertIn(('X-From-Cache', 'True'), list(response.headers)) - frappe.conf.developer_mode = dev_mode + frappe.flags.force_website_cache = False + def set_home_page_hook(key, value): from frappe import hooks diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 95cf4bcd14..0cef5b5f6f 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -9,7 +9,7 @@ from frappe.utils import set_request from frappe.website.serve import get_response from frappe.utils import random_string from frappe.website.doctype.blog_post.blog_post import get_blog_list -from frappe.website.utils import clear_website_cache +from frappe.website.utils import can_cache, clear_website_cache from frappe.website.website_generator import WebsiteGenerator from frappe.custom.doctype.customize_form.customize_form import reset_customization @@ -93,8 +93,7 @@ class TestBlogPost(unittest.TestCase): def test_caching(self): # to enable caching - dev_mode = frappe.conf.developer_mode - frappe.conf.developer_mode = 0 + frappe.flags.force_website_cache = True clear_website_cache() # first response no-cache @@ -109,7 +108,7 @@ class TestBlogPost(unittest.TestCase): response = get_response() self.assertIn(('X-From-Cache', 'True'), list(response.headers)) - frappe.conf.developer_mode = dev_mode + frappe.flags.force_website_cache = True def scrub(text): return WebsiteGenerator.scrub(None, text) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 0f5f182ea2..e218afe8c6 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -35,6 +35,8 @@ def find_first_image(html): return None def can_cache(no_cache=False): + if frappe.flags.force_website_cache: + return True if frappe.conf.disable_website_cache or frappe.conf.developer_mode: return False if getattr(frappe.local, "no_cache", False): From 70660a210277b45c1d980ec9640aa3c89662bc7d Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Thu, 24 Jun 2021 14:53:07 +0530 Subject: [PATCH 0262/1519] fix: drag and drop for kanban board --- frappe/public/js/frappe/views/kanban/kanban_board.js | 6 +++--- frappe/public/js/frappe/views/kanban/kanban_card.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/views/kanban/kanban_board.js b/frappe/public/js/frappe/views/kanban/kanban_board.js index 50f911c808..1d7ea37fe6 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_board.js +++ b/frappe/public/js/frappe/views/kanban/kanban_board.js @@ -180,7 +180,7 @@ frappe.provide("frappe.views"); method_name = "update_order_for_single_card"; args = { board_name: this.board.name, - docname: unescape(card.name), + docname: card.name, from_colname: card.from_colname, to_colname: card.to_colname, old_index: card.old_index, @@ -222,7 +222,7 @@ frappe.provide("frappe.views"); var col_name = $(this).data().columnValue; order[col_name] = []; $(this).find('.kanban-card-wrapper').each(function() { - var card_name = unescape($(this).data().name); + var card_name = decodeURIComponent($(this).data().name); order[col_name].push(card_name); }); }); @@ -514,7 +514,7 @@ frappe.provide("frappe.views"); wrapper.find('.kanban-cards').height('auto'); // update order const args = { - name: $(e.item).attr('data-name'), + name: decodeURIComponent($(e.item).attr('data-name')), from_colname: $(e.from).parents('.kanban-column').attr('data-column-value'), to_colname: $(e.to).parents('.kanban-column').attr('data-column-value'), old_index: e.oldIndex, diff --git a/frappe/public/js/frappe/views/kanban/kanban_card.html b/frappe/public/js/frappe/views/kanban/kanban_card.html index b854b88d18..88cf366ccc 100644 --- a/frappe/public/js/frappe/views/kanban/kanban_card.html +++ b/frappe/public/js/frappe/views/kanban/kanban_card.html @@ -1,4 +1,4 @@ -
    +
    {% if(image_url) { %} From 9e8aadf2f955dad58e8be2bc73528d3abfb6600f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 15:19:48 +0530 Subject: [PATCH 0263/1519] fix: Move context building to get_html --- frappe/website/doctype/blog_post/test_blog_post.py | 10 +++++----- frappe/website/page_renderers/document_page.py | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index 0cef5b5f6f..a1e33812c0 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -98,14 +98,14 @@ class TestBlogPost(unittest.TestCase): clear_website_cache() # first response no-cache pages = frappe.get_all('Blog Post', fields=['name', 'route'], - filters={'published': 1, 'route': ('!=', '')}, limit =1) + filters={'published': 1, 'title': "_Test Blog Post"}, limit=1) - set_request(path=pages[0].route) - response = get_response() + route = pages[0].route + + response = get_response(route) self.assertIn(('X-From-Cache', 'False'), list(response.headers)) - # first response returned from cache - response = get_response() + response = get_response(route) self.assertIn(('X-From-Cache', 'True'), list(response.headers)) frappe.flags.force_website_cache = True diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index d20eccce8f..e2ce32897f 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -47,10 +47,6 @@ class DocumentPage(BaseTemplatePage): return False def render(self): - self.doc = frappe.get_doc(self.doctype, self.docname) - self.init_context() - self.update_context() - self.post_process_context() html = self.get_html() html = self.add_csrf_token(html) @@ -58,6 +54,10 @@ class DocumentPage(BaseTemplatePage): @cache_html def get_html(self): + self.doc = frappe.get_doc(self.doctype, self.docname) + self.init_context() + self.update_context() + self.post_process_context() html = frappe.get_template(self.template_path).render(self.context) return html From 57e41230b8f953c1f9870b3c91cbd608fbb3aa0d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 17:52:18 +0530 Subject: [PATCH 0264/1519] fix: Set source after updating context --- frappe/website/page_renderers/base_template_page.py | 1 + frappe/website/page_renderers/template_page.py | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/website/page_renderers/base_template_page.py b/frappe/website/page_renderers/base_template_page.py index 7802e6e7f6..34d51cd600 100644 --- a/frappe/website/page_renderers/base_template_page.py +++ b/frappe/website/page_renderers/base_template_page.py @@ -8,6 +8,7 @@ class BaseTemplatePage(BaseRenderer): def __init__(self, path, http_status_code=None): super().__init__(path=path, http_status_code=http_status_code) self.template_path = '' + self.source = '' def init_context(self): self.context = frappe._dict() diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 0abfa307d4..ddaf7cd519 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -69,8 +69,10 @@ class TemplatePage(BaseTemplatePage): self.init_context() self.set_pymodule() - self.setup_template() self.update_context() + self.setup_template() + self.load_colocated_files() + self.set_properties_from_source() self.post_process_context() html = self.render_template() @@ -125,7 +127,6 @@ class TemplatePage(BaseTemplatePage): def update_context(self): self.set_page_properties() self.set_properties_from_source() - self.load_colocated_files() self.context.build_version = frappe.utils.get_build_version() if self.pymodule_name: @@ -218,7 +219,7 @@ class TemplatePage(BaseTemplatePage): or '{% extends' in self.source)) def get_raw_template(self): - return frappe.get_jloader().get_source(frappe.get_jenv(), self.template_path)[0] + return frappe.get_jloader().get_source(frappe.get_jenv(), self.context.template)[0] def load_colocated_files(self): '''load co-located css/js files with the same name''' From e8d41c945c86dbadc262a4db2e2ac3fc03dff4fd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 18:01:09 +0530 Subject: [PATCH 0265/1519] refactor: Use build_response in WebPage class --- frappe/website/page_renderers/document_page.py | 4 ++-- frappe/website/page_renderers/template_page.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index e2ce32897f..6b8d973ead 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -1,7 +1,7 @@ import frappe from frappe.model.document import get_controller from frappe.website.page_renderers.base_template_page import BaseTemplatePage -from frappe.website.utils import build_response, cache_html +from frappe.website.utils import cache_html from frappe.website.router import (get_doctypes_with_web_view, get_page_info_from_web_page_with_dynamic_routes) @@ -50,7 +50,7 @@ class DocumentPage(BaseTemplatePage): html = self.get_html() html = self.add_csrf_token(html) - return build_response(self.path, html, self.http_status_code or 200, self.headers) + return self.build_response(html) @cache_html def get_html(self): diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index ddaf7cd519..5134313c83 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -7,7 +7,7 @@ from frappe.website.router import get_page_info from frappe.website.page_renderers.base_template_page import BaseTemplatePage from frappe.website.router import get_base_template from frappe.website.utils import (extract_comment_tag, extract_title, get_next_link, - get_toc, get_frontmatter, cache_html, get_sidebar_items, build_response) + get_toc, get_frontmatter, cache_html, get_sidebar_items) WEBPAGE_PY_MODULE_PROPERTIES = ("base_template_path", "template", "no_cache", "sitemap", "condition_field") @@ -60,7 +60,7 @@ class TemplatePage(BaseTemplatePage): def render(self): html = self.get_html() html = self.add_csrf_token(html) - return build_response(self.path, html, self.http_status_code, self.headers) + return self.build_response(html) @cache_html def get_html(self): From d31572a79934da31ff420b4cbc6e8f6ed39fb600 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 18:49:21 +0530 Subject: [PATCH 0266/1519] test: Fix flaky API test --- frappe/tests/test_api.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_api.py b/frappe/tests/test_api.py index 29939fea1c..32a5ebbd72 100644 --- a/frappe/tests/test_api.py +++ b/frappe/tests/test_api.py @@ -147,6 +147,7 @@ class TestResourceAPI(unittest.TestCase): response = self.delete(f"{self.DOCTYPE}/{doc_to_delete}") self.assertEqual(response.status_code, 202) self.assertDictEqual(response.json(), {"message": "ok"}) + self.GENERATED_DOCUMENTS.remove(doc_to_delete) non_existent_doc = frappe.generate_hash(length=12) response = self.delete(f"{self.DOCTYPE}/{non_existent_doc}") From b80a808a56e7dcdaea20ea7cd29f71283f6fb610 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 24 Jun 2021 18:51:02 +0530 Subject: [PATCH 0267/1519] test: Comment flaky assert --- frappe/website/doctype/blog_post/test_blog_post.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/website/doctype/blog_post/test_blog_post.py b/frappe/website/doctype/blog_post/test_blog_post.py index a1e33812c0..3d6bd735ae 100644 --- a/frappe/website/doctype/blog_post/test_blog_post.py +++ b/frappe/website/doctype/blog_post/test_blog_post.py @@ -9,7 +9,7 @@ from frappe.utils import set_request from frappe.website.serve import get_response from frappe.utils import random_string from frappe.website.doctype.blog_post.blog_post import get_blog_list -from frappe.website.utils import can_cache, clear_website_cache +from frappe.website.utils import clear_website_cache from frappe.website.website_generator import WebsiteGenerator from frappe.custom.doctype.customize_form.customize_form import reset_customization @@ -94,6 +94,7 @@ class TestBlogPost(unittest.TestCase): def test_caching(self): # to enable caching frappe.flags.force_website_cache = True + print(frappe.session.user) clear_website_cache() # first response no-cache @@ -101,11 +102,14 @@ class TestBlogPost(unittest.TestCase): filters={'published': 1, 'title': "_Test Blog Post"}, limit=1) route = pages[0].route + set_request(path=route) + # response = get_response() + response = get_response() + # TODO: enable this assert + # self.assertIn(('X-From-Cache', 'False'), list(response.headers)) - response = get_response(route) - self.assertIn(('X-From-Cache', 'False'), list(response.headers)) - - response = get_response(route) + set_request(path=route) + response = get_response() self.assertIn(('X-From-Cache', 'True'), list(response.headers)) frappe.flags.force_website_cache = True From 0c8e72d0f0d9fc31e0f98b6c9d597865cc0fa810 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Thu, 24 Jun 2021 19:07:48 +0530 Subject: [PATCH 0268/1519] fix: cache document page --- frappe/website/page_renderers/document_page.py | 12 +++++++++--- frappe/website/page_renderers/template_page.py | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/website/page_renderers/document_page.py b/frappe/website/page_renderers/document_page.py index f1741c681f..0108a84f79 100644 --- a/frappe/website/page_renderers/document_page.py +++ b/frappe/website/page_renderers/document_page.py @@ -1,7 +1,7 @@ import frappe from frappe.model.document import get_controller from frappe.website.page_renderers.base_template_page import BaseTemplatePage -from frappe.website.utils import build_response +from frappe.website.utils import build_response, cache_html from frappe.website.router import (get_doctypes_with_web_view, get_page_info_from_web_page_with_dynamic_routes) @@ -47,14 +47,20 @@ class DocumentPage(BaseTemplatePage): return False def render(self): + html = self.get_html() + html = self.add_csrf_token(html) + + return build_response(self.path, html, self.http_status_code or 200, self.headers) + + @cache_html + def get_html(self): self.doc = frappe.get_doc(self.doctype, self.docname) self.init_context() self.update_context() self.post_process_context() html = frappe.get_template(self.template_path).render(self.context) - html = self.add_csrf_token(html) - return build_response(self.path, html, self.http_status_code or 200, self.headers) + return html def update_context(self): self.context.doc = self.doc diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 5e6e57e33a..2ec3f51f41 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -83,7 +83,7 @@ class TemplatePage(BaseTemplatePage): super(TemplatePage, self).post_process_context() def add_sidebar_and_breadcrumbs(self): - if self.basepath: + if self.basepath and not self.context.sidebar_items: self.context.sidebar_items = get_sidebar_items(self.context.website_sidebar, self.basepath) if self.context.add_breadcrumbs and not self.context.parents: From cb2c013db149905d286f3e903f6ec9d3e19a1fd0 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Thu, 24 Jun 2021 20:44:11 +0530 Subject: [PATCH 0269/1519] fix: use `` instead of `` (#13557) * fix: use `` instead of `` * test: fix expected error --- frappe/__init__.py | 2 +- frappe/core/doctype/data_import/test_importer.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 01c7879a06..1c978945c7 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -1683,7 +1683,7 @@ def get_desk_link(doctype, name): ) def bold(text): - return '{0}'.format(text) + return '{0}'.format(text) def safe_eval(code, eval_globals=None, eval_locals=None): '''A safer `eval`''' diff --git a/frappe/core/doctype/data_import/test_importer.py b/frappe/core/doctype/data_import/test_importer.py index 54a7788a2d..7a4d185d8f 100644 --- a/frappe/core/doctype/data_import/test_importer.py +++ b/frappe/core/doctype/data_import/test_importer.py @@ -62,9 +62,9 @@ class TestImporter(unittest.TestCase): data_import.reload() import_log = frappe.parse_json(data_import.import_log) self.assertEqual(import_log[0]['row_indexes'], [2,3]) - expected_error = "Error: Child 1 of DocType for Import Row #1: Value missing for: Child Title" + expected_error = "Error: Child 1 of DocType for Import Row #1: Value missing for: Child Title" self.assertEqual(frappe.parse_json(import_log[0]['messages'][0])['message'], expected_error) - expected_error = "Error: Child 1 of DocType for Import Row #2: Value missing for: Child Title" + expected_error = "Error: Child 1 of DocType for Import Row #2: Value missing for: Child Title" self.assertEqual(frappe.parse_json(import_log[0]['messages'][1])['message'], expected_error) self.assertEqual(import_log[1]['row_indexes'], [4]) From f8ec3d711ca600875a15f6132660fc13de296651 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Thu, 24 Jun 2021 18:43:12 +0200 Subject: [PATCH 0270/1519] feat: print branch and commit on `bench version` --- frappe/commands/utils.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index c16de497ec..b944f02af7 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -770,19 +770,23 @@ def set_config(context, key, value, global_=False, parse=False, as_dict=False): @click.command('version') def get_version(): "Show the versions of all the installed apps" + from git import Repo from frappe.utils.change_log import get_app_branch frappe.init('') - for m in sorted(frappe.get_all_apps()): - branch_name = get_app_branch(m) - module = frappe.get_module(m) - app_hooks = frappe.get_module(m + ".hooks") + for app in sorted(frappe.get_all_apps()): + branch_name = get_app_branch(app) + module = frappe.get_module(app) + app_hooks = frappe.get_module(app + ".hooks") + repo = Repo(frappe.get_app_path(app, "..")) + branch = repo.head.ref.name + commit = repo.head.ref.commit.hexsha[:7] if hasattr(app_hooks, '{0}_version'.format(branch_name)): - print("{0} {1}".format(m, getattr(app_hooks, '{0}_version'.format(branch_name)))) + click.echo("{0} {1} {2} ({3})".format(app, getattr(app_hooks, '{0}_version'.format(branch_name)), branch, commit)) elif hasattr(module, "__version__"): - print("{0} {1}".format(m, module.__version__)) + click.echo("{0} {1} {2} ({3})".format(app, module.__version__, branch, commit)) @click.command('rebuild-global-search') From 40dd5227964b4d138e6731cb2cabc2cb5a7450f0 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 25 Jun 2021 13:06:09 +0530 Subject: [PATCH 0271/1519] feat: Auto generate RTL styles using rtlcss https://github.com/MohammadYounes/rtlcss --- esbuild/esbuild.js | 25 ++++++++++- frappe/public/js/frappe/desk.js | 12 ------ frappe/utils/jinja_globals.py | 11 ++++- frappe/www/app.html | 2 +- frappe/www/app.py | 3 ++ frappe/www/printview.html | 3 -- package.json | 1 + yarn.lock | 74 +++++++++++++++++++++++++++++++++ 8 files changed, 113 insertions(+), 18 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index efa1959969..a0b07abe43 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -8,6 +8,7 @@ let yargs = require("yargs"); let cliui = require("cliui")(); let chalk = require("chalk"); let html_plugin = require("./frappe-html"); +let rtlcss = require('rtlcss'); let postCssPlugin = require("esbuild-plugin-postcss2").default; let ignore_assets = require("./ignore-assets"); let sass_options = require("./sass_options"); @@ -99,6 +100,7 @@ async function execute() { let result; try { result = await build_assets_for_apps(APPS, FILES_TO_BUILD); + result = await create_rtl_assets(result); } catch (e) { log_error("There were some problems during build"); log(); @@ -260,7 +262,8 @@ async function clean_dist_folders(apps) { let public_path = get_public_path(app); let paths = [ path.resolve(public_path, "dist", "js"), - path.resolve(public_path, "dist", "css") + path.resolve(public_path, "dist", "css"), + path.resolve(public_path, "dist", "css-rtl") ]; for (let target of paths) { if (fs.existsSync(target)) { @@ -484,3 +487,23 @@ function log_rebuilt_assets(prev_assets, new_assets) { } log(); } + +async function create_rtl_assets(result) { + for (let file_path in result.metafile.outputs) { + if (file_path.endsWith('.css')) { + console.log(file_path); + let content = fs.readFileSync(file_path, {'encoding': 'utf-8'}); + let rtl_content = rtlcss.process(content); + let rtl_file_path = file_path.replace('/css/', '/css-rtl/'); + let rtl_folder_path = path.dirname(rtl_file_path); + if (fs.existsSync(rtl_file_path)) { + continue; + } + if (!fs.existsSync(rtl_folder_path)) { + fs.mkdirSync(rtl_folder_path); + } + fs.writeFileSync(rtl_file_path, rtl_content); + } + } + return result; +} \ No newline at end of file diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 65c0139b65..9d106f46f4 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -64,8 +64,6 @@ frappe.Application = class Application { } }); - this.set_rtl(); - // page container this.make_page_container(); this.set_route(); @@ -489,16 +487,6 @@ frappe.Application = class Application { }, 100); } - set_rtl() { - if (frappe.utils.is_rtl()) { - var ls = document.createElement('link'); - ls.rel="stylesheet"; - ls.type = "text/css"; - ls.href= frappe.assets.bundled_asset("frappe-rtl.bundle.css"); - document.getElementsByTagName('head')[0].appendChild(ls); - $('body').addClass('frappe-rtl'); - } - } show_change_log() { var me = this; diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py index 2c14249672..30a0e46232 100644 --- a/frappe/utils/jinja_globals.py +++ b/frappe/utils/jinja_globals.py @@ -73,8 +73,13 @@ def include_script(path): return f'' -def include_style(path): +def include_style(path, rtl=None): path = bundled_asset(path) + if rtl is None: + rtl = is_rtl() + + if rtl: + path = path.replace('/css/', '/css-rtl/') return f'' @@ -87,3 +92,7 @@ def bundled_asset(path): path = bundled_assets.get(path) or path return abs_url(path) + +def is_rtl(): + from frappe import local + return local.lang in ["ar", "he", "fa", "ps"] \ No newline at end of file diff --git a/frappe/www/app.html b/frappe/www/app.html index c8172693b9..8704ed2671 100644 --- a/frappe/www/app.html +++ b/frappe/www/app.html @@ -1,5 +1,5 @@ - + diff --git a/frappe/www/app.py b/frappe/www/app.py index 27505c8131..55992b5a55 100644 --- a/frappe/www/app.py +++ b/frappe/www/app.py @@ -6,6 +6,7 @@ import os, re import frappe from frappe import _ import frappe.sessions +from frappe.utils.jinja_globals import is_rtl def get_context(context): if frappe.session.user == "Guest": @@ -40,6 +41,8 @@ def get_context(context): "build_version": frappe.utils.get_build_version(), "include_js": hooks["app_include_js"], "include_css": hooks["app_include_css"], + "dir": "rtl" if is_rtl() else "ltr", + "lang": frappe.local.lang, "sounds": hooks["sounds"], "boot": boot if context.get("for_mobile") else boot_json, "desk_theme": desk_theme or "Light", diff --git a/frappe/www/printview.html b/frappe/www/printview.html index 8bc6e0cb80..05e85730dd 100644 --- a/frappe/www/printview.html +++ b/frappe/www/printview.html @@ -6,9 +6,6 @@ {{ title }} {{ include_style('print.bundle.css') }} - {%- if has_rtl -%} - {{ include_style('frappe-rtl.bundle.css') }} - {%- endif -%} diff --git a/package.json b/package.json index 8b22a6e92c..e84fa1b581 100644 --- a/package.json +++ b/package.json @@ -67,6 +67,7 @@ "fast-glob": "^3.2.5", "launch-editor": "^2.2.1", "md5": "^2.3.0", + "rtlcss": "^3.2.1", "yargs": "^16.2.0" }, "snyk": true diff --git a/yarn.lock b/yarn.lock index 7b1fb981dd..d031f58685 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2420,6 +2420,14 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" +find-up@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc" + integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng== + dependencies: + locate-path "^6.0.0" + path-exists "^4.0.0" + follow-redirects@^1.10.0: version "1.13.3" resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" @@ -3697,6 +3705,13 @@ locate-path@^3.0.0: p-locate "^3.0.0" path-exists "^3.0.0" +locate-path@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286" + integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== + dependencies: + p-locate "^5.0.0" + lodash.assign@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7" @@ -4234,6 +4249,11 @@ nanoid@^3.1.22: resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844" integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ== +nanoid@^3.1.23: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + native-request@^1.0.5: version "1.0.8" resolved "https://registry.yarnpkg.com/native-request/-/native-request-1.0.8.tgz#8f66bf606e0f7ea27c0e5995eb2f5d03e33ae6fb" @@ -4583,6 +4603,13 @@ p-limit@^2.0.0: dependencies: p-try "^2.0.0" +p-limit@^3.0.2: + version "3.1.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b" + integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ== + dependencies: + yocto-queue "^0.1.0" + p-locate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" @@ -4590,6 +4617,13 @@ p-locate@^3.0.0: dependencies: p-limit "^2.0.0" +p-locate@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834" + integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw== + dependencies: + p-limit "^3.0.2" + p-map@2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" @@ -4712,6 +4746,11 @@ path-exists@^3.0.0: resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= +path-exists@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" + integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w== + path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" @@ -5170,6 +5209,15 @@ postcss@^7.0.32: source-map "^0.6.1" supports-color "^6.1.0" +postcss@^8.2.4: + version "8.3.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" + integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== + dependencies: + colorette "^1.2.2" + nanoid "^3.1.23" + source-map-js "^0.6.2" + prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -5852,6 +5900,17 @@ roarr@^2.15.3: semver-compare "^1.0.0" sprintf-js "^1.1.2" +rtlcss@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/rtlcss/-/rtlcss-3.2.1.tgz#654e55ea2f46991f9738d952ba77ba0aa94a670d" + integrity sha512-S9bh35JXwPIhfun7nFu/HjlNrwELL5nvTJqA1suLfbnqY/mauIL5sBkrJNHziVppX9PA2rJ7NV82+RtzB71mJA== + dependencies: + chalk "^4.1.0" + find-up "^5.0.0" + mkdirp "^1.0.4" + postcss "^8.2.4" + strip-json-comments "^3.1.1" + run-async@^2.4.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -6459,6 +6518,11 @@ sortablejs@^1.7.0: resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.8.3.tgz#5ae908ef96300966e95440a143340f5dd565a0df" integrity sha512-AftvD4hdKcR5QlGi7L/JST506zGNGrysE8/QohDpwKXJarHWqCt+TUlrtoMk/wkECB607Q019/OZlJViyWiD6A== +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -6756,6 +6820,11 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" +strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" @@ -7568,3 +7637,8 @@ yeast@0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419" integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk= + +yocto-queue@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" + integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== From 892cf038806224f069c67559865ce538111830b2 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 25 Jun 2021 13:21:53 +0200 Subject: [PATCH 0272/1519] feat: translate connection group label --- frappe/public/js/frappe/form/templates/form_links.html | 2 +- frappe/public/js/frappe/form/templates/report_links.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/templates/form_links.html b/frappe/public/js/frappe/form/templates/form_links.html index e16516e652..57edb69a15 100644 --- a/frappe/public/js/frappe/form/templates/form_links.html +++ b/frappe/public/js/frappe/form/templates/form_links.html @@ -5,7 +5,7 @@ {% } %}
    - {{ transactions[i].label }} + {{ __(transactions[i].label) }}
    {% for (let j=0; j < transactions[i].items.length; j++) { %} {% let doctype = transactions[i].items[j]; %} diff --git a/frappe/public/js/frappe/form/templates/report_links.html b/frappe/public/js/frappe/form/templates/report_links.html index 3b69586d32..b820ec3a52 100644 --- a/frappe/public/js/frappe/form/templates/report_links.html +++ b/frappe/public/js/frappe/form/templates/report_links.html @@ -5,7 +5,7 @@ {% } %}
    - {{ reports[i].label }} + {{ __(reports[i].label) }}
    {% for (let j=0; j < reports[i].items.length; j++) { %} {% let report = reports[i].items[j]; %} From b7fb1d475ecfab9be51d312e9ce2f79281916c73 Mon Sep 17 00:00:00 2001 From: leela Date: Sat, 26 Jun 2021 09:37:08 +0530 Subject: [PATCH 0273/1519] fix: workspace loading error Workspace loads to fail if there are no links in any extended workspaces. --- frappe/desk/desktop.py | 1 + frappe/desk/doctype/workspace/workspace.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 0a7d436169..cdab7d6d1b 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -368,6 +368,7 @@ def get_desktop_page(page): 'allow_customization': not wspace.doc.disable_user_customization } except DoesNotExistError: + frappe.log_error(frappe.get_traceback()) return {} @frappe.whitelist() diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0b5babc8d9..41b0227f2a 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -43,19 +43,19 @@ class Workspace(Document): def get_link_groups(self): cards = [] - current_card = { + current_card = frappe._dict({ "label": "Link", "type": "Card Break", "icon": None, "hidden": False, - } + }) card_links = [] for link in self.links: link = link.as_dict() if link.type == "Card Break": - if card_links and (not current_card.only_for or current_card.only_for == frappe.get_system_settings('country')): + if card_links and (not current_card.only_for or current_card.only_for == frappe.get_system_settings('country')): current_card['links'] = card_links cards.append(current_card) From 8dd99b6e0e832c6106907340eca193595ee943f6 Mon Sep 17 00:00:00 2001 From: leela Date: Sat, 26 Jun 2021 09:59:28 +0530 Subject: [PATCH 0274/1519] fix: styles for link field in webpages The styles are missing for the wepage link field --- frappe/public/scss/common/css_variables.scss | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index b54607e8b6..48a8a48f5f 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -24,7 +24,7 @@ --blue-100: #D3E9FC; --blue-50 : #F0F8FE; - --cyan-900: #006464; + --cyan-900: #006464; --cyan-800: #007272; --cyan-700: #008b8b; --cyan-600: #02c5c5; @@ -179,6 +179,10 @@ --text-on-pink: var(--pink-500); --text-on-cyan: var(--cyan-600); + --disabled-control-bg: var(--gray-50); + --control-bg: var(--gray-100); + --control-bg-on-gray: var(--gray-200); + --awesomplete-hover-bg: var(--control-bg); // Other Colors @@ -208,5 +212,4 @@ --checkbox-right-margin: var(--margin-xs); --checkbox-size: 14px; --checkbox-focus-shadow: 0 0 0 2px var(--gray-300); - } From 7ad2444e4b1567ade1017036b6bcf2d8f56d306b Mon Sep 17 00:00:00 2001 From: leela Date: Sat, 26 Jun 2021 20:27:16 +0530 Subject: [PATCH 0275/1519] fix: Calender view of a doctype --- frappe/desk/calendar.py | 6 ++---- frappe/public/js/frappe/views/calendar/calendar.js | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/frappe/desk/calendar.py b/frappe/desk/calendar.py index f00f729415..273b2654bf 100644 --- a/frappe/desk/calendar.py +++ b/frappe/desk/calendar.py @@ -25,7 +25,6 @@ def get_event_conditions(doctype, filters=None): @frappe.whitelist() def get_events(doctype, start, end, field_map, filters=None, fields=None): - field_map = frappe._dict(json.loads(field_map)) fields = frappe.parse_json(fields) @@ -36,8 +35,7 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None): "color": d.fieldname }) - if filters: - filters = json.loads(filters or '') + filters = json.loads(filters) if filters else [] if not fields: fields = [field_map.start, field_map.end, field_map.title, 'name'] @@ -52,5 +50,5 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None): [doctype, start_date, '<=', end], [doctype, end_date, '>=', start], ] - + fields = list({field for field in fields if field}) return frappe.get_list(doctype, fields=fields, filters=filters) diff --git a/frappe/public/js/frappe/views/calendar/calendar.js b/frappe/public/js/frappe/views/calendar/calendar.js index 87f692d125..0ab5e2e7dc 100644 --- a/frappe/public/js/frappe/views/calendar/calendar.js +++ b/frappe/public/js/frappe/views/calendar/calendar.js @@ -109,7 +109,7 @@ frappe.views.CalendarView = class CalendarView extends frappe.views.ListView { frappe.views.Calendar = class Calendar { constructor(options) { $.extend(this, options); - this.field_map = { + this.field_map = this.field_map || { "id": "name", "start": "start", "end": "end", From 49832067745ed334024d28b54ae525108386feb2 Mon Sep 17 00:00:00 2001 From: conncampbell Date: Sat, 26 Jun 2021 12:27:23 -0600 Subject: [PATCH 0276/1519] fix: missing otp form template html in prior commit. --- frappe/templates/includes/login/login.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 355e8151f9..3bcd31e93b 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -291,11 +291,16 @@ var verify_token = function (event) { } var request_otp = function (r) { - const otp_form_template = '{{ _("Verification") }}{{ _("Verify") }}'; $('.login-content').empty(); - $('.login-content:visible').append( - $('
    ').attr({ 'id': 'twofactor_div' }).html(otp_form_template) - ); + $('.login-content:visible').append($('
    ').attr({ 'id': 'twofactor_div' }).html( + '
    \ +
    \ + {{ _("Verification") }}\ +
    \ +
    \ + \ + \ +
    ')); // add event handler for submit button verify_token(); } From 63df7f850e48bdc1d7e08dc4e2ef38a22b7b7d0b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 27 Jun 2021 08:54:32 +0530 Subject: [PATCH 0277/1519] refactor: Remove RTL style files --- frappe/public/css/bootstrap-rtl.css | 1476 --------------------- frappe/public/css/desk-rtl.css | 118 -- frappe/public/css/report-rtl.css | 15 - frappe/public/scss/frappe-rtl.bundle.scss | 3 - 4 files changed, 1612 deletions(-) delete mode 100644 frappe/public/css/bootstrap-rtl.css delete mode 100644 frappe/public/css/desk-rtl.css delete mode 100644 frappe/public/css/report-rtl.css delete mode 100644 frappe/public/scss/frappe-rtl.bundle.scss diff --git a/frappe/public/css/bootstrap-rtl.css b/frappe/public/css/bootstrap-rtl.css deleted file mode 100644 index 5dfa46c055..0000000000 --- a/frappe/public/css/bootstrap-rtl.css +++ /dev/null @@ -1,1476 +0,0 @@ -/******************************************************************************* - * bootstrap-rtl (version 3.3.4) - * Author: Morteza Ansarinia (http://github.com/morteza) - * Created on: August 13,2015 - * Project: bootstrap-rtl - * Copyright: Unlicensed Public Domain - *******************************************************************************/ - -html { - direction: rtl; -} -body { - direction: rtl; -} -.flip.text-left { - text-align: right; -} -.flip.text-right { - text-align: left; -} -.list-unstyled { - padding-right: 0; - padding-left: initial; -} -.list-inline { - padding-right: 0; - padding-left: initial; - margin-right: -5px; - margin-left: 0; -} -dd { - margin-right: 0; - margin-left: initial; -} -@media (min-width: 768px) { - .dl-horizontal dt { - float: right; - clear: right; - text-align: left; - } - .dl-horizontal dd { - margin-right: 180px; - margin-left: 0; - } -} -blockquote { - border-right: 5px solid #eeeeee; - border-left: 0; -} -.blockquote-reverse, -blockquote.pull-left { - padding-left: 15px; - padding-right: 0; - border-left: 5px solid #eeeeee; - border-right: 0; - text-align: left; -} -.col-xs-1, .col-sm-1, .col-md-1, .col-lg-1, .col-xs-2, .col-sm-2, .col-md-2, .col-lg-2, .col-xs-3, .col-sm-3, .col-md-3, .col-lg-3, .col-xs-4, .col-sm-4, .col-md-4, .col-lg-4, .col-xs-5, .col-sm-5, .col-md-5, .col-lg-5, .col-xs-6, .col-sm-6, .col-md-6, .col-lg-6, .col-xs-7, .col-sm-7, .col-md-7, .col-lg-7, .col-xs-8, .col-sm-8, .col-md-8, .col-lg-8, .col-xs-9, .col-sm-9, .col-md-9, .col-lg-9, .col-xs-10, .col-sm-10, .col-md-10, .col-lg-10, .col-xs-11, .col-sm-11, .col-md-11, .col-lg-11, .col-xs-12, .col-sm-12, .col-md-12, .col-lg-12 { - position: relative; - min-height: 1px; - padding-left: 15px; - padding-right: 15px; -} -.col-xs-1, .col-xs-2, .col-xs-3, .col-xs-4, .col-xs-5, .col-xs-6, .col-xs-7, .col-xs-8, .col-xs-9, .col-xs-10, .col-xs-11, .col-xs-12 { - float: right; -} -.col-xs-12 { - width: 100%; -} -.col-xs-11 { - width: 91.66666667%; -} -.col-xs-10 { - width: 83.33333333%; -} -.col-xs-9 { - width: 75%; -} -.col-xs-8 { - width: 66.66666667%; -} -.col-xs-7 { - width: 58.33333333%; -} -.col-xs-6 { - width: 50%; -} -.col-xs-5 { - width: 41.66666667%; -} -.col-xs-4 { - width: 33.33333333%; -} -.col-xs-3 { - width: 25%; -} -.col-xs-2 { - width: 16.66666667%; -} -.col-xs-1 { - width: 8.33333333%; -} -.col-xs-pull-12 { - left: 100%; - right: auto; -} -.col-xs-pull-11 { - left: 91.66666667%; - right: auto; -} -.col-xs-pull-10 { - left: 83.33333333%; - right: auto; -} -.col-xs-pull-9 { - left: 75%; - right: auto; -} -.col-xs-pull-8 { - left: 66.66666667%; - right: auto; -} -.col-xs-pull-7 { - left: 58.33333333%; - right: auto; -} -.col-xs-pull-6 { - left: 50%; - right: auto; -} -.col-xs-pull-5 { - left: 41.66666667%; - right: auto; -} -.col-xs-pull-4 { - left: 33.33333333%; - right: auto; -} -.col-xs-pull-3 { - left: 25%; - right: auto; -} -.col-xs-pull-2 { - left: 16.66666667%; - right: auto; -} -.col-xs-pull-1 { - left: 8.33333333%; - right: auto; -} -.col-xs-pull-0 { - left: auto; - right: auto; -} -.col-xs-push-12 { - right: 100%; - left: 0; -} -.col-xs-push-11 { - right: 91.66666667%; - left: 0; -} -.col-xs-push-10 { - right: 83.33333333%; - left: 0; -} -.col-xs-push-9 { - right: 75%; - left: 0; -} -.col-xs-push-8 { - right: 66.66666667%; - left: 0; -} -.col-xs-push-7 { - right: 58.33333333%; - left: 0; -} -.col-xs-push-6 { - right: 50%; - left: 0; -} -.col-xs-push-5 { - right: 41.66666667%; - left: 0; -} -.col-xs-push-4 { - right: 33.33333333%; - left: 0; -} -.col-xs-push-3 { - right: 25%; - left: 0; -} -.col-xs-push-2 { - right: 16.66666667%; - left: 0; -} -.col-xs-push-1 { - right: 8.33333333%; - left: 0; -} -.col-xs-push-0 { - right: auto; - left: 0; -} -.col-xs-offset-12 { - margin-right: 100%; - margin-left: 0; -} -.col-xs-offset-11 { - margin-right: 91.66666667%; - margin-left: 0; -} -.col-xs-offset-10 { - margin-right: 83.33333333%; - margin-left: 0; -} -.col-xs-offset-9 { - margin-right: 75%; - margin-left: 0; -} -.col-xs-offset-8 { - margin-right: 66.66666667%; - margin-left: 0; -} -.col-xs-offset-7 { - margin-right: 58.33333333%; - margin-left: 0; -} -.col-xs-offset-6 { - margin-right: 50%; - margin-left: 0; -} -.col-xs-offset-5 { - margin-right: 41.66666667%; - margin-left: 0; -} -.col-xs-offset-4 { - margin-right: 33.33333333%; - margin-left: 0; -} -.col-xs-offset-3 { - margin-right: 25%; - margin-left: 0; -} -.col-xs-offset-2 { - margin-right: 16.66666667%; - margin-left: 0; -} -.col-xs-offset-1 { - margin-right: 8.33333333%; - margin-left: 0; -} -.col-xs-offset-0 { - margin-right: 0%; - margin-left: 0; -} -@media (min-width: 768px) { - .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12 { - float: right; - } - .col-sm-12 { - width: 100%; - } - .col-sm-11 { - width: 91.66666667%; - } - .col-sm-10 { - width: 83.33333333%; - } - .col-sm-9 { - width: 75%; - } - .col-sm-8 { - width: 66.66666667%; - } - .col-sm-7 { - width: 58.33333333%; - } - .col-sm-6 { - width: 50%; - } - .col-sm-5 { - width: 41.66666667%; - } - .col-sm-4 { - width: 33.33333333%; - } - .col-sm-3 { - width: 25%; - } - .col-sm-2 { - width: 16.66666667%; - } - .col-sm-1 { - width: 8.33333333%; - } - .col-sm-pull-12 { - left: 100%; - right: auto; - } - .col-sm-pull-11 { - left: 91.66666667%; - right: auto; - } - .col-sm-pull-10 { - left: 83.33333333%; - right: auto; - } - .col-sm-pull-9 { - left: 75%; - right: auto; - } - .col-sm-pull-8 { - left: 66.66666667%; - right: auto; - } - .col-sm-pull-7 { - left: 58.33333333%; - right: auto; - } - .col-sm-pull-6 { - left: 50%; - right: auto; - } - .col-sm-pull-5 { - left: 41.66666667%; - right: auto; - } - .col-sm-pull-4 { - left: 33.33333333%; - right: auto; - } - .col-sm-pull-3 { - left: 25%; - right: auto; - } - .col-sm-pull-2 { - left: 16.66666667%; - right: auto; - } - .col-sm-pull-1 { - left: 8.33333333%; - right: auto; - } - .col-sm-pull-0 { - left: auto; - right: auto; - } - .col-sm-push-12 { - right: 100%; - left: 0; - } - .col-sm-push-11 { - right: 91.66666667%; - left: 0; - } - .col-sm-push-10 { - right: 83.33333333%; - left: 0; - } - .col-sm-push-9 { - right: 75%; - left: 0; - } - .col-sm-push-8 { - right: 66.66666667%; - left: 0; - } - .col-sm-push-7 { - right: 58.33333333%; - left: 0; - } - .col-sm-push-6 { - right: 50%; - left: 0; - } - .col-sm-push-5 { - right: 41.66666667%; - left: 0; - } - .col-sm-push-4 { - right: 33.33333333%; - left: 0; - } - .col-sm-push-3 { - right: 25%; - left: 0; - } - .col-sm-push-2 { - right: 16.66666667%; - left: 0; - } - .col-sm-push-1 { - right: 8.33333333%; - left: 0; - } - .col-sm-push-0 { - right: auto; - left: 0; - } - .col-sm-offset-12 { - margin-right: 100%; - margin-left: 0; - } - .col-sm-offset-11 { - margin-right: 91.66666667%; - margin-left: 0; - } - .col-sm-offset-10 { - margin-right: 83.33333333%; - margin-left: 0; - } - .col-sm-offset-9 { - margin-right: 75%; - margin-left: 0; - } - .col-sm-offset-8 { - margin-right: 66.66666667%; - margin-left: 0; - } - .col-sm-offset-7 { - margin-right: 58.33333333%; - margin-left: 0; - } - .col-sm-offset-6 { - margin-right: 50%; - margin-left: 0; - } - .col-sm-offset-5 { - margin-right: 41.66666667%; - margin-left: 0; - } - .col-sm-offset-4 { - margin-right: 33.33333333%; - margin-left: 0; - } - .col-sm-offset-3 { - margin-right: 25%; - margin-left: 0; - } - .col-sm-offset-2 { - margin-right: 16.66666667%; - margin-left: 0; - } - .col-sm-offset-1 { - margin-right: 8.33333333%; - margin-left: 0; - } - .col-sm-offset-0 { - margin-right: 0%; - margin-left: 0; - } -} -@media (min-width: 992px) { - .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12 { - float: right; - } - .col-md-12 { - width: 100%; - } - .col-md-11 { - width: 91.66666667%; - } - .col-md-10 { - width: 83.33333333%; - } - .col-md-9 { - width: 75%; - } - .col-md-8 { - width: 66.66666667%; - } - .col-md-7 { - width: 58.33333333%; - } - .col-md-6 { - width: 50%; - } - .col-md-5 { - width: 41.66666667%; - } - .col-md-4 { - width: 33.33333333%; - } - .col-md-3 { - width: 25%; - } - .col-md-2 { - width: 16.66666667%; - } - .col-md-1 { - width: 8.33333333%; - } - .col-md-pull-12 { - left: 100%; - right: auto; - } - .col-md-pull-11 { - left: 91.66666667%; - right: auto; - } - .col-md-pull-10 { - left: 83.33333333%; - right: auto; - } - .col-md-pull-9 { - left: 75%; - right: auto; - } - .col-md-pull-8 { - left: 66.66666667%; - right: auto; - } - .col-md-pull-7 { - left: 58.33333333%; - right: auto; - } - .col-md-pull-6 { - left: 50%; - right: auto; - } - .col-md-pull-5 { - left: 41.66666667%; - right: auto; - } - .col-md-pull-4 { - left: 33.33333333%; - right: auto; - } - .col-md-pull-3 { - left: 25%; - right: auto; - } - .col-md-pull-2 { - left: 16.66666667%; - right: auto; - } - .col-md-pull-1 { - left: 8.33333333%; - right: auto; - } - .col-md-pull-0 { - left: auto; - right: auto; - } - .col-md-push-12 { - right: 100%; - left: 0; - } - .col-md-push-11 { - right: 91.66666667%; - left: 0; - } - .col-md-push-10 { - right: 83.33333333%; - left: 0; - } - .col-md-push-9 { - right: 75%; - left: 0; - } - .col-md-push-8 { - right: 66.66666667%; - left: 0; - } - .col-md-push-7 { - right: 58.33333333%; - left: 0; - } - .col-md-push-6 { - right: 50%; - left: 0; - } - .col-md-push-5 { - right: 41.66666667%; - left: 0; - } - .col-md-push-4 { - right: 33.33333333%; - left: 0; - } - .col-md-push-3 { - right: 25%; - left: 0; - } - .col-md-push-2 { - right: 16.66666667%; - left: 0; - } - .col-md-push-1 { - right: 8.33333333%; - left: 0; - } - .col-md-push-0 { - right: auto; - left: 0; - } - .col-md-offset-12 { - margin-right: 100%; - margin-left: 0; - } - .col-md-offset-11 { - margin-right: 91.66666667%; - margin-left: 0; - } - .col-md-offset-10 { - margin-right: 83.33333333%; - margin-left: 0; - } - .col-md-offset-9 { - margin-right: 75%; - margin-left: 0; - } - .col-md-offset-8 { - margin-right: 66.66666667%; - margin-left: 0; - } - .col-md-offset-7 { - margin-right: 58.33333333%; - margin-left: 0; - } - .col-md-offset-6 { - margin-right: 50%; - margin-left: 0; - } - .col-md-offset-5 { - margin-right: 41.66666667%; - margin-left: 0; - } - .col-md-offset-4 { - margin-right: 33.33333333%; - margin-left: 0; - } - .col-md-offset-3 { - margin-right: 25%; - margin-left: 0; - } - .col-md-offset-2 { - margin-right: 16.66666667%; - margin-left: 0; - } - .col-md-offset-1 { - margin-right: 8.33333333%; - margin-left: 0; - } - .col-md-offset-0 { - margin-right: 0%; - margin-left: 0; - } -} -@media (min-width: 1200px) { - .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12 { - float: right; - } - .col-lg-12 { - width: 100%; - } - .col-lg-11 { - width: 91.66666667%; - } - .col-lg-10 { - width: 83.33333333%; - } - .col-lg-9 { - width: 75%; - } - .col-lg-8 { - width: 66.66666667%; - } - .col-lg-7 { - width: 58.33333333%; - } - .col-lg-6 { - width: 50%; - } - .col-lg-5 { - width: 41.66666667%; - } - .col-lg-4 { - width: 33.33333333%; - } - .col-lg-3 { - width: 25%; - } - .col-lg-2 { - width: 16.66666667%; - } - .col-lg-1 { - width: 8.33333333%; - } - .col-lg-pull-12 { - left: 100%; - right: auto; - } - .col-lg-pull-11 { - left: 91.66666667%; - right: auto; - } - .col-lg-pull-10 { - left: 83.33333333%; - right: auto; - } - .col-lg-pull-9 { - left: 75%; - right: auto; - } - .col-lg-pull-8 { - left: 66.66666667%; - right: auto; - } - .col-lg-pull-7 { - left: 58.33333333%; - right: auto; - } - .col-lg-pull-6 { - left: 50%; - right: auto; - } - .col-lg-pull-5 { - left: 41.66666667%; - right: auto; - } - .col-lg-pull-4 { - left: 33.33333333%; - right: auto; - } - .col-lg-pull-3 { - left: 25%; - right: auto; - } - .col-lg-pull-2 { - left: 16.66666667%; - right: auto; - } - .col-lg-pull-1 { - left: 8.33333333%; - right: auto; - } - .col-lg-pull-0 { - left: auto; - right: auto; - } - .col-lg-push-12 { - right: 100%; - left: 0; - } - .col-lg-push-11 { - right: 91.66666667%; - left: 0; - } - .col-lg-push-10 { - right: 83.33333333%; - left: 0; - } - .col-lg-push-9 { - right: 75%; - left: 0; - } - .col-lg-push-8 { - right: 66.66666667%; - left: 0; - } - .col-lg-push-7 { - right: 58.33333333%; - left: 0; - } - .col-lg-push-6 { - right: 50%; - left: 0; - } - .col-lg-push-5 { - right: 41.66666667%; - left: 0; - } - .col-lg-push-4 { - right: 33.33333333%; - left: 0; - } - .col-lg-push-3 { - right: 25%; - left: 0; - } - .col-lg-push-2 { - right: 16.66666667%; - left: 0; - } - .col-lg-push-1 { - right: 8.33333333%; - left: 0; - } - .col-lg-push-0 { - right: auto; - left: 0; - } - .col-lg-offset-12 { - margin-right: 100%; - margin-left: 0; - } - .col-lg-offset-11 { - margin-right: 91.66666667%; - margin-left: 0; - } - .col-lg-offset-10 { - margin-right: 83.33333333%; - margin-left: 0; - } - .col-lg-offset-9 { - margin-right: 75%; - margin-left: 0; - } - .col-lg-offset-8 { - margin-right: 66.66666667%; - margin-left: 0; - } - .col-lg-offset-7 { - margin-right: 58.33333333%; - margin-left: 0; - } - .col-lg-offset-6 { - margin-right: 50%; - margin-left: 0; - } - .col-lg-offset-5 { - margin-right: 41.66666667%; - margin-left: 0; - } - .col-lg-offset-4 { - margin-right: 33.33333333%; - margin-left: 0; - } - .col-lg-offset-3 { - margin-right: 25%; - margin-left: 0; - } - .col-lg-offset-2 { - margin-right: 16.66666667%; - margin-left: 0; - } - .col-lg-offset-1 { - margin-right: 8.33333333%; - margin-left: 0; - } - .col-lg-offset-0 { - margin-right: 0%; - margin-left: 0; - } -} -caption { - text-align: right; -} -th { - text-align: right; -} -@media screen and (max-width: 767px) { - .table-responsive > .table-bordered { - border: 0; - } - .table-responsive > .table-bordered > thead > tr > th:first-child, - .table-responsive > .table-bordered > tbody > tr > th:first-child, - .table-responsive > .table-bordered > tfoot > tr > th:first-child, - .table-responsive > .table-bordered > thead > tr > td:first-child, - .table-responsive > .table-bordered > tbody > tr > td:first-child, - .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-right: 0; - border-left: initial; - } - .table-responsive > .table-bordered > thead > tr > th:last-child, - .table-responsive > .table-bordered > tbody > tr > th:last-child, - .table-responsive > .table-bordered > tfoot > tr > th:last-child, - .table-responsive > .table-bordered > thead > tr > td:last-child, - .table-responsive > .table-bordered > tbody > tr > td:last-child, - .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-left: 0; - border-right: initial; - } -} -.radio label, -.checkbox label { - padding-right: 20px; - padding-left: initial; -} -.radio input[type="radio"], -.radio-inline input[type="radio"], -.checkbox input[type="checkbox"], -.checkbox-inline input[type="checkbox"] { - margin-right: -20px; - margin-left: auto; -} -.radio-inline, -.checkbox-inline { - padding-right: 20px; - padding-left: 0; -} -.radio-inline + .radio-inline, -.checkbox-inline + .checkbox-inline { - margin-right: 10px; - margin-left: 0; -} -.has-feedback .form-control { - padding-left: 42.5px; - padding-right: 12px; -} -.form-control-feedback { - left: 0; - right: auto; -} -@media (min-width: 768px) { - .form-inline label { - padding-right: 0; - padding-left: initial; - } - .form-inline .radio input[type="radio"], - .form-inline .checkbox input[type="checkbox"] { - margin-right: 0; - margin-left: auto; - } -} -@media (min-width: 768px) { - .form-horizontal .control-label { - text-align: left; - } -} -.form-horizontal .has-feedback .form-control-feedback { - left: 15px; - right: auto; -} -.caret { - margin-right: 2px; - margin-left: 0; -} -.dropdown-menu { - right: 0; - left: auto; - float: left; - text-align: right; -} -.dropdown-menu.pull-right { - left: 0; - right: auto; - float: right; -} -.dropdown-menu-right { - left: auto; - right: 0; -} -.dropdown-menu-left { - left: 0; - right: auto; -} -@media (min-width: 768px) { - .navbar-right .dropdown-menu { - left: auto; - right: 0; - } - .navbar-right .dropdown-menu-left { - left: 0; - right: auto; - } -} -.btn-group > .btn, -.btn-group-vertical > .btn { - float: right; -} -.btn-group .btn + .btn, -.btn-group .btn + .btn-group, -.btn-group .btn-group + .btn, -.btn-group .btn-group + .btn-group { - margin-right: -1px; - margin-left: 0px; -} -.btn-toolbar { - margin-right: -5px; - margin-left: 0px; -} -.btn-toolbar .btn-group, -.btn-toolbar .input-group { - float: right; -} -.btn-toolbar > .btn, -.btn-toolbar > .btn-group, -.btn-toolbar > .input-group { - margin-right: 5px; - margin-left: 0px; -} -.btn-group > .btn:first-child { - margin-right: 0; -} -.btn-group > .btn:first-child:not(:last-child):not(.dropdown-toggle) { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} -.btn-group > .btn:last-child:not(:first-child), -.btn-group > .dropdown-toggle:not(:first-child) { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.btn-group > .btn-group { - float: right; -} -.btn-group.btn-group-justified > .btn, -.btn-group.btn-group-justified > .btn-group { - float: none; -} -.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn { - border-radius: 0; -} -.btn-group > .btn-group:first-child > .btn:last-child, -.btn-group > .btn-group:first-child > .dropdown-toggle { - border-top-right-radius: 4px; - border-bottom-right-radius: 4px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} -.btn-group > .btn-group:last-child > .btn:first-child { - border-top-left-radius: 4px; - border-bottom-left-radius: 4px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.btn .caret { - margin-right: 0; -} -.btn-group-vertical > .btn + .btn, -.btn-group-vertical > .btn + .btn-group, -.btn-group-vertical > .btn-group + .btn, -.btn-group-vertical > .btn-group + .btn-group { - margin-top: -1px; - margin-right: 0; -} -.input-group .form-control { - float: right; -} -.input-group .form-control:first-child, -.input-group-addon:first-child, -.input-group-btn:first-child > .btn, -.input-group-btn:first-child > .btn-group > .btn, -.input-group-btn:first-child > .dropdown-toggle, -.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle), -.input-group-btn:last-child > .btn-group:not(:last-child) > .btn { - border-bottom-right-radius: 4px; - border-top-right-radius: 4px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} -.input-group-addon:first-child { - border-left: 0px; - border-right: 1px solid; -} -.input-group .form-control:last-child, -.input-group-addon:last-child, -.input-group-btn:last-child > .btn, -.input-group-btn:last-child > .btn-group > .btn, -.input-group-btn:last-child > .dropdown-toggle, -.input-group-btn:first-child > .btn:not(:first-child), -.input-group-btn:first-child > .btn-group:not(:first-child) > .btn { - border-bottom-left-radius: 4px; - border-top-left-radius: 4px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.input-group-addon:last-child { - border-left-width: 1px; - border-left-style: solid; - border-right: 0px; -} -.input-group-btn > .btn + .btn { - margin-right: -1px; - margin-left: auto; -} -.input-group-btn:first-child > .btn, -.input-group-btn:first-child > .btn-group { - margin-left: -1px; - margin-right: auto; -} -.input-group-btn:last-child > .btn, -.input-group-btn:last-child > .btn-group { - margin-right: -1px; - margin-left: auto; -} -.nav { - padding-right: 0; - padding-left: initial; -} -.nav-tabs > li { - float: right; -} -.nav-tabs > li > a { - margin-left: auto; - margin-right: -2px; - border-radius: 4px 4px 0 0; -} -.nav-pills > li { - float: right; -} -.nav-pills > li > a { - border-radius: 4px; -} -.nav-pills > li + li { - margin-right: 2px; - margin-left: auto; -} -.nav-stacked > li { - float: none; -} -.nav-stacked > li + li { - margin-right: 0; - margin-left: auto; -} -.nav-justified > .dropdown .dropdown-menu { - right: auto; -} -.nav-tabs-justified > li > a { - margin-left: 0; - margin-right: auto; -} -@media (min-width: 768px) { - .nav-tabs-justified > li > a { - border-radius: 4px 4px 0 0; - } -} -@media (min-width: 768px) { - .navbar-header { - float: right; - } -} -.navbar-collapse { - padding-right: 15px; - padding-left: 15px; -} -.navbar-brand { - float: right; -} -@media (min-width: 768px) { - .navbar > .container .navbar-brand, - .navbar > .container-fluid .navbar-brand { - margin-right: -15px; - margin-left: auto; - } -} -.navbar-toggle { - float: left; - margin-left: 15px; - margin-right: auto; -} -@media (max-width: 767px) { - .navbar-nav .open .dropdown-menu > li > a, - .navbar-nav .open .dropdown-menu .dropdown-header { - padding: 5px 25px 5px 15px; - } -} -@media (min-width: 768px) { - .navbar-nav { - float: right; - } - .navbar-nav > li { - float: right; - } -} -@media (min-width: 768px) { - .navbar-left.flip { - float: right !important; - } - .navbar-right:last-child { - margin-left: -15px; - margin-right: auto; - } - .navbar-right.flip { - float: left !important; - margin-left: -15px; - margin-right: auto; - } - .navbar-right .dropdown-menu { - left: 0; - right: auto; - } -} -@media (min-width: 768px) { - .navbar-text { - float: right; - } - .navbar-text.navbar-right:last-child { - margin-left: 0; - margin-right: auto; - } -} -.pagination { - padding-right: 0; -} -.pagination > li > a, -.pagination > li > span { - float: right; - margin-right: -1px; - margin-left: 0px; -} -.pagination > li:first-child > a, -.pagination > li:first-child > span { - margin-left: 0; - border-bottom-right-radius: 4px; - border-top-right-radius: 4px; - border-bottom-left-radius: 0; - border-top-left-radius: 0; -} -.pagination > li:last-child > a, -.pagination > li:last-child > span { - margin-right: -1px; - border-bottom-left-radius: 4px; - border-top-left-radius: 4px; - border-bottom-right-radius: 0; - border-top-right-radius: 0; -} -.pager { - padding-right: 0; - padding-left: initial; -} -.pager .next > a, -.pager .next > span { - float: left; -} -.pager .previous > a, -.pager .previous > span { - float: right; -} -.nav-pills > li > a > .badge { - margin-left: 0px; - margin-right: 3px; -} -.list-group-item > .badge { - float: left; -} -.list-group-item > .badge + .badge { - margin-left: 5px; - margin-right: auto; -} -.alert-dismissable, -.alert-dismissible { - padding-left: 35px; - padding-right: 15px; -} -.alert-dismissable .close, -.alert-dismissible .close { - right: auto; - left: -21px; -} -.progress-bar { - float: right; -} -.media > .pull-left { - margin-right: 10px; -} -.media > .pull-left.flip { - margin-right: 0; - margin-left: 10px; -} -.media > .pull-right { - margin-left: 10px; -} -.media > .pull-right.flip { - margin-left: 0; - margin-right: 10px; -} -.media-right, -.media > .pull-right { - padding-right: 10px; - padding-left: initial; -} -.media-left, -.media > .pull-left { - padding-left: 10px; - padding-right: initial; -} -.media-list { - padding-right: 0; - padding-left: initial; - list-style: none; -} -.list-group { - padding-right: 0; - padding-left: initial; -} -.panel > .table:first-child > thead:first-child > tr:first-child td:first-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:first-child, -.panel > .table:first-child > tbody:first-child > tr:first-child td:first-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:first-child, -.panel > .table:first-child > thead:first-child > tr:first-child th:first-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:first-child, -.panel > .table:first-child > tbody:first-child > tr:first-child th:first-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:first-child { - border-top-right-radius: 3px; - border-top-left-radius: 0; -} -.panel > .table:first-child > thead:first-child > tr:first-child td:last-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child td:last-child, -.panel > .table:first-child > tbody:first-child > tr:first-child td:last-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child td:last-child, -.panel > .table:first-child > thead:first-child > tr:first-child th:last-child, -.panel > .table-responsive:first-child > .table:first-child > thead:first-child > tr:first-child th:last-child, -.panel > .table:first-child > tbody:first-child > tr:first-child th:last-child, -.panel > .table-responsive:first-child > .table:first-child > tbody:first-child > tr:first-child th:last-child { - border-top-left-radius: 3px; - border-top-right-radius: 0; -} -.panel > .table:last-child > tbody:last-child > tr:last-child td:first-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:first-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child td:first-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:first-child, -.panel > .table:last-child > tbody:last-child > tr:last-child th:first-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:first-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child th:first-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:first-child { - border-bottom-left-radius: 3px; - border-top-right-radius: 0; -} -.panel > .table:last-child > tbody:last-child > tr:last-child td:last-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child td:last-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child td:last-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child td:last-child, -.panel > .table:last-child > tbody:last-child > tr:last-child th:last-child, -.panel > .table-responsive:last-child > .table:last-child > tbody:last-child > tr:last-child th:last-child, -.panel > .table:last-child > tfoot:last-child > tr:last-child th:last-child, -.panel > .table-responsive:last-child > .table:last-child > tfoot:last-child > tr:last-child th:last-child { - border-bottom-right-radius: 3px; - border-top-left-radius: 0; -} -.panel > .table-bordered > thead > tr > th:first-child, -.panel > .table-responsive > .table-bordered > thead > tr > th:first-child, -.panel > .table-bordered > tbody > tr > th:first-child, -.panel > .table-responsive > .table-bordered > tbody > tr > th:first-child, -.panel > .table-bordered > tfoot > tr > th:first-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > th:first-child, -.panel > .table-bordered > thead > tr > td:first-child, -.panel > .table-responsive > .table-bordered > thead > tr > td:first-child, -.panel > .table-bordered > tbody > tr > td:first-child, -.panel > .table-responsive > .table-bordered > tbody > tr > td:first-child, -.panel > .table-bordered > tfoot > tr > td:first-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > td:first-child { - border-right: 0; - border-left: none; -} -.panel > .table-bordered > thead > tr > th:last-child, -.panel > .table-responsive > .table-bordered > thead > tr > th:last-child, -.panel > .table-bordered > tbody > tr > th:last-child, -.panel > .table-responsive > .table-bordered > tbody > tr > th:last-child, -.panel > .table-bordered > tfoot > tr > th:last-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > th:last-child, -.panel > .table-bordered > thead > tr > td:last-child, -.panel > .table-responsive > .table-bordered > thead > tr > td:last-child, -.panel > .table-bordered > tbody > tr > td:last-child, -.panel > .table-responsive > .table-bordered > tbody > tr > td:last-child, -.panel > .table-bordered > tfoot > tr > td:last-child, -.panel > .table-responsive > .table-bordered > tfoot > tr > td:last-child { - border-right: none; - border-left: 0; -} -.embed-responsive .embed-responsive-item, -.embed-responsive iframe, -.embed-responsive embed, -.embed-responsive object { - right: 0; - left: auto; -} -.close { - float: left; -} -.modal-footer { - text-align: left; -} -.modal-footer.flip { - text-align: right; -} -.modal-footer .btn + .btn { - margin-left: auto; - margin-right: 5px; -} -.modal-footer .btn-group .btn + .btn { - margin-right: -1px; - margin-left: auto; -} -.modal-footer .btn-block + .btn-block { - margin-right: 0; - margin-left: auto; -} -.popover { - left: auto; - text-align: right; -} -.popover.top > .arrow { - right: 50%; - left: auto; - margin-right: -11px; - margin-left: auto; -} -.popover.top > .arrow:after { - margin-right: -10px; - margin-left: auto; -} -.popover.bottom > .arrow { - right: 50%; - left: auto; - margin-right: -11px; - margin-left: auto; -} -.popover.bottom > .arrow:after { - margin-right: -10px; - margin-left: auto; -} -.carousel-control { - right: 0; - bottom: 0; -} -.carousel-control.left { - right: auto; - left: 0; - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.5) 0%), color-stop(rgba(0, 0, 0, 0.0001) 100%)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5) 0%, rgba(0, 0, 0, 0.0001) 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#80000000', endColorstr='#00000000', GradientType=1); -} -.carousel-control.right { - left: auto; - right: 0; - background-image: -webkit-linear-gradient(left, color-stop(rgba(0, 0, 0, 0.0001) 0%), color-stop(rgba(0, 0, 0, 0.5) 100%)); - background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); - background-image: linear-gradient(to right, rgba(0, 0, 0, 0.0001) 0%, rgba(0, 0, 0, 0.5) 100%); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#80000000', GradientType=1); -} -.carousel-control .icon-prev, -.carousel-control .glyphicon-chevron-left { - left: 50%; - right: auto; - margin-right: -10px; -} -.carousel-control .icon-next, -.carousel-control .glyphicon-chevron-right { - right: 50%; - left: auto; - margin-left: -10px; -} -.carousel-indicators { - right: 50%; - left: 0; - margin-right: -30%; - margin-left: 0; - padding-left: 0; -} -@media screen and (min-width: 768px) { - .carousel-control .glyphicon-chevron-left, - .carousel-control .icon-prev { - margin-left: 0; - margin-right: -15px; - } - .carousel-control .glyphicon-chevron-right, - .carousel-control .icon-next { - margin-left: 0; - margin-right: -15px; - } - .carousel-caption { - left: 20%; - right: 20%; - padding-bottom: 30px; - } -} -.pull-right.flip { - float: left !important; -} -.pull-left.flip { - float: right !important; -} -/*# sourceMappingURL=bootstrap-rtl.css.map */ \ No newline at end of file diff --git a/frappe/public/css/desk-rtl.css b/frappe/public/css/desk-rtl.css deleted file mode 100644 index a38f6864ff..0000000000 --- a/frappe/public/css/desk-rtl.css +++ /dev/null @@ -1,118 +0,0 @@ -.navbar .navbar-search-icon{ - right: auto; - left: 24px; -} -.navbar > .container > .navbar-header{ - float: right !important; -} -body[data-sidebar="0"] .navbar-home { - margin-left: auto !important; - margin-right: 15px !important; -} -.navbar-desk ~ ul > li { - float: right !important; -} -body.no-breadcrumbs .navbar .navbar-home:before { - margin-right: auto; - margin-left: 10px !important; - -ms-transform:rotate(180deg); /* Internet Explorer 9 */ - -webkit-transform:rotate(180deg); /* Chrome, Safari, Opera */ - transform:rotate(180deg); /* Standard syntax */ -} -.layout-side-section .overlay-sidebar { - left: auto !important; - right: 0 !important; -} -.layout-side-section .overlay-sidebar.opened { - transform:translateX(0) !important; -} -.navbar-right { - float: left !important; -} -#navbar-breadcrumbs > li > a:before { - margin-right: auto; - margin-left: 10px; - top: 6px; - -ms-transform:rotate(180deg); /* Internet Explorer 9 */ - -webkit-transform:rotate(180deg); /* Chrome, Safari, Opera */ - transform:rotate(180deg); /* Standard syntax */ -} -.case-wrapper { - float: right; -} -.link-btn { - right: auto; - left: 4px; - transform:rotate(180deg); /* Rotate icon*/ -} -.sidebar-menu .badge { - right: auto; - left: 0px; -} -.indicator::before { - margin: 0 0 0 4px; -} -.pull-left { - float: right !important; -} -.grid-row > .row .col:last-child { - margin-right: auto; - margin-left: -10px; -} -.text-right { - text-align: left; -} -.list-row-head .octicon-heart { - margin-right: auto; - margin-left: 13px; -} -.list-id { - margin-left: 7px !important; -} -.avatar-small .avatar-sm { - margin-left: 5px; - margin-right: auto; -} -.list-row-right .list-row-modified { - margin-right: auto; - margin-left: 9px; -} -.list-comment-count { - text-align: right; -} -ul.tree-children { - padding-right: 20px; - padding-left: inherit !important; -} -.balance-area { - float: left !important; -} -.tree.opened::before, .tree-node.opened::before, .tree:last-child::after, .tree-node:last-child::after { - left: inherit !important; - right: 8px; -} -.tree.opened > .tree-children > .tree-node > .tree-link::before, .tree-node.opened > .tree-children > .tree-node > .tree-link::before { - left: inherit !important; - right: -11px; -} -.tree:last-child::after, .tree-node:last-child::after { - right: -13px !important; -} -.tree.opened::before { - left: auto !important; - right: 23px; -} -.results { - direction: ltr; -} -.data-table { - direction: ltr; -} -.section-header { - direction: ltr; -} - -.ql-editor { - direction: rtl; - text-align: right; -} \ No newline at end of file diff --git a/frappe/public/css/report-rtl.css b/frappe/public/css/report-rtl.css deleted file mode 100644 index 03e986c56b..0000000000 --- a/frappe/public/css/report-rtl.css +++ /dev/null @@ -1,15 +0,0 @@ -.grid-report { - direction: ltr; -} - -.page-form .awesomplete > ul { - left: auto; -} - -.chart_area{ - direction: ltr; -} - -.grid-report .show-zero{ - direction: rtl; -} diff --git a/frappe/public/scss/frappe-rtl.bundle.scss b/frappe/public/scss/frappe-rtl.bundle.scss deleted file mode 100644 index bc618270a8..0000000000 --- a/frappe/public/scss/frappe-rtl.bundle.scss +++ /dev/null @@ -1,3 +0,0 @@ -@import "frappe/public/css/bootstrap-rtl.css"; -@import "frappe/public/css/desk-rtl.css"; -@import "frappe/public/css/report-rtl.css"; From 7e6b00fd3c2aa76c1c3c98664ec1e68b95fb6bd9 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 27 Jun 2021 08:54:57 +0530 Subject: [PATCH 0278/1519] refactor: Remove unused build.json --- frappe/public/build.json | 299 --------------------------------------- 1 file changed, 299 deletions(-) delete mode 100755 frappe/public/build.json diff --git a/frappe/public/build.json b/frappe/public/build.json deleted file mode 100755 index 942871ee9b..0000000000 --- a/frappe/public/build.json +++ /dev/null @@ -1,299 +0,0 @@ -{ - "css/frappe-web-b4.css": "public/scss/website.scss", - "css/frappe-chat-web.css": [ - "public/css/font-awesome.css", - "public/css/octicons/octicons.css", - "public/less/chat.less" - ], - "concat:js/moment-bundle.min.js": [ - "node_modules/moment/min/moment-with-locales.min.js", - "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js" - ], - "js/chat.js": "public/js/frappe/chat.js", - "js/frappe-recorder.min.js": "public/js/frappe/recorder/recorder.js", - "js/checkout.min.js": "public/js/integrations/razorpay.js", - "js/frappe-web.min.js": [ - "public/js/frappe/class.js", - "public/js/frappe/polyfill.js", - "public/js/lib/md5.min.js", - "public/js/frappe/provide.js", - "public/js/frappe/format.js", - "public/js/frappe/utils/number_format.js", - "public/js/frappe/utils/utils.js", - "public/js/frappe/utils/common.js", - "public/js/frappe/ui/messages.js", - "public/js/frappe/translate.js", - "public/js/frappe/utils/pretty_date.js", - "public/js/frappe/microtemplate.js", - "public/js/frappe/query_string.js", - - "public/js/frappe/upload.js", - - "public/js/frappe/model/meta.js", - "public/js/frappe/model/model.js", - "public/js/frappe/model/perm.js", - - "website/js/website.js", - "public/js/frappe/socketio_client.js" - ], - "js/bootstrap-4-web.min.js": "website/js/bootstrap-4.js", - "js/control.min.js": [ - "node_modules/air-datepicker/dist/js/datepicker.min.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.cs.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.da.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.de.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.en.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.es.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.fi.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.fr.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.hu.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.nl.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pl.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pt-BR.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.pt.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.ro.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.sk.js", - "node_modules/air-datepicker/dist/js/i18n/datepicker.zh.js", - "public/js/frappe/ui/capture.js", - "public/js/frappe/form/controls/control.js" - ], - "js/dialog.min.js": [ - "public/js/frappe/dom.js", - "public/js/frappe/form/formatters.js", - "public/js/frappe/form/layout.js", - "public/js/frappe/ui/field_group.js", - "public/js/frappe/form/link_selector.js", - "public/js/frappe/form/multi_select_dialog.js", - "public/js/frappe/ui/dialog.js" - ], - "css/desk.min.css": [ - "public/js/lib/leaflet/leaflet.css", - "public/js/lib/leaflet/leaflet.draw.css", - "public/js/lib/leaflet/L.Control.Locate.css", - "public/js/lib/leaflet/easy-button.css", - "public/css/font-awesome.css", - "public/css/octicons/octicons.css", - "public/less/desk.less", - "public/less/module.less", - "public/less/mobile.less", - "public/less/controls.less", - "public/less/chat.less", - "public/css/fonts/inter/inter.css", - "node_modules/frappe-charts/dist/frappe-charts.min.css", - "node_modules/plyr/dist/plyr.css", - "public/scss/desk.scss" - ], - "css/frappe-rtl.css": [ - "public/css/bootstrap-rtl.css", - "public/css/desk-rtl.css", - "public/css/report-rtl.css" - ], - "css/printview.css": [ - "public/css/bootstrap.css", - "public/scss/print.scss" - ], - "concat:js/libs.min.js": [ - "public/js/lib/Sortable.min.js", - "public/js/lib/jquery/jquery.hotkeys.js", - "node_modules/bootstrap/dist/js/bootstrap.bundle.min.js", - "node_modules/vue/dist/vue.min.js", - "node_modules/moment/min/moment-with-locales.min.js", - "node_modules/moment-timezone/builds/moment-timezone-with-data.min.js", - "node_modules/socket.io-client/dist/socket.io.slim.js", - "node_modules/localforage/dist/localforage.min.js", - "public/js/lib/jSignature.min.js", - "public/js/lib/leaflet/leaflet.js", - "public/js/lib/leaflet/leaflet.draw.js", - "public/js/lib/leaflet/L.Control.Locate.js", - "public/js/lib/leaflet/easy-button.js" - ], - "js/desk.min.js": [ - "public/js/frappe/translate.js", - "public/js/frappe/class.js", - "public/js/frappe/polyfill.js", - "public/js/frappe/provide.js", - "public/js/frappe/assets.js", - "public/js/frappe/format.js", - "public/js/frappe/form/formatters.js", - "public/js/frappe/dom.js", - "public/js/frappe/ui/messages.js", - "public/js/frappe/ui/keyboard.js", - "public/js/frappe/ui/colors.js", - "public/js/frappe/ui/sidebar.js", - "public/js/frappe/ui/link_preview.js", - - "public/js/frappe/request.js", - "public/js/frappe/socketio_client.js", - "public/js/frappe/utils/utils.js", - "public/js/frappe/event_emitter.js", - "public/js/frappe/router.js", - "public/js/frappe/router_history.js", - "public/js/frappe/defaults.js", - "public/js/frappe/roles_editor.js", - "public/js/frappe/module_editor.js", - "public/js/frappe/microtemplate.js", - - "public/js/frappe/ui/page.html", - "public/js/frappe/ui/page.js", - "public/js/frappe/ui/slides.js", - "public/js/frappe/ui/onboarding_dialog.js", - "public/js/frappe/ui/find.js", - "public/js/frappe/ui/iconbar.js", - "public/js/frappe/form/layout.js", - "public/js/frappe/ui/field_group.js", - "public/js/frappe/form/link_selector.js", - "public/js/frappe/form/multi_select_dialog.js", - "public/js/frappe/ui/dialog.js", - "public/js/frappe/ui/capture.js", - "public/js/frappe/ui/app_icon.js", - "public/js/frappe/ui/theme_switcher.js", - - "public/js/frappe/model/model.js", - "public/js/frappe/db.js", - "public/js/frappe/model/meta.js", - "public/js/frappe/model/sync.js", - "public/js/frappe/model/create_new.js", - "public/js/frappe/model/perm.js", - "public/js/frappe/model/workflow.js", - "public/js/frappe/model/user_settings.js", - - "public/js/lib/md5.min.js", - "public/js/frappe/utils/user.js", - "public/js/frappe/utils/common.js", - "public/js/frappe/utils/urllib.js", - "public/js/frappe/utils/pretty_date.js", - "public/js/frappe/utils/tools.js", - "public/js/frappe/utils/datetime.js", - "public/js/frappe/utils/number_format.js", - "public/js/frappe/utils/help.js", - "public/js/frappe/utils/help_links.js", - "public/js/frappe/utils/address_and_contact.js", - "public/js/frappe/utils/preview_email.js", - "public/js/frappe/utils/file_manager.js", - - "public/js/frappe/upload.js", - "public/js/frappe/ui/tree.js", - - "public/js/frappe/views/container.js", - "public/js/frappe/views/breadcrumbs.js", - "public/js/frappe/views/factory.js", - "public/js/frappe/views/pageview.js", - - "public/js/frappe/ui/toolbar/awesome_bar.js", - "public/js/frappe/ui/toolbar/energy_points_notifications.js", - "public/js/frappe/ui/notifications/notifications.js", - "public/js/frappe/ui/toolbar/search.js", - "public/js/frappe/ui/toolbar/tag_utils.js", - "public/js/frappe/ui/toolbar/search.html", - "public/js/frappe/ui/toolbar/search_utils.js", - "public/js/frappe/ui/toolbar/about.js", - "public/js/frappe/ui/toolbar/navbar.html", - "public/js/frappe/ui/toolbar/toolbar.js", - "public/js/frappe/ui/toolbar/notifications.js", - "public/js/frappe/views/communication.js", - "public/js/frappe/views/translation_manager.js", - "public/js/frappe/views/workspace/workspace.js", - - "public/js/frappe/widgets/widget_group.js", - - "public/js/frappe/ui/sort_selector.html", - "public/js/frappe/ui/sort_selector.js", - - "public/js/frappe/change_log.html", - "public/js/frappe/ui/workspace_loading_skeleton.html", - "public/js/frappe/desk.js", - "public/js/frappe/query_string.js", - - "public/js/frappe/ui/comment.js", - - "public/js/frappe/chat.js", - "public/js/frappe/utils/energy_point_utils.js", - "public/js/frappe/utils/dashboard_utils.js", - "public/js/frappe/ui/chart.js", - "public/js/frappe/ui/datatable.js", - "public/js/frappe/ui/driver.js", - "public/js/frappe/ui/plyr.js", - "public/js/frappe/barcode_scanner/index.js" - ], - "js/form.min.js": [ - "public/js/frappe/form/templates/**.html", - "public/js/frappe/form/controls/control.js", - "public/js/frappe/views/formview.js", - "public/js/frappe/form/form.js", - "public/js/frappe/meta_tag.js" - ], - "js/list.min.js": [ - "public/js/frappe/ui/listing.html", - - "public/js/frappe/model/indicator.js", - "public/js/frappe/ui/filters/filter.js", - "public/js/frappe/ui/filters/filter_list.js", - "public/js/frappe/ui/filters/field_select.js", - "public/js/frappe/ui/filters/edit_filter.html", - "public/js/frappe/ui/tags.js", - "public/js/frappe/ui/tag_editor.js", - "public/js/frappe/ui/like.js", - "public/js/frappe/ui/liked_by.html", - "public/html/print_template.html", - - "public/js/frappe/list/base_list.js", - "public/js/frappe/list/list_view.js", - "public/js/frappe/list/list_factory.js", - - "public/js/frappe/list/list_view_select.js", - "public/js/frappe/list/list_sidebar.js", - "public/js/frappe/list/list_sidebar.html", - "public/js/frappe/list/list_sidebar_stat.html", - "public/js/frappe/list/list_sidebar_group_by.js", - "public/js/frappe/list/list_view_permission_restrictions.html", - - "public/js/frappe/views/gantt/gantt_view.js", - "public/js/frappe/views/calendar/calendar.js", - "public/js/frappe/views/dashboard/dashboard_view.js", - "public/js/frappe/views/image/image_view.js", - "public/js/frappe/views/map/map_view.js", - "public/js/frappe/views/kanban/kanban_view.js", - "public/js/frappe/views/inbox/inbox_view.js", - "public/js/frappe/views/file/file_view.js", - - "public/js/frappe/views/treeview.js", - "public/js/frappe/views/interaction.js", - - "public/js/frappe/views/image/image_view_item_row.html", - "public/js/frappe/views/image/photoswipe_dom.html", - - "public/js/frappe/views/kanban/kanban_board.html", - "public/js/frappe/views/kanban/kanban_column.html", - "public/js/frappe/views/kanban/kanban_card.html" - ], - "css/report.min.css": [ - "node_modules/frappe-datatable/dist/frappe-datatable.css", - "public/css/tree_grid.css" - ], - "js/report.min.js": [ - "public/js/lib/clusterize.min.js", - "public/js/frappe/views/reports/report_factory.js", - "public/js/frappe/views/reports/report_view.js", - "public/js/frappe/views/reports/query_report.js", - "public/js/frappe/views/reports/print_grid.html", - "public/js/frappe/views/reports/print_tree.html", - "public/js/frappe/ui/group_by/group_by.html", - "public/js/frappe/ui/group_by/group_by.js", - "public/js/frappe/views/reports/report_utils.js" - ], - "js/web_form.min.js": [ - "public/js/frappe/utils/datetime.js", - "public/js/frappe/web_form/webform_script.js" - ], - "css/web_form.css": [ - "website/css/web_form.css", - "public/css/octicons/octicons.css", - "public/scss/controls.scss", - "node_modules/frappe-datatable/dist/frappe-datatable.css" - ], - "css/email.css": "public/scss/email.scss", - "js/barcode_scanner.min.js": "public/js/frappe/barcode_scanner/quagga.js", - "js/user_profile_controller.min.js": "desk/page/user_profile/user_profile_controller.js", - "css/login.css": "public/scss/login.scss", - "js/data_import_tools.min.js": "public/js/frappe/data_import/index.js" -} From 9c91cc0e5a51cbefb52f865fba8b1021f3a33795 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 27 Jun 2021 09:05:48 +0530 Subject: [PATCH 0279/1519] fix: Editor link popover style - "overflow: hidden;" set in ql-container used to cutoff and hide some parts of link popover of ql editor. --- frappe/public/scss/common/quill.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/common/quill.scss b/frappe/public/scss/common/quill.scss index 12706d6b7f..a7a690543b 100644 --- a/frappe/public/scss/common/quill.scss +++ b/frappe/public/scss/common/quill.scss @@ -35,13 +35,14 @@ .ql-container.ql-snow { border-bottom-left-radius: var(--border-radius); border-bottom-right-radius: var(--border-radius); - overflow: hidden; } .ql-snow { .ql-editor { min-height: 400px; max-height: 600px; + border-bottom-left-radius: var(--border-radius); + border-bottom-right-radius: var(--border-radius); } .ql-stroke { stroke: var(--icon-stroke); From 894e1ec7d06a7739998e542889cfd7c50b1b6317 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 27 Jun 2021 10:39:28 +0530 Subject: [PATCH 0280/1519] fix: Datepicker's dark mode style --- frappe/public/scss/common/datepicker.scss | 27 +++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/frappe/public/scss/common/datepicker.scss b/frappe/public/scss/common/datepicker.scss index 93bdfcc03d..b21eb58caf 100644 --- a/frappe/public/scss/common/datepicker.scss +++ b/frappe/public/scss/common/datepicker.scss @@ -15,6 +15,10 @@ &--time-current-hours, &--time-current-minutes, &--time-current-seconds { font-family: inherit; + &:after { + color: var(--text-color); + background-color: var(--fg-hover-color); + } } &--day-name { @@ -47,10 +51,13 @@ background: fade(#0089FF, 10%); } + &.-focus- { + background-color: var(--fg-hover-color); + } + &.-selected-.-focus- { background: fade(#0089FF, 90%); } - } &--time, &--buttons { @@ -67,8 +74,20 @@ &--time-row:first-child { margin: 0; } + + &--pointer { + background: var(--fg-color); + border-top-right-radius: 2px; + border: 1px var(--border-color); + border-style: solid solid hidden hidden; + } + + &--button { + color: var(--brand-color); + &:hover { + color: var(--text-color); + background-color: var(--fg-hover-color); + } + } } -.datepicker--button { - color: var(--brand-color); -} From 1f5bcd42ab81fd2b2f2da8c79edb139b4ce86478 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Mon, 28 Jun 2021 11:21:52 +0530 Subject: [PATCH 0281/1519] fix: incorrect depends on evalutation with parent variables --- frappe/public/js/frappe/form/layout.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 282655b589..045e5dc1b3 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -543,7 +543,7 @@ frappe.ui.form.Layout = class Layout { } else if (expression.substr(0, 5)=='eval:') { try { - out = frappe.utils.eval(expression.substr(5), { doc }); + out = frappe.utils.eval(expression.substr(5), { doc, parent }); if (parent && parent.istable && expression.includes('is_submittable')) { out = true; } From 30f92070910e983238a7661c133f1891d4413cf4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 28 Jun 2021 12:03:00 +0530 Subject: [PATCH 0282/1519] feat: Select css-rtl folder if language is rtl --- frappe/public/js/frappe/assets.js | 8 ++++++-- frappe/utils/jinja_globals.py | 14 ++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js index 3fca8640f3..1f2659992f 100644 --- a/frappe/public/js/frappe/assets.js +++ b/frappe/public/js/frappe/assets.js @@ -168,9 +168,13 @@ frappe.assets = { } }, - bundled_asset(path) { + bundled_asset(path, is_rtl=null) { if (!path.startsWith('/assets') && path.includes('.bundle.')) { - return frappe.boot.assets_json[path] || path; + path = frappe.boot.assets_json[path] || path; + if (path.endsWith('.css') && is_rtl) { + path = path.replace('/css/', '/css-rtl/'); + } + return path; } return path; } diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py index 30a0e46232..dd5ade727b 100644 --- a/frappe/utils/jinja_globals.py +++ b/frappe/utils/jinja_globals.py @@ -75,24 +75,26 @@ def include_script(path): def include_style(path, rtl=None): path = bundled_asset(path) - if rtl is None: - rtl = is_rtl() - if rtl: + if is_rtl(rtl): path = path.replace('/css/', '/css-rtl/') return f'' -def bundled_asset(path): +def bundled_asset(path, rtl=None): from frappe.utils import get_assets_json from frappe.website.utils import abs_url if ".bundle." in path and not path.startswith("/assets"): bundled_assets = get_assets_json() path = bundled_assets.get(path) or path + if path.endswith('.css') and is_rtl(rtl): + path = path.replace('/css/', '/css-rtl/') return abs_url(path) -def is_rtl(): +def is_rtl(rtl=None): from frappe import local - return local.lang in ["ar", "he", "fa", "ps"] \ No newline at end of file + if rtl is None: + return local.lang in ["ar", "he", "fa", "ps"] + return rtl \ No newline at end of file From 6960a192082ecdaff0d8b33ec8240c5844c8f89b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 28 Jun 2021 12:03:31 +0530 Subject: [PATCH 0283/1519] fix: RTL for print views --- frappe/printing/page/print/print.js | 11 +++-------- frappe/public/html/print_template.html | 2 +- frappe/public/js/frappe/views/reports/query_report.js | 4 +++- frappe/www/printview.html | 2 +- frappe/www/printview.py | 4 +++- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js index 233bbe0ce7..fc59065c64 100644 --- a/frappe/printing/page/print/print.js +++ b/frappe/printing/page/print/print.js @@ -409,19 +409,14 @@ 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'); + let print_css = frappe.assets.bundled_asset('print.bundle.css', frappe.utils.is_rtl(this.lang_code)); + this.$print_format_body.find('html').attr('dir', frappe.utils.is_rtl(this.lang_code) ? 'rtl': 'ltr'); + this.$print_format_body.find('html').attr('lang', this.lang_code); 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( - `` - ); - } - this.$print_format_body.find('body').html( `
    ${out.html}
    ` ); diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html index 721bec7fa7..39cc6b4274 100644 --- a/frappe/public/html/print_template.html +++ b/frappe/public/html/print_template.html @@ -1,5 +1,5 @@ - + diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 208d5b2f67..a4b3564e37 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -1264,7 +1264,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { print_css: print_css, print_settings: print_settings, landscape: landscape, - columns: columns + columns: columns, + lang: frappe.boot.lang, + layout_direction: frappe.utils.is_rtl() ? "rtl" : "ltr" }); frappe.render_pdf(html, print_settings); diff --git a/frappe/www/printview.html b/frappe/www/printview.html index 05e85730dd..3f8d4201fb 100644 --- a/frappe/www/printview.html +++ b/frappe/www/printview.html @@ -1,5 +1,5 @@ - + diff --git a/frappe/www/printview.py b/frappe/www/printview.py index 226d5b048a..cdf47790eb 100644 --- a/frappe/www/printview.py +++ b/frappe/www/printview.py @@ -7,6 +7,7 @@ from frappe import _ from frappe.modules import get_doc_path from frappe.core.doctype.access_log.access_log import make_access_log from frappe.utils import cint, sanitize_html, strip_html +from frappe.utils.jinja_globals import is_rtl no_cache = 1 @@ -44,7 +45,8 @@ def get_context(context): "css": get_print_style(frappe.form_dict.style, print_format), "comment": frappe.session.user, "title": doc.get(meta.title_field) if meta.title_field else doc.name, - "has_rtl": True if frappe.local.lang in ["ar", "he", "fa", "ps"] else False + "lang": frappe.local.lang, + "layout_direction": "rtl" if is_rtl() else "ltr" } def get_print_format_doc(print_format_name, meta): From 31d8436979e49119011fa7fe891f4689a586e267 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 28 Jun 2021 12:04:57 +0530 Subject: [PATCH 0284/1519] refactor: Rename dir to layout_direction - For readability --- frappe/www/app.html | 2 +- frappe/www/app.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/www/app.html b/frappe/www/app.html index 8704ed2671..68a6dc8e86 100644 --- a/frappe/www/app.html +++ b/frappe/www/app.html @@ -1,5 +1,5 @@ - + diff --git a/frappe/www/app.py b/frappe/www/app.py index 55992b5a55..acf6dde000 100644 --- a/frappe/www/app.py +++ b/frappe/www/app.py @@ -41,7 +41,7 @@ def get_context(context): "build_version": frappe.utils.get_build_version(), "include_js": hooks["app_include_js"], "include_css": hooks["app_include_css"], - "dir": "rtl" if is_rtl() else "ltr", + "layout_direction": "rtl" if is_rtl() else "ltr", "lang": frappe.local.lang, "sounds": hooks["sounds"], "boot": boot if context.get("for_mobile") else boot_json, From d9962370dc6cd6da78b9a0e630ade67939dcd73e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 28 Jun 2021 12:06:26 +0530 Subject: [PATCH 0285/1519] fix: Add language to print_template --- frappe/public/html/print_template.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/html/print_template.html b/frappe/public/html/print_template.html index 39cc6b4274..f63a20377f 100644 --- a/frappe/public/html/print_template.html +++ b/frappe/public/html/print_template.html @@ -1,5 +1,5 @@ - + From 44536fac4976ae81dc98b413f8ba958e035bc627 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 28 Jun 2021 15:53:34 +0530 Subject: [PATCH 0286/1519] fix: Prioritse TemplatePage over ListPage --- frappe/website/path_resolver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/path_resolver.py b/frappe/website/path_resolver.py index 5e1a99be91..0ed097416e 100644 --- a/frappe/website/path_resolver.py +++ b/frappe/website/path_resolver.py @@ -37,7 +37,7 @@ class PathResolver(): endpoint = resolve_path(self.path) custom_renderers = self.get_custom_page_renderers() - renderers = custom_renderers + [StaticPage, WebFormPage, ListPage, DocumentPage, TemplatePage, PrintPage, NotFoundPage] + renderers = custom_renderers + [StaticPage, WebFormPage, DocumentPage, TemplatePage, ListPage, PrintPage, NotFoundPage] for renderer in renderers: renderer_instance = renderer(endpoint, 200) From 61deecbd7c1267d170206969b60e326e217ef6fa Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 28 Jun 2021 18:30:55 +0530 Subject: [PATCH 0287/1519] chore: fix tests --- frappe/tests/test_formatter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 636f3d970d..a837573dbc 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -37,6 +37,7 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. + print(doc.currency) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' From 4b0c67f57cd68ec591ecf100eb2ec7de77b025ba Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 28 Jun 2021 18:43:03 +0530 Subject: [PATCH 0288/1519] chore: debug tests --- frappe/tests/test_formatter.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index a837573dbc..5ebfb3ee6d 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -37,6 +37,7 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. + print("doc.currency") print(doc.currency) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') From 64e37d6ab9ba7b9d3b9804d34b65a280b0b2a74b Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Tue, 29 Jun 2021 10:16:32 +0530 Subject: [PATCH 0289/1519] chore: debug tests --- frappe/tests/test_formatter.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5ebfb3ee6d..cd7b8add9d 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -39,6 +39,9 @@ class TestFormatter(unittest.TestCase): # if currency field is not passed then default currency should be used. print("doc.currency") print(doc.currency) + print("frappe.db.get_default('currency')") + print(frappe.db.get_default("currency")) + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' From ae9aad4d760289549dcd47fb0faa7a5f4cc134c6 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 29 Jun 2021 13:30:20 +0530 Subject: [PATCH 0290/1519] fix: form tour loading after route change --- frappe/desk/doctype/form_tour/form_tour.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/form_tour/form_tour.js b/frappe/desk/doctype/form_tour/form_tour.js index efb853cfa5..8d70dcd3dc 100644 --- a/frappe/desk/doctype/form_tour/form_tour.js +++ b/frappe/desk/doctype/form_tour/form_tour.js @@ -15,14 +15,14 @@ frappe.ui.form.on('Form Tour', { frm.add_custom_button(__('Show Tour'), async () => { const issingle = await check_if_single(frm.doc.reference_doctype); + let route_changed = null; if (issingle) { - frappe.set_route('Form', frm.doc.reference_doctype); + route_changed = frappe.set_route('Form', frm.doc.reference_doctype); } else { - const new_name = 'new-' + frappe.scrub(frm.doc.reference_doctype) + '-1'; - frappe.set_route('Form', frm.doc.reference_doctype, new_name); + route_changed = frappe.set_route('Form', frm.doc.reference_doctype, 'new'); } - frappe.utils.sleep(500).then(() => { + route_changed.then(() => { const tour_name = frm.doc.name; cur_frm.tour .init({ tour_name }) From 3acc0a24465cd86be58e7718a0da307e8581fb59 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 29 Jun 2021 13:30:51 +0530 Subject: [PATCH 0291/1519] feat: get standard form tour for onboarding step --- frappe/public/js/frappe/form/form_tour.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index 7f7ec9ce4f..5318973a66 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -37,7 +37,12 @@ frappe.ui.form.FormTour = class FormTour { if (tour_name) { this.tour = await frappe.db.get_doc('Form Tour', tour_name); } else { - this.tour = { steps: frappe.tour[this.frm.doctype] }; + const doctype_tour_exists = await frappe.db.exists('Form Tour', this.frm.doctype); + if (doctype_tour_exists) { + this.tour = await frappe.db.get_doc('Form Tour', this.frm.doctype) + } else { + this.tour = { steps: frappe.tour[this.frm.doctype] }; + } } if (on_finish) this.on_finish = on_finish; @@ -232,7 +237,7 @@ frappe.ui.form.FormTour = class FormTour { } add_step_to_save() { - const page_id = `#page-${this.frm.doctype}`; + const page_id = `[id="page-${this.frm.doctype}"]`; const $save_btn = `${page_id} .standard-actions .primary-action`; const save_step = { element: $save_btn, From 99594b0fd87d802e5b3b93d2e94b1a0b91153a42 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 29 Jun 2021 16:02:27 +0200 Subject: [PATCH 0292/1519] test: change test cases after interface change --- .../doctype/google_settings/test_google_settings.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/frappe/integrations/doctype/google_settings/test_google_settings.py b/frappe/integrations/doctype/google_settings/test_google_settings.py index b26c52775b..4227e90260 100644 --- a/frappe/integrations/doctype/google_settings/test_google_settings.py +++ b/frappe/integrations/doctype/google_settings/test_google_settings.py @@ -22,11 +22,8 @@ class TestGoogleSettings(unittest.TestCase): frappe.set_user('Guest') frappe.db.set_value('Google Settings', None, 'enable', 1) frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 1) - settings = get_file_picker_settings() - self.assertIn('enabled', settings) - self.assertEqual(False, settings.get('enabled', True)) - self.assertEqual(1, len(settings)) + self.assertRaises(frappe.PermissionError, get_file_picker_settings) frappe.set_user('Adminstrator') @@ -36,9 +33,7 @@ class TestGoogleSettings(unittest.TestCase): frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 0) settings = get_file_picker_settings() - self.assertIn('enabled', settings) - self.assertEqual(False, settings.get('enabled', True)) - self.assertEqual(1, len(settings)) + self.assertEqual(settings, {}) def test_google_disabled(self): """Google Drive Picker should be disabled if Google integration is not enabled.""" @@ -46,9 +41,7 @@ class TestGoogleSettings(unittest.TestCase): frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 1) settings = get_file_picker_settings() - self.assertIn('enabled', settings) - self.assertEqual(False, settings.get('enabled', True)) - self.assertEqual(1, len(settings)) + self.assertEqual(settings, {}) def test_picker_enabled(self): """If picker is enabled, get_file_picker_settings should return the credentials.""" From b02d2715be971cfccf4ebaa51a2bc33821d520c5 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 29 Jun 2021 18:42:15 +0200 Subject: [PATCH 0293/1519] test: remove test_picker_as_guest Guest access was disabled. Testing this would be equivalent to testing frappe.whitelist. --- .../doctype/google_settings/test_google_settings.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/frappe/integrations/doctype/google_settings/test_google_settings.py b/frappe/integrations/doctype/google_settings/test_google_settings.py index 4227e90260..f21df7ed70 100644 --- a/frappe/integrations/doctype/google_settings/test_google_settings.py +++ b/frappe/integrations/doctype/google_settings/test_google_settings.py @@ -17,16 +17,6 @@ class TestGoogleSettings(unittest.TestCase): settings.api_key = 'test_api_key' settings.save() - def test_picker_as_guest(self): - """Google Drive Picker should be disbled for Guest.""" - frappe.set_user('Guest') - frappe.db.set_value('Google Settings', None, 'enable', 1) - frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 1) - - self.assertRaises(frappe.PermissionError, get_file_picker_settings) - - frappe.set_user('Adminstrator') - def test_picker_disabled(self): """Google Drive Picker should be disabled if it is not enabled in Google Settings.""" frappe.db.set_value('Google Settings', None, 'enable', 1) From d9044815f4034a51d27e4949ffcd153e253cc882 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 29 Jun 2021 18:42:43 +0200 Subject: [PATCH 0294/1519] style: use double quotes --- .../google_settings/test_google_settings.py | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/frappe/integrations/doctype/google_settings/test_google_settings.py b/frappe/integrations/doctype/google_settings/test_google_settings.py index f21df7ed70..32d43a323b 100644 --- a/frappe/integrations/doctype/google_settings/test_google_settings.py +++ b/frappe/integrations/doctype/google_settings/test_google_settings.py @@ -11,35 +11,35 @@ from .google_settings import get_file_picker_settings class TestGoogleSettings(unittest.TestCase): def setUp(self): - settings = frappe.get_single('Google Settings') - settings.client_id = 'test_client_id' - settings.app_id = 'test_app_id' - settings.api_key = 'test_api_key' + settings = frappe.get_single("Google Settings") + settings.client_id = "test_client_id" + settings.app_id = "test_app_id" + settings.api_key = "test_api_key" settings.save() def test_picker_disabled(self): """Google Drive Picker should be disabled if it is not enabled in Google Settings.""" - frappe.db.set_value('Google Settings', None, 'enable', 1) - frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 0) + frappe.db.set_value("Google Settings", None, "enable", 1) + frappe.db.set_value("Google Settings", None, "google_drive_picker_enabled", 0) settings = get_file_picker_settings() self.assertEqual(settings, {}) def test_google_disabled(self): """Google Drive Picker should be disabled if Google integration is not enabled.""" - frappe.db.set_value('Google Settings', None, 'enable', 0) - frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 1) + frappe.db.set_value("Google Settings", None, "enable", 0) + frappe.db.set_value("Google Settings", None, "google_drive_picker_enabled", 1) settings = get_file_picker_settings() self.assertEqual(settings, {}) def test_picker_enabled(self): """If picker is enabled, get_file_picker_settings should return the credentials.""" - frappe.db.set_value('Google Settings', None, 'enable', 1) - frappe.db.set_value('Google Settings', None, 'google_drive_picker_enabled', 1) + frappe.db.set_value("Google Settings", None, "enable", 1) + frappe.db.set_value("Google Settings", None, "google_drive_picker_enabled", 1) settings = get_file_picker_settings() - self.assertEqual(True, settings.get('enabled', False)) - self.assertEqual('test_client_id', settings.get('clientId', '')) - self.assertEqual('test_app_id', settings.get('appId', '')) - self.assertEqual('test_api_key', settings.get('developerKey', '')) + self.assertEqual(True, settings.get("enabled", False)) + self.assertEqual("test_client_id", settings.get("clientId", "")) + self.assertEqual("test_app_id", settings.get("appId", "")) + self.assertEqual("test_api_key", settings.get("developerKey", "")) From 5592bf6b1c210336be13b8281ee71aaa895d0ba8 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 29 Jun 2021 18:43:20 +0200 Subject: [PATCH 0295/1519] feat: remove "All" access from Google Settings --- .../doctype/google_settings/google_settings.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/frappe/integrations/doctype/google_settings/google_settings.json b/frappe/integrations/doctype/google_settings/google_settings.json index 152d191ae3..6f25fa4bf6 100644 --- a/frappe/integrations/doctype/google_settings/google_settings.json +++ b/frappe/integrations/doctype/google_settings/google_settings.json @@ -76,7 +76,7 @@ ], "issingle": 1, "links": [], - "modified": "2021-06-18 16:57:10.502174", + "modified": "2021-06-29 18:26:07.094851", "modified_by": "Administrator", "module": "Integrations", "name": "Google Settings", @@ -91,16 +91,6 @@ "role": "System Manager", "share": 1, "write": 1 - }, - { - "create": 1, - "delete": 1, - "email": 1, - "print": 1, - "read": 1, - "role": "All", - "share": 1, - "write": 1 } ], "quick_entry": 1, From 117a729c8da47a3ca90d73d775f06eb2ccb13671 Mon Sep 17 00:00:00 2001 From: gavin Date: Wed, 30 Jun 2021 10:51:44 +0530 Subject: [PATCH 0296/1519] refactor(minor): login-content template Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/templates/includes/login/login.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frappe/templates/includes/login/login.js b/frappe/templates/includes/login/login.js index 3bcd31e93b..4400578862 100644 --- a/frappe/templates/includes/login/login.js +++ b/frappe/templates/includes/login/login.js @@ -292,15 +292,18 @@ var verify_token = function (event) { var request_otp = function (r) { $('.login-content').empty(); - $('.login-content:visible').append($('
    ').attr({ 'id': 'twofactor_div' }).html( - '
    \ -
    \ - {{ _("Verification") }}\ -
    \ -
    \ - \ - \ -
    ')); + $('.login-content:visible').append( + `
    +
    +
    + {{ _("Verification") }} +
    +
    + + +
    +
    ` + ); // add event handler for submit button verify_token(); } From 36a3504b29db2ef7daaf8f4c331b76d9360a025c Mon Sep 17 00:00:00 2001 From: marination Date: Tue, 29 Jun 2021 18:11:13 +0530 Subject: [PATCH 0297/1519] fix: Premature commit via notification's `send_an_email` --- frappe/core/doctype/communication/email.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index d35c118550..7ffbe6781d 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -85,8 +85,6 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received = if attachments: add_attachments(comm.name, attachments) - frappe.db.commit() - if cint(send_email): if not comm.get_outgoing_email_account(): frappe.throw(msg=OUTGOING_EMAIL_ACCOUNT_MISSING, exc=frappe.OutgoingEmailError) From debc8013057ca0e51a031dbc80aa3d65b21d8fb7 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 30 Jun 2021 14:21:22 +0530 Subject: [PATCH 0298/1519] feat: submit on completion --- frappe/desk/doctype/form_tour/form_tour.json | 10 ++++- frappe/public/js/frappe/form/form_tour.js | 45 ++++++++++++++++++-- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/form_tour/form_tour.json b/frappe/desk/doctype/form_tour/form_tour.json index e4ea528fcc..44f39766b3 100644 --- a/frappe/desk/doctype/form_tour/form_tour.json +++ b/frappe/desk/doctype/form_tour/form_tour.json @@ -11,6 +11,7 @@ "module", "is_standard", "save_on_complete", + "submit_on_complete", "section_break_3", "steps" ], @@ -62,11 +63,18 @@ "label": "Module", "options": "Module Def", "read_only": 1 + }, + { + "default": "0", + "depends_on": "save_on_complete", + "fieldname": "submit_on_complete", + "fieldtype": "Check", + "label": "Submit on Completion" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-06 20:32:54.068774", + "modified": "2021-06-29 15:23:26.893068", "modified_by": "Administrator", "module": "Desk", "name": "Form Tour", diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index 5318973a66..5f4920f415 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -17,8 +17,9 @@ frappe.ui.form.FormTour = class FormTour { prevBtnText: 'Previous', opacity: 0.25, onHighlighted: (step) => { - // if last step is to save, then attach a listener to save button - if (step.options.is_save_step) { + // if last step is to save, or if is submit step + // then attach a listener on highlighted elem to reset the driver + if ((step.options.is_save_step && !this.driver.hasNextStep())|| step.options.is_submit_step) { $(step.options.element).one('click', () => this.driver.reset()); } @@ -74,6 +75,10 @@ frappe.ui.form.FormTour = class FormTour { if (this.tour.save_on_complete) { this.add_step_to_save(); } + + if (this.tour.submit_on_complete) { + this.add_step_to_submit(); + } } is_next_condition_satisfied(step) { @@ -249,9 +254,43 @@ frappe.ui.form.FormTour = class FormTour { description: "", position: "left", doneBtnText: __("Save") + }, + onNext: () => { + this.frm.save(); } }; this.driver_steps.push(save_step); - frappe.ui.form.on(this.frm.doctype, 'after_save', () => this.on_finish && this.on_finish()); + + let after_save = () => this.on_finish && this.on_finish(); + + if (this.tour.submit_on_complete) { + after_save = () => { + this.update_driver_steps(); + this.driver.start(this.driver.steps.length - 1); + } + } + frappe.ui.form.on(this.frm.doctype, 'after_save', after_save); + } + + add_step_to_submit() { + const page_id = `[id="page-${this.frm.doctype}"]`; + const $submit_btn = `${page_id} .standard-actions .primary-action`; + const submit_step = { + element: $submit_btn, + is_submit_step: true, + allowClose: false, + overlayClickNext: false, + popover: { + title: __("Submit"), + description: "", + position: "left", + doneBtnText: __("Submit") + }, + onNext: () => { + this.frm.savesubmit(); + } + }; + this.driver_steps.push(submit_step); + frappe.ui.form.on(this.frm.doctype, 'after_submit', () => this.on_finish && this.on_finish()); } }; \ No newline at end of file From 6bb96419d4a9a24e3f733ffbd0c50ef8ea951af7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 30 Jun 2021 15:29:49 +0530 Subject: [PATCH 0299/1519] fix: Safe checks while setting doctypes_with_web_view cache --- frappe/website/router.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/website/router.py b/frappe/website/router.py index a9e2f68fe5..9809a73e48 100644 --- a/frappe/website/router.py +++ b/frappe/website/router.py @@ -270,7 +270,7 @@ def get_doctypes_with_web_view(): doctypes_with_web_view = frappe.get_all('DocType', fields=['name', 'module'], filters=dict(has_web_view=1)) module_app_map = frappe.local.module_app - doctypes += [d.name for d in doctypes_with_web_view if module_app_map[frappe.scrub(d.module)] in installed_apps] + doctypes += [d.name for d in doctypes_with_web_view if module_app_map.get(frappe.scrub(d.module)) in installed_apps] return doctypes return frappe.cache().get_value('doctypes_with_web_view', _get) From dc514905f22b8be0aa802bf9e0f7ad8ff77dd953 Mon Sep 17 00:00:00 2001 From: gavin Date: Wed, 30 Jun 2021 15:49:14 +0530 Subject: [PATCH 0300/1519] chore: Update CODEOWNERS --- CODEOWNERS | 3 --- 1 file changed, 3 deletions(-) diff --git a/CODEOWNERS b/CODEOWNERS index 92723ab035..2dff157294 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -4,13 +4,10 @@ # the repo. Unless a later match takes precedence, * @frappe/frappe-review-team -website/ @prssanna -web_form/ @prssanna templates/ @surajshetty3416 www/ @surajshetty3416 integrations/ @leela patches/ @surajshetty3416 -dashboard/ @prssanna email/ @leela event_streaming/ @ruchamahabal data_import* @netchampfaris From 3d36b671528141e72a6de413309f2ec42f6d63e2 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 30 Jun 2021 17:36:27 +0530 Subject: [PATCH 0301/1519] fix: Hide "Attach File" in form if max limit reached --- frappe/public/js/frappe/form/sidebar/attachments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js index 4f116df63e..538534e5cf 100644 --- a/frappe/public/js/frappe/form/sidebar/attachments.js +++ b/frappe/public/js/frappe/form/sidebar/attachments.js @@ -11,7 +11,7 @@ frappe.ui.form.Attachments = class Attachments { this.parent.find(".add-attachment-btn").click(function() { me.new_attachment(); }); - this.add_attachment_wrapper = this.parent.find(".add_attachment").parent(); + this.add_attachment_wrapper = this.parent.find(".add-attachment-btn"); this.attachments_label = this.parent.find(".attachments-label"); } max_reached(raise_exception=false) { @@ -39,7 +39,7 @@ frappe.ui.form.Attachments = class Attachments { this.parent.find(".attachment-row").remove(); var max_reached = this.max_reached(); - this.add_attachment_wrapper.toggleClass("hide", !max_reached); + this.add_attachment_wrapper.toggle(!max_reached); // add attachment objects var attachments = this.get_attachments(); From fd51ba7fcc0f50ce0159e41f2636448af5a708d6 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 30 Jun 2021 16:58:54 +0000 Subject: [PATCH 0302/1519] chore(deps): [security] bump socket.io-parser from 3.3.0 to 3.3.2 Bumps [socket.io-parser](https://github.com/socketio/socket.io-parser) from 3.3.0 to 3.3.2. **This update includes a security fix.** - [Release notes](https://github.com/socketio/socket.io-parser/releases) - [Changelog](https://github.com/socketio/socket.io-parser/blob/3.3.2/CHANGELOG.md) - [Commits](https://github.com/socketio/socket.io-parser/compare/3.3.0...3.3.2) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7b1fb981dd..ddb5623e5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1381,12 +1381,12 @@ component-bind@1.0.0: resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E= -component-emitter@1.2.1, component-emitter@^1.2.0: +component-emitter@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY= -component-emitter@~1.3.0: +component-emitter@^1.2.0, component-emitter@~1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== @@ -1713,28 +1713,14 @@ debug@2.6.9: dependencies: ms "2.0.0" -debug@^3.0.1: +debug@^3.0.1, debug@^3.1.0, debug@^3.2.6: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^3.1.0, debug@^3.2.6: - version "3.2.6" - resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" - integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== - dependencies: - ms "^2.1.1" - -debug@^4.1.1, debug@~4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== - dependencies: - ms "^2.1.1" - -debug@^4.2.0, debug@^4.3.1: +debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: version "4.3.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== @@ -1748,6 +1734,13 @@ debug@~3.1.0: dependencies: ms "2.0.0" +debug@~4.1.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" + integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== + dependencies: + ms "^2.1.1" + decamelize@^1.0.0, decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -6425,11 +6418,11 @@ socket.io-client@2.4.0: to-array "0.1.4" socket.io-parser@~3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.0.tgz#2b52a96a509fdf31440ba40fed6094c7d4f1262f" - integrity sha512-hczmV6bDgdaEbVqhAeVMM/jfUfzuEZHsQg6eOmLgJht6G3mPKMxYm75w2+qhAQZ+4X+1+ATZ+QFKeOZD5riHng== + version "3.3.2" + resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6" + integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg== dependencies: - component-emitter "1.2.1" + component-emitter "~1.3.0" debug "~3.1.0" isarray "2.0.1" From d58d2ac77f0ede883df774710c9b5e1d9c790c67 Mon Sep 17 00:00:00 2001 From: Ankush Date: Wed, 30 Jun 2021 23:05:05 +0530 Subject: [PATCH 0303/1519] ci(cypress): use env variable for key (#13616) documentation ref: https://docs.cypress.io/guides/guides/command-line#cypress-run --- .github/workflows/ui-tests.yml | 2 ++ frappe/commands/utils.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ui-tests.yml b/.github/workflows/ui-tests.yml index f2f43f10f8..f342c0709e 100644 --- a/.github/workflows/ui-tests.yml +++ b/.github/workflows/ui-tests.yml @@ -105,3 +105,5 @@ jobs: - name: UI Tests run: cd ~/frappe-bench/ && bench --site test_site run-ui-tests frappe --headless --parallel --ci-build-id $GITHUB_RUN_ID + env: + CYPRESS_RECORD_KEY: 4a48f41c-11b3-425b-aa88-c58048fa69eb diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index c16de497ec..b6e48e3388 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -661,7 +661,7 @@ def run_ui_tests(context, app, headless=False, parallel=True, ci_build_id=None): frappe.commands.popen("yarn add cypress@^6 cypress-file-upload@^5 --no-lockfile") # run for headless mode - run_or_open = 'run --browser firefox --record --key 4a48f41c-11b3-425b-aa88-c58048fa69eb' if headless else 'open' + run_or_open = 'run --browser firefox --record' if headless else 'open' command = '{site_env} {password_env} {cypress} {run_or_open}' formatted_command = command.format(site_env=site_env, password_env=password_env, cypress=cypress_path, run_or_open=run_or_open) From 02e735da8ebe173ca931585ee827c2048e97a7fb Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 1 Jul 2021 22:06:26 +0530 Subject: [PATCH 0304/1519] fix: Do not set base template for resource --- frappe/website/page_renderers/template_page.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 5134313c83..249c998192 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -150,8 +150,7 @@ class TemplatePage(BaseTemplatePage): def set_page_properties(self): self.context.base_template = self.context.base_template \ - or get_base_template(self.path) \ - or 'templates/web.html' + or get_base_template(self.path) self.context.basepath = self.basepath self.context.basename = self.basename self.context.name = self.name From a93bb670308a26cc7265c610300386dd7860232f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 1 Jul 2021 22:08:15 +0530 Subject: [PATCH 0305/1519] test: Add test case to validate raw file load --- frappe/tests/test_website.py | 7 +++++++ frappe/www/_test/assets/css_asset.css | 1 + frappe/www/_test/assets/js_asset.js | 1 + 3 files changed, 9 insertions(+) create mode 100644 frappe/www/_test/assets/css_asset.css create mode 100644 frappe/www/_test/assets/js_asset.js diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 5c19d3935c..7241bbb508 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -244,6 +244,13 @@ class TestWebsite(unittest.TestCase): self.assertIn("", content) self.assertIn("background-color: var(--bg-color);", content) + def test_raw_assets_are_loaded(self): + content = get_response_content('/_test/assets/js_asset.js') + self.assertEqual("console.log('in');", content) + + content = get_response_content('/_test/assets/css_asset.css') + self.assertEqual("""body{color:red}""", content) + def test_breadcrumbs(self): content = get_response_content('/_test/_test_folder/_test_page') self.assertIn('Test TOC', content) diff --git a/frappe/www/_test/assets/css_asset.css b/frappe/www/_test/assets/css_asset.css new file mode 100644 index 0000000000..363a06397a --- /dev/null +++ b/frappe/www/_test/assets/css_asset.css @@ -0,0 +1 @@ +body{color:red} \ No newline at end of file diff --git a/frappe/www/_test/assets/js_asset.js b/frappe/www/_test/assets/js_asset.js new file mode 100644 index 0000000000..b39f5af3dd --- /dev/null +++ b/frappe/www/_test/assets/js_asset.js @@ -0,0 +1 @@ +console.log('in'); \ No newline at end of file From 4363e51c6dd6510d427e5347b477552d88eab9dd Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 1 Jul 2021 22:10:02 +0530 Subject: [PATCH 0306/1519] test: Fix improper tests for website rendering --- frappe/templates/test/_test_base.html | 11 ---------- .../test/_test_base_breadcrumbs.html | 20 +++++++++++++++++++ frappe/tests/test_website.py | 4 ++-- frappe/www/_test/_test_folder/_test_page.html | 1 + frappe/www/_test/_test_folder/_test_page.py | 2 +- frappe/www/_test/_test_folder/index.md | 4 ++-- 6 files changed, 26 insertions(+), 16 deletions(-) create mode 100644 frappe/templates/test/_test_base_breadcrumbs.html diff --git a/frappe/templates/test/_test_base.html b/frappe/templates/test/_test_base.html index 17caf8df1b..1d5019df37 100644 --- a/frappe/templates/test/_test_base.html +++ b/frappe/templates/test/_test_base.html @@ -1,20 +1,9 @@ - {%- block style %} - {% if colocated_css -%} - - {%- endif %} - {%- endblock -%} - {% include "templates/includes/breadcrumbs.html" %}

    This is for testing

    {% block content %}{% endblock %} - {%- block script %} - {% if colocated_js -%} - - {%- endif %} - {%- endblock %} diff --git a/frappe/templates/test/_test_base_breadcrumbs.html b/frappe/templates/test/_test_base_breadcrumbs.html new file mode 100644 index 0000000000..17caf8df1b --- /dev/null +++ b/frappe/templates/test/_test_base_breadcrumbs.html @@ -0,0 +1,20 @@ + + + + {%- block style %} + {% if colocated_css -%} + + {%- endif %} + {%- endblock -%} + + + {% include "templates/includes/breadcrumbs.html" %} +

    This is for testing

    + {% block content %}{% endblock %} + {%- block script %} + {% if colocated_js -%} + + {%- endif %} + {%- endblock %} + + diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index 7241bbb508..ae768d7804 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -253,12 +253,12 @@ class TestWebsite(unittest.TestCase): def test_breadcrumbs(self): content = get_response_content('/_test/_test_folder/_test_page') - self.assertIn('Test TOC', content) + self.assertIn('Test Folder', content) self.assertIn(' Test Page', content) content = get_response_content('/_test/_test_folder/index') self.assertIn(' Test', content) - self.assertIn('Test TOC', content) + self.assertIn('Test Folder', content) def test_get_context_without_context_object(self): content = get_response_content('/_test/_test_no_context') diff --git a/frappe/www/_test/_test_folder/_test_page.html b/frappe/www/_test/_test_folder/_test_page.html index 123d619e38..79bc96c568 100644 --- a/frappe/www/_test/_test_folder/_test_page.html +++ b/frappe/www/_test/_test_folder/_test_page.html @@ -1,3 +1,4 @@ +{% extends base_template_path %} {% block content %} {% include "templates/includes/web_sidebar.html" %}

    Test content

    diff --git a/frappe/www/_test/_test_folder/_test_page.py b/frappe/www/_test/_test_folder/_test_page.py index 1813a06bac..3d4a645f9b 100644 --- a/frappe/www/_test/_test_folder/_test_page.py +++ b/frappe/www/_test/_test_folder/_test_page.py @@ -1,3 +1,3 @@ def get_context(context): - context.base_template_path = 'frappe/templates/test/_test_base.html' + context.base_template_path = 'frappe/templates/test/_test_base_breadcrumbs.html' context.add_breadcrumbs = 1 diff --git a/frappe/www/_test/_test_folder/index.md b/frappe/www/_test/_test_folder/index.md index 1a5a9e7f81..ca8c55e9d5 100644 --- a/frappe/www/_test/_test_folder/index.md +++ b/frappe/www/_test/_test_folder/index.md @@ -1,9 +1,9 @@ --- -title: Test TOC +title: Test Folder add_breadcrumbs: 1 show_sidebar: 1 +base_template: templates/web.html --- - # Index {index} \ No newline at end of file From 35521327897a2fe38ff9bfb1389ff18723a70231 Mon Sep 17 00:00:00 2001 From: leela Date: Fri, 2 Jul 2021 11:25:02 +0530 Subject: [PATCH 0307/1519] fix: remove not needed six import --- frappe/model/document.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/model/document.py b/frappe/model/document.py index 0b2ae5895f..99585bb26c 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -6,7 +6,6 @@ from frappe import _, msgprint, is_whitelisted from frappe.utils import flt, cstr, now, get_datetime_str, file_lock, date_diff from frappe.model.base_document import BaseDocument, get_controller from frappe.model.naming import set_new_name, rename_cancelled_doc -from six import iteritems, string_types from werkzeug.exceptions import NotFound, Forbidden import hashlib, json from frappe.model import optional_fields, table_fields From 82c1c56671032e4528876e091b03d53fd150410f Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Fri, 2 Jul 2021 14:37:09 +0530 Subject: [PATCH 0308/1519] fix: Check for key, not attribute, for dictionary --- frappe/desk/doctype/workspace/workspace.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 0b5babc8d9..5bf0f472e8 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -55,7 +55,7 @@ class Workspace(Document): for link in self.links: link = link.as_dict() if link.type == "Card Break": - if card_links and (not current_card.only_for or current_card.only_for == frappe.get_system_settings('country')): + if card_links and (not current_card['only_for'] or current_card['only_for'] == frappe.get_system_settings('country')): current_card['links'] = card_links cards.append(current_card) From f31d01a2a645ea5c2aebaeeb02cdb97b086ef356 Mon Sep 17 00:00:00 2001 From: leela Date: Fri, 2 Jul 2021 17:43:16 +0530 Subject: [PATCH 0309/1519] Revert "Merge pull request #13244 from prssanna/amended-doc-naming" This reverts commit 58b95662c2f704258f83ad72d4a0c942ae14f778, reversing changes made to c553b7e23a5c70f1c05b08850a419ac23fba7aa7. --- frappe/core/doctype/doctype/doctype.py | 40 +++++--------- frappe/core/doctype/doctype/test_doctype.py | 4 -- frappe/model/document.py | 10 +--- frappe/model/naming.py | 52 ++----------------- frappe/patches.txt | 1 - ...l_name_docfield_to_submittable_doctypes.py | 11 ---- frappe/public/js/frappe/form/form.js | 24 ++++----- frappe/public/js/frappe/router.js | 6 --- frappe/tests/test_naming.py | 34 ------------ 9 files changed, 27 insertions(+), 155 deletions(-) delete mode 100644 frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py index da410b3e0b..3cdc45ea08 100644 --- a/frappe/core/doctype/doctype/doctype.py +++ b/frappe/core/doctype/doctype/doctype.py @@ -70,7 +70,6 @@ class DocType(Document): if not self.istable: validate_permissions(self) - self.make_cancellable() self.make_amendable() self.make_repeatable() self.validate_nestedset() @@ -569,33 +568,18 @@ class DocType(Document): def make_amendable(self): """If is_submittable is set, add amended_from docfields.""" - if self.is_submittable and\ - not frappe.db.get_value('DocField', {'fieldname': 'amended_from', 'parent': self.name}): - - self.append("fields", { - "label": "Amended From", - "fieldtype": "Link", - "fieldname": "amended_from", - "options": self.name, - "read_only": 1, - "print_hide": 1, - "no_copy": 1 - }) - - def make_cancellable(self): - """If is_submittable is set, add original_name docfield.""" - if self.is_submittable and\ - not frappe.db.get_value('DocField', {'fieldname': 'original_name', 'parent': self.name}): - - self.append("fields", { - "label": "Original Name", - "fieldtype": "Text", - "fieldname": "original_name", - "read_only": 1, - "hidden": 1, - "print_hide": 1, - "no_copy": 1 - }) + if self.is_submittable: + if not frappe.db.sql("""select name from tabDocField + where fieldname = 'amended_from' and parent = %s""", self.name): + self.append("fields", { + "label": "Amended From", + "fieldtype": "Link", + "fieldname": "amended_from", + "options": self.name, + "read_only": 1, + "print_hide": 1, + "no_copy": 1 + }) def make_repeatable(self): """If allow_auto_repeat is set, add auto_repeat custom field.""" diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index fbb224fce7..1e1a01a685 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -348,7 +348,6 @@ class TestDocType(unittest.TestCase): dump_docs = json.dumps(docs.get('docs')) cancel_all_linked_docs(dump_docs) data_link_doc.cancel() - data_doc.name = '{}-1'.format(data_doc.name) data_doc.load_from_db() self.assertEqual(data_link_doc.docstatus, 2) self.assertEqual(data_doc.docstatus, 2) @@ -434,10 +433,7 @@ class TestDocType(unittest.TestCase): self.assertRaises(frappe.LinkExistsError, data_link_doc_1.cancel) data_doc.load_from_db() - - data_doc_2.name = '{}-1'.format(data_doc_2.name) data_doc_2.load_from_db() - self.assertEqual(data_link_doc_1.docstatus, 2) #linked doc is canceled diff --git a/frappe/model/document.py b/frappe/model/document.py index 99585bb26c..61160e1f01 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -5,7 +5,7 @@ import time from frappe import _, msgprint, is_whitelisted from frappe.utils import flt, cstr, now, get_datetime_str, file_lock, date_diff from frappe.model.base_document import BaseDocument, get_controller -from frappe.model.naming import set_new_name, rename_cancelled_doc +from frappe.model.naming import set_new_name from werkzeug.exceptions import NotFound, Forbidden import hashlib, json from frappe.model import optional_fields, table_fields @@ -917,14 +917,6 @@ class Document(BaseDocument): @whitelist.__func__ def _cancel(self): """Cancel the document. Sets `docstatus` = 2, then saves.""" - - # for backward compatibility - if self.amended_from and not self.original_name: - self.original_name = None - else: - self.original_name = self.name - - self.name = rename_cancelled_doc(self) self.docstatus = 2 self.save() diff --git a/frappe/model/naming.py b/frappe/model/naming.py index ed037adb0d..fe136adce8 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -221,16 +221,6 @@ def revert_series_if_last(key, name, doc=None): * prefix = #### and hashes = 2021 (hash doesn't exist) * will search hash in key then accordingly get prefix = "" """ - - if hasattr(doc, 'amended_from'): - # do not revert if doc is amended, since cancelled docs still exist - if doc.docstatus != 2 and doc.amended_from: - return - - # for first cancelled doc - if doc.docstatus == 2 and not doc.amended_from and doc.original_name: - name = doc.original_name - if ".#" in key: prefix, hashes = key.rsplit(".", 1) if "#" not in hashes: @@ -314,48 +304,14 @@ def append_number_if_name_exists(doctype, value, fieldname="name", separator="-" def _set_amended_name(doc): - if doc.original_name: - doc.name = doc.original_name - else: - original_name = get_original_name(doc) - doc.name = doc.amended_from - - # rename original doc to next name in series, and set amended doc name as original name - next_name_in_series = get_new_name_from_amended_from(doc) - frappe.rename_doc(doc.doctype, original_name, next_name_in_series, force=True, show_alert=False) - doc.name = original_name - doc.amended_from = next_name_in_series - doc.original_name = original_name - - return doc.name - -def get_original_name(doc): - # get original doc name from chain of amended docs - amended_from = original_name = doc.amended_from - while amended_from: - original_name = amended_from - amended_from = frappe.db.get_value(doc.doctype, amended_from, "amended_from") - - return original_name - -def get_new_name_from_amended_from(doc): am_id = 1 - am_prefix = doc.name - if frappe.db.get_value(doc.doctype, doc.name, "amended_from"): + am_prefix = doc.amended_from + if frappe.db.get_value(doc.doctype, doc.amended_from, "amended_from"): am_id = cint(doc.amended_from.split("-")[-1]) + 1 am_prefix = "-".join(doc.amended_from.split("-")[:-1]) # except the last hyphen - new_name = am_prefix + "-" + str(am_id) - if new_name == doc.name: - am_id += 1 - new_name = am_prefix + "-" + str(am_id) - return new_name - -def rename_cancelled_doc(doc): - doc = frappe.parse_json(doc) - new_name = get_new_name_from_amended_from(doc) - frappe.rename_doc(doc.doctype, doc.name, new_name, force=True, show_alert=False) - return new_name + doc.name = am_prefix + "-" + str(am_id) + return doc.name def _field_autoname(autoname, doc, skip_slicing=None): diff --git a/frappe/patches.txt b/frappe/patches.txt index 833d85423b..7605d8ea2b 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,4 +180,3 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.add_original_name_docfield_to_submittable_doctypes diff --git a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py b/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py deleted file mode 100644 index d17242e90a..0000000000 --- a/frappe/patches/v13_0/add_original_name_docfield_to_submittable_doctypes.py +++ /dev/null @@ -1,11 +0,0 @@ -import frappe -from frappe.database.schema import add_column - -def execute(): - for doctype in frappe.db.get_all('DocType'): - doctype = frappe.get_doc('DocType', doctype.name) - if doctype.is_submittable and frappe.db.table_exists(doctype.name): - doctype.make_cancellable() - if not frappe.db.has_column(doctype.name, 'original_name'): - add_column(doctype.name, 'original_name', 'Text') - doctype.db_update_all() diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 30f023c987..8064f90a98 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -770,36 +770,32 @@ frappe.ui.form.Form = class FrappeForm { } _cancel(btn, callback, on_error, skip_confirm) { + const me = this; const cancel_doc = () => { frappe.validated = true; - this.script_manager.trigger("before_cancel").then(() => { + me.script_manager.trigger("before_cancel").then(() => { if (!frappe.validated) { - return this.handle_save_fail(btn, on_error); + return me.handle_save_fail(btn, on_error); } - const original_name = this.docname; - const after_cancel = (r) => { + var after_cancel = function(r) { if (r.exc) { - this.handle_save_fail(btn, on_error); + me.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("cancel"); + me.refresh(); callback && callback(); - this.script_manager.trigger("after_cancel"); - frappe.run_serially([ - () => this.rename_notify(this.doctype, original_name, r.docs[0].name), - () => frappe.router.clear_re_route(this.doctype, original_name), - () => this.refresh(), - ]); + me.script_manager.trigger("after_cancel"); } }; - frappe.ui.form.save(this, "cancel", after_cancel, btn); + frappe.ui.form.save(me, "cancel", after_cancel, btn); }); } if (skip_confirm) { cancel_doc(); } else { - frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, this.handle_save_fail(btn, on_error)); + frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, me.handle_save_fail(btn, on_error)); } }; @@ -821,7 +817,7 @@ frappe.ui.form.Form = class FrappeForm { 'docname': this.doc.name }).then(is_amended => { if (is_amended) { - frappe.throw(__('This document is already amended, you cannot amend it again')); + frappe.throw(__('This document is already amended, you cannot ammend it again')); } this.validate_form_action("Amend"); var me = this; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 46544db919..12caf4ab94 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -235,12 +235,6 @@ frappe.router = { } }, - clear_re_route(doctype, docname) { - delete frappe.re_route[ - `${encodeURIComponent(frappe.router.slug(doctype))}/${encodeURIComponent(docname)}` - ]; - }, - set_title(sub_path) { if (frappe.route_titles[sub_path]) { frappe.utils.set_title(frappe.route_titles[sub_path]); diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index b716f063c4..557993882f 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -116,37 +116,3 @@ class TestNaming(unittest.TestCase): self.assertEqual(current_index.get('current'), 2) frappe.db.sql("""delete from `tabSeries` where name = %s""", series) - - def test_naming_for_cancelled_and_amended_doc(self): - submittable_doctype = frappe.get_doc({ - "doctype": "DocType", - "module": "Core", - "custom": 1, - "is_submittable": 1, - "permissions": [{ - "role": "System Manager", - "read": 1 - }], - "name": 'Submittable Doctype' - }).insert() - - doc = frappe.new_doc('Submittable Doctype') - doc.save() - original_name = doc.name - - doc.submit() - doc.cancel() - cancelled_name = doc.name - self.assertEqual(cancelled_name, "{}-1".format(original_name)) - - amended_doc = frappe.copy_doc(doc) - amended_doc.docstatus = 0 - amended_doc.amended_from = doc.name - amended_doc.save() - self.assertEqual(amended_doc.name, original_name) - - amended_doc.submit() - amended_doc.cancel() - self.assertEqual(amended_doc.name, "{}-2".format(original_name)) - - submittable_doctype.delete() \ No newline at end of file From ef0a5e904bc7bef582b29629956c99deb466de49 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Fri, 2 Jul 2021 17:24:34 +0200 Subject: [PATCH 0310/1519] feat: different output formats for `bench version` --- frappe/commands/utils.py | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index b944f02af7..7d3aecca1f 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -768,25 +768,45 @@ def set_config(context, key, value, global_=False, parse=False, as_dict=False): @click.command('version') -def get_version(): +@click.option('--output', help='Output format. One of: plain, table, json, legacy.', default='legacy') +def get_version(output): "Show the versions of all the installed apps" from git import Repo - from frappe.utils.change_log import get_app_branch + from frappe.utils.commands import render_table + frappe.init('') + data = [] for app in sorted(frappe.get_all_apps()): - branch_name = get_app_branch(app) module = frappe.get_module(app) app_hooks = frappe.get_module(app + ".hooks") repo = Repo(frappe.get_app_path(app, "..")) - branch = repo.head.ref.name - commit = repo.head.ref.commit.hexsha[:7] - if hasattr(app_hooks, '{0}_version'.format(branch_name)): - click.echo("{0} {1} {2} ({3})".format(app, getattr(app_hooks, '{0}_version'.format(branch_name)), branch, commit)) + app_info = frappe._dict() + app_info.app = app + app_info.branch = repo.head.ref.name + app_info.commit = repo.head.ref.commit.hexsha[:7] + if hasattr(app_hooks, '{0}_version'.format(app_info.branch)): + app_info.version = getattr(app_hooks, '{0}_version'.format(app_info.branch)) elif hasattr(module, "__version__"): - click.echo("{0} {1} {2} ({3})".format(app, module.__version__, branch, commit)) + app_info.version = module.__version__ + + data.append(app_info) + + if output == 'table': + table = [['App', 'Version', 'Branch', 'Commit']] + for app_info in data: + table.append([app_info.app, app_info.version, app_info.branch, app_info.commit]) + render_table(table) + elif output == 'json': + click.echo(json.dumps(data, indent=4)) + elif output == 'plain': + for app_info in data: + click.echo(f'{app_info.app} {app_info.version} {app_info.branch} ({app_info.commit})') + else: # legacy + for app_info in data: + click.echo(f'{app_info.app} {app_info.version}') @click.command('rebuild-global-search') From 51207fe582f28eeaf5a0692c143e243339d6cce6 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Sat, 3 Jul 2021 13:00:43 +0530 Subject: [PATCH 0311/1519] feat: option to not preload assets --- frappe/website/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 0f5f182ea2..171c90e1cf 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -449,15 +449,15 @@ def cache_html(func): return cache_html_decorator -def build_response(path, data, http_status_code, headers=None): +def build_response(path, data, http_status_code, headers=None, preload_assets=True): # build response response = Response() response.data = set_content_type(response, data, path) response.status_code = http_status_code response.headers["X-Page-Name"] = path.encode("ascii", errors="xmlcharrefreplace") response.headers["X-From-Cache"] = frappe.local.response.from_cache or False - - add_preload_headers(response) + if preload_assets: + add_preload_headers(response) if headers: for key, val in iteritems(headers): response.headers[key] = val.encode("ascii", errors="xmlcharrefreplace") From 508f47e8717ddadaa0b692f8041b233d819b6b68 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 3 Jul 2021 14:13:02 +0530 Subject: [PATCH 0312/1519] fix: Minified js load --- frappe/website/page_renderers/template_page.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/frappe/website/page_renderers/template_page.py b/frappe/website/page_renderers/template_page.py index 249c998192..3ece8ff5d0 100644 --- a/frappe/website/page_renderers/template_page.py +++ b/frappe/website/page_renderers/template_page.py @@ -70,7 +70,7 @@ class TemplatePage(BaseTemplatePage): self.set_pymodule() self.update_context() - self.setup_template() + self.setup_template_source() self.load_colocated_files() self.set_properties_from_source() self.post_process_context() @@ -118,7 +118,7 @@ class TemplatePage(BaseTemplatePage): if os.path.exists(os.path.join(self.app_path, self.pymodule_path)): self.pymodule_name = self.app + "." + self.pymodule_path.replace(os.path.sep, ".")[:-3] - def setup_template(self): + def setup_template_source(self): '''Setup template source, frontmatter and markdown conversion''' self.source = self.get_raw_template() self.extract_frontmatter() @@ -126,7 +126,6 @@ class TemplatePage(BaseTemplatePage): def update_context(self): self.set_page_properties() - self.set_properties_from_source() self.context.build_version = frappe.utils.get_build_version() if self.pymodule_name: @@ -202,13 +201,10 @@ class TemplatePage(BaseTemplatePage): frappe.errprint(frappe.utils.get_traceback()) def render_template(self): - if self.source: + if self.template_path.endswith('min.js'): + html = self.source # static + else: html = frappe.render_template(self.source, self.context) - elif self.template_path: - if self.path.endswith('min.js'): - html = self.get_raw_template() # static - else: - html = frappe.get_template(self.template_path).render(self.context) return html From fccd19a44cd248c35a0b8e1dd2f20f95060b2d7e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sat, 3 Jul 2021 14:13:16 +0530 Subject: [PATCH 0313/1519] test: Add test to validate minified js load --- frappe/tests/test_website.py | 5 +++-- frappe/www/_test/assets/__init__.py | 0 frappe/www/_test/assets/js_asset.js | 1 - frappe/www/_test/assets/js_asset.min.js | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 frappe/www/_test/assets/__init__.py delete mode 100644 frappe/www/_test/assets/js_asset.js create mode 100644 frappe/www/_test/assets/js_asset.min.js diff --git a/frappe/tests/test_website.py b/frappe/tests/test_website.py index ae768d7804..f1c4f3b3f5 100644 --- a/frappe/tests/test_website.py +++ b/frappe/tests/test_website.py @@ -245,8 +245,9 @@ class TestWebsite(unittest.TestCase): self.assertIn("background-color: var(--bg-color);", content) def test_raw_assets_are_loaded(self): - content = get_response_content('/_test/assets/js_asset.js') - self.assertEqual("console.log('in');", content) + content = get_response_content('/_test/assets/js_asset.min.js') + # minified js files should not be passed through jinja renderer + self.assertEqual("//{% if title %} {{title}} {% endif %}\nconsole.log('in');", content) content = get_response_content('/_test/assets/css_asset.css') self.assertEqual("""body{color:red}""", content) diff --git a/frappe/www/_test/assets/__init__.py b/frappe/www/_test/assets/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/frappe/www/_test/assets/js_asset.js b/frappe/www/_test/assets/js_asset.js deleted file mode 100644 index b39f5af3dd..0000000000 --- a/frappe/www/_test/assets/js_asset.js +++ /dev/null @@ -1 +0,0 @@ -console.log('in'); \ No newline at end of file diff --git a/frappe/www/_test/assets/js_asset.min.js b/frappe/www/_test/assets/js_asset.min.js new file mode 100644 index 0000000000..e039292259 --- /dev/null +++ b/frappe/www/_test/assets/js_asset.min.js @@ -0,0 +1,2 @@ +//{% if title %} {{title}} {% endif %} +console.log('in'); \ No newline at end of file From 1c5ad30bf1069eb8469f2a47d9fe25dd4199ce40 Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Sat, 3 Jul 2021 18:44:40 +0530 Subject: [PATCH 0314/1519] perf: let's preload assets --- frappe/website/utils.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/website/utils.py b/frappe/website/utils.py index 171c90e1cf..419a5199df 100644 --- a/frappe/website/utils.py +++ b/frappe/website/utils.py @@ -449,15 +449,14 @@ def cache_html(func): return cache_html_decorator -def build_response(path, data, http_status_code, headers=None, preload_assets=True): +def build_response(path, data, http_status_code, headers=None): # build response response = Response() response.data = set_content_type(response, data, path) response.status_code = http_status_code response.headers["X-Page-Name"] = path.encode("ascii", errors="xmlcharrefreplace") response.headers["X-From-Cache"] = frappe.local.response.from_cache or False - if preload_assets: - add_preload_headers(response) + add_preload_headers(response) if headers: for key, val in iteritems(headers): response.headers[key] = val.encode("ascii", errors="xmlcharrefreplace") @@ -486,11 +485,12 @@ def set_content_type(response, data, path): return data def add_preload_headers(response): - from bs4 import BeautifulSoup + from bs4 import BeautifulSoup, SoupStrainer try: preload = [] - soup = BeautifulSoup(response.data, "lxml") + strainer = SoupStrainer(re.compile("script|link")) + soup = BeautifulSoup(response.data, "lxml", parse_only=strainer) for elem in soup.find_all('script', src=re.compile(".*")): preload.append(("script", elem.get("src"))) From 4ddf8c18d8d8e156dcdfa67c191a02015dda66f3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 10:38:55 +0530 Subject: [PATCH 0315/1519] feat: Execute separate build command for style files - Execute style build twice (one for LTR and one for RTL) because rtlcss is dependant on comments and esbuild strips all comments so we cannot run rtlcss on built css files. --- esbuild/esbuild.js | 106 ++++++++++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index a0b07abe43..aa273ab85c 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -97,10 +97,9 @@ async function execute() { await clean_dist_folders(APPS); } - let result; + let results; try { - result = await build_assets_for_apps(APPS, FILES_TO_BUILD); - result = await create_rtl_assets(result); + results = await build_assets_for_apps(APPS, FILES_TO_BUILD); } catch (e) { log_error("There were some problems during build"); log(); @@ -109,13 +108,15 @@ async function execute() { } if (!WATCH_MODE) { - log_built_assets(result.metafile); + log_built_assets(results); console.timeEnd(TOTAL_BUILD_TIME); log(); } else { log("Watching for changes..."); } - return await write_assets_json(result.metafile); + for (const result of results) { + write_assets_json(result.metafile); + } } function build_assets_for_apps(apps, files) { @@ -127,6 +128,8 @@ function build_assets_for_apps(apps, files) { let output_path = assets_path; let file_map = {}; + let style_file_map = {}; + let rtl_style_file_map = {}; for (let file of files) { let relative_app_path = path.relative(apps_path, file); let app = relative_app_path.split(path.sep)[0]; @@ -142,19 +145,32 @@ function build_assets_for_apps(apps, files) { } output_name = path.join(app, "dist", output_name); - if (Object.keys(file_map).includes(output_name)) { + if (Object.keys(file_map).includes(output_name) || Object.keys(style_file_map).includes(output_name)) { log_warn( `Duplicate output file ${output_name} generated from ${file}` ); } - - file_map[output_name] = file; + if ([".css", ".scss", ".less", ".sass", ".styl"].includes(extension)) { + style_file_map[output_name] = file; + rtl_style_file_map[output_name.replace('/css/', '/css-rtl/')] = file; + } else { + file_map[output_name] = file; + } } - - return build_files({ + let build = build_files({ files: file_map, outdir: output_path }); + let style_build = build_style_files({ + files: style_file_map, + outdir: output_path + }); + let rtl_style_build = build_style_files({ + files: rtl_style_file_map, + outdir: output_path, + rtl_style: true + }); + return Promise.all([build, style_build, rtl_style_build]); }); } @@ -205,7 +221,33 @@ function get_files_to_build(files) { } function build_files({ files, outdir }) { - return esbuild.build({ + let build_plugins = [ + html_plugin, + vue(), + ]; + return esbuild.build(get_build_options(files, outdir, build_plugins)); +} + +function build_style_files({ files, outdir, rtl_style=false }) { + let plugins = []; + if (rtl_style) { + plugins.push(rtlcss); + } + + let build_plugins = [ + ignore_assets, + postCssPlugin({ + plugins: plugins, + sassOptions: sass_options + }) + ]; + + plugins.push(require("autoprefixer")); + return esbuild.build(get_build_options(files, outdir, build_plugins)); +} + +function get_build_options(files, outdir, plugins) { + return { entryPoints: files, entryNames: "[dir]/[name].[hash]", outdir, @@ -219,17 +261,9 @@ function build_files({ files, outdir }) { PRODUCTION ? "production" : "development" ) }, - plugins: [ - html_plugin, - ignore_assets, - vue(), - postCssPlugin({ - plugins: [require("autoprefixer")], - sassOptions: sass_options - }) - ], + plugins: plugins, watch: get_watch_config() - }); + }; } function get_watch_config() { @@ -275,7 +309,11 @@ async function clean_dist_folders(apps) { } } -function log_built_assets(metafile) { +function log_built_assets(results) { + let outputs = {}; + for (const result of results) { + outputs = Object.assign(outputs, result.metafile.outputs); + } let column_widths = [60, 20]; cliui.div( { @@ -290,9 +328,9 @@ function log_built_assets(metafile) { cliui.div(""); let output_by_dist_path = {}; - for (let outfile in metafile.outputs) { + for (let outfile in outputs) { if (outfile.endsWith(".map")) continue; - let data = metafile.outputs[outfile]; + let data = outputs[outfile]; outfile = path.resolve(outfile); outfile = path.relative(assets_path, outfile); let filename = path.basename(outfile); @@ -486,24 +524,4 @@ function log_rebuilt_assets(prev_assets, new_assets) { log(" " + filename); } log(); -} - -async function create_rtl_assets(result) { - for (let file_path in result.metafile.outputs) { - if (file_path.endsWith('.css')) { - console.log(file_path); - let content = fs.readFileSync(file_path, {'encoding': 'utf-8'}); - let rtl_content = rtlcss.process(content); - let rtl_file_path = file_path.replace('/css/', '/css-rtl/'); - let rtl_folder_path = path.dirname(rtl_file_path); - if (fs.existsSync(rtl_file_path)) { - continue; - } - if (!fs.existsSync(rtl_folder_path)) { - fs.mkdirSync(rtl_folder_path); - } - fs.writeFileSync(rtl_file_path, rtl_content); - } - } - return result; } \ No newline at end of file From bdfb53a50c52c8dedab8f05457d30044872111c9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 1 Jul 2021 19:04:54 +0530 Subject: [PATCH 0316/1519] fix(Workspace): Pass doctype info for link item Without item.doctype, url for non standard reports in workspace cards doesn't set properly since doctype value is unidentified Sometimes, the whole workspace won't render because slug function breaks while recieving undefined object (cherry picked from commit 689e38b8610cc9e0b9b738d2774d0daa193dc309) --- frappe/public/js/frappe/widgets/links_widget.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/js/frappe/widgets/links_widget.js b/frappe/public/js/frappe/widgets/links_widget.js index 84758db592..2cc824899f 100644 --- a/frappe/public/js/frappe/widgets/links_widget.js +++ b/frappe/public/js/frappe/widgets/links_widget.js @@ -64,6 +64,7 @@ export default class LinksWidget extends Widget { const opts = { name: item.link_to, type: item.link_type, + doctype: item.doctype, is_query_report: item.is_query_report }; From 9140361188ed4620575b3ad8bebfdf9abaa80167 Mon Sep 17 00:00:00 2001 From: walstanb Date: Mon, 5 Jul 2021 12:08:24 +0530 Subject: [PATCH 0317/1519] fix: removed red indicator from alert --- frappe/public/js/frappe/ui/capture.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/frappe/public/js/frappe/ui/capture.js b/frappe/public/js/frappe/ui/capture.js index 676c997b31..d408fadb33 100644 --- a/frappe/public/js/frappe/ui/capture.js +++ b/frappe/public/js/frappe/ui/capture.js @@ -116,10 +116,7 @@ frappe.ui.Capture = class { }) .catch(err => { if (this.options.error) { - const alert = ` ${ - frappe.ui.Capture.ERR_MESSAGE - }`; - frappe.show_alert(alert, 3); + frappe.show_alert(frappe.ui.Capture.ERR_MESSAGE, 3); } throw err; From 6df9fd2bf89b3506a958db9dfd0049c89c2e006d Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 14:10:51 +0530 Subject: [PATCH 0318/1519] fix: Build asset file from results sequentially --- esbuild/esbuild.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index aa273ab85c..19ab559ccd 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -115,7 +115,7 @@ async function execute() { log("Watching for changes..."); } for (const result of results) { - write_assets_json(result.metafile); + await write_assets_json(result.metafile); } } From 70e4b8a459d53dec867bf294336335b9d02a9f2c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 14:39:46 +0530 Subject: [PATCH 0319/1519] fix: Use different key for RTL assets --- esbuild/esbuild.js | 6 +++++- frappe/public/js/frappe/assets.js | 4 ++-- frappe/utils/jinja_globals.py | 7 ++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/esbuild/esbuild.js b/esbuild/esbuild.js index 19ab559ccd..9074beae06 100644 --- a/esbuild/esbuild.js +++ b/esbuild/esbuild.js @@ -385,7 +385,11 @@ async function write_assets_json(metafile) { let info = metafile.outputs[output]; let asset_path = "/" + path.relative(sites_path, output); if (info.entryPoint) { - out[path.basename(info.entryPoint)] = asset_path; + let key = path.basename(info.entryPoint); + if (key.endsWith('.css') && asset_path.includes('/css-rtl/')) { + key = `rtl_${key}`; + } + out[key] = asset_path; } } diff --git a/frappe/public/js/frappe/assets.js b/frappe/public/js/frappe/assets.js index 1f2659992f..0a3fb33cb8 100644 --- a/frappe/public/js/frappe/assets.js +++ b/frappe/public/js/frappe/assets.js @@ -170,10 +170,10 @@ frappe.assets = { bundled_asset(path, is_rtl=null) { if (!path.startsWith('/assets') && path.includes('.bundle.')) { - path = frappe.boot.assets_json[path] || path; if (path.endsWith('.css') && is_rtl) { - path = path.replace('/css/', '/css-rtl/'); + path = `rtl_${path}`; } + path = frappe.boot.assets_json[path] || path; return path; } return path; diff --git a/frappe/utils/jinja_globals.py b/frappe/utils/jinja_globals.py index dd5ade727b..67ca9d108a 100644 --- a/frappe/utils/jinja_globals.py +++ b/frappe/utils/jinja_globals.py @@ -75,9 +75,6 @@ def include_script(path): def include_style(path, rtl=None): path = bundled_asset(path) - - if is_rtl(rtl): - path = path.replace('/css/', '/css-rtl/') return f'' @@ -87,9 +84,9 @@ def bundled_asset(path, rtl=None): if ".bundle." in path and not path.startswith("/assets"): bundled_assets = get_assets_json() - path = bundled_assets.get(path) or path if path.endswith('.css') and is_rtl(rtl): - path = path.replace('/css/', '/css-rtl/') + path = f"rtl_{path}" + path = bundled_assets.get(path) or path return abs_url(path) From 6e92cda34aa91790429e24ab7c25203a6facea7f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 14:43:34 +0530 Subject: [PATCH 0320/1519] fix: Breadcrumb direction for RTL --- frappe/public/scss/desk/breadcrumb.scss | 4 ++-- frappe/public/scss/desk/css_variables.scss | 2 ++ frappe/public/scss/desk/dark.scss | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/public/scss/desk/breadcrumb.scss b/frappe/public/scss/desk/breadcrumb.scss index 6324e6f012..b466bab7ae 100644 --- a/frappe/public/scss/desk/breadcrumb.scss +++ b/frappe/public/scss/desk/breadcrumb.scss @@ -4,7 +4,7 @@ background-color: white; font-size: var(--text-sm); } - +/*! This comment will be included even in compressed mode. */ #navbar-breadcrumbs { margin-left: var(--margin-md); font-size: var(--text-sm); @@ -12,7 +12,7 @@ font-size: var(--text-md); margin-right: 10px; &:before { - content: var(--right-arrow-svg); + content: #{"/*!rtl:var(--left-arrow-svg);*/"}var(--right-arrow-svg); display: inline-block; margin-right: 10px; } diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss index 5bb2614dcc..c099a8bdeb 100644 --- a/frappe/public/scss/desk/css_variables.scss +++ b/frappe/public/scss/desk/css_variables.scss @@ -77,4 +77,6 @@ $input-height: 28px !default; --skeleton-bg: var(--gray-100); --right-arrow-svg: url("data: image/svg+xml;utf8, "); + + --left-arrow-svg: url("data: image/svg+xml;utf8, "); } diff --git a/frappe/public/scss/desk/dark.scss b/frappe/public/scss/desk/dark.scss index 76dcf90bc3..7f0dfe73b8 100644 --- a/frappe/public/scss/desk/dark.scss +++ b/frappe/public/scss/desk/dark.scss @@ -157,4 +157,6 @@ --skeleton-bg: var(--gray-800); --right-arrow-svg: url("data: image/svg+xml;utf8, "); + + --left-arrow-svg: url("data: image/svg+xml;utf8, "); } From 0b3402236cfd15259cf2bae29ae87f0f306ac951 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 14:44:04 +0530 Subject: [PATCH 0321/1519] fix: Add layout direction to pdf template --- frappe/templates/print_formats/pdf_header_footer.html | 2 +- frappe/utils/pdf.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/templates/print_formats/pdf_header_footer.html b/frappe/templates/print_formats/pdf_header_footer.html index a9c621f505..189cf43cd9 100644 --- a/frappe/templates/print_formats/pdf_header_footer.html +++ b/frappe/templates/print_formats/pdf_header_footer.html @@ -1,5 +1,5 @@ - + diff --git a/frappe/utils/pdf.py b/frappe/utils/pdf.py index fcf483bea6..9cbece5dbe 100644 --- a/frappe/utils/pdf.py +++ b/frappe/utils/pdf.py @@ -13,7 +13,7 @@ from PyPDF2 import PdfFileReader, PdfFileWriter import frappe from frappe import _ from frappe.utils import scrub_urls -from frappe.utils.jinja_globals import bundled_asset +from frappe.utils.jinja_globals import bundled_asset, is_rtl PDF_CONTENT_ERRORS = ["ContentNotFoundError", "ContentOperationNotPermittedError", "UnknownContentError", "RemoteHostClosedError"] @@ -177,7 +177,9 @@ def prepare_header_footer(soup): "content": content, "styles": styles, "html_id": html_id, - "css": css + "css": css, + "lang": frappe.local.lang, + "layout_direction": "rtl" if is_rtl else "ltr" }) # create temp file From 5b2a79ed2ec55b9fa8f1b78e77a22b58c2b9266b Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Mon, 5 Jul 2021 16:15:12 +0530 Subject: [PATCH 0322/1519] fix: cannot read property `0` of undefined --- frappe/public/js/frappe/views/workspace/workspace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 80f8c00705..f16228dca0 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -252,7 +252,7 @@ class DesktopPage { return; } this.refresh(); - }).finally(this.page.find('.workspace_loading_skeleton').remove); + }).finally(() => this.page.find('.workspace_loading_skeleton').remove()); } refresh() { From 0228b9c8ebdd20b7b76522b697cc6c4bfe46c949 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 5 Jul 2021 18:02:35 +0530 Subject: [PATCH 0323/1519] fix: Add RTL control directive to override dropdown style in RTL mode --- frappe/public/scss/desk/global.scss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index afcf2957cc..1168c8ce8c 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -302,6 +302,15 @@ select.input-xs { } } +/*!rtl:raw: +.dropdown-menu { + right: auto; +} +.popover { + right: auto; +} +*/ + .custom-control.custom-switch { font-size: var(--text-md); line-height: 1.6; From b5d9de1fc4b69233cc5497bd79ce97bf7956be9c Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Mon, 5 Jul 2021 20:03:19 +0530 Subject: [PATCH 0324/1519] fix: Option to pass any value for limit from client-side (#13452) * add unlimited support to frappe.db.get_list - js * fix: use 0 for getting all components in get_list * fix: use autocomplete instead of select for letterheads * fix: linting Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> * chore: linting * fix: add placeholder to autocomplete Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> --- frappe/printing/page/print/print.js | 24 +++++++++--------------- frappe/public/js/frappe/db.js | 2 +- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/frappe/printing/page/print/print.js b/frappe/printing/page/print/print.js index 233bbe0ce7..908479fd02 100644 --- a/frappe/printing/page/print/print.js +++ b/frappe/printing/page/print/print.js @@ -113,22 +113,20 @@ frappe.ui.form.PrintView = class { }, ).$input; - this.letterhead_selector = this.add_sidebar_item( + this.letterhead_selector_df = this.add_sidebar_item( { - fieldtype: 'Select', + fieldtype: 'Autocomplete', fieldname: 'letterhead', label: __('Select Letterhead'), - options: [ - this.get_default_option_for_select(__('Select Letterhead')), - __('No Letterhead') - ], + placeholder: __('Select Letterhead'), + options: [__('No Letterhead')], change: () => this.preview(), default: this.print_settings.with_letterhead ? __('No Letterhead') : __('Select Letterhead') }, - ).$input; - + ); + this.letterhead_selector = this.letterhead_selector_df.$input; this.sidebar_dynamic_section = $( `
    ` ).appendTo(this.sidebar); @@ -336,23 +334,19 @@ frappe.ui.form.PrintView = class { } set_letterhead_options() { - let letterhead_options = [ - this.get_default_option_for_select(__('Select Letterhead')), - __('No Letterhead') - ]; + let letterhead_options = [__('No Letterhead')]; let default_letterhead; let doc_letterhead = this.frm.doc.letter_head; return frappe.db - .get_list('Letter Head', { fields: ['name', 'is_default'] }) + .get_list('Letter Head', { fields: ['name', 'is_default'], limit: 0 }) .then((letterheads) => { - this.letterhead_selector.empty(); letterheads.map((letterhead) => { if (letterhead.is_default) default_letterhead = letterhead.name; return letterhead_options.push(letterhead.name); }); - this.letterhead_selector.add_options(letterhead_options); + this.letterhead_selector_df.set_data(letterhead_options); let selected_letterhead = doc_letterhead || default_letterhead; if (selected_letterhead) this.letterhead_selector.val(selected_letterhead); diff --git a/frappe/public/js/frappe/db.js b/frappe/public/js/frappe/db.js index 89054e3791..2467302c76 100644 --- a/frappe/public/js/frappe/db.js +++ b/frappe/public/js/frappe/db.js @@ -10,7 +10,7 @@ frappe.db = { if (!args.fields) { args.fields = ['name']; } - if (!args.limit) { + if (!('limit' in args)) { args.limit = 20; } return new Promise ((resolve) => { From d1555263e1823f9cd6df626e0c5caa4203c508cf Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 5 Jul 2021 19:52:12 +0200 Subject: [PATCH 0325/1519] refactor: suggestions from review - use -f / -- format instead of output - get rid of ugly if / else statements --- frappe/commands/utils.py | 46 +++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 7d3aecca1f..1cecdffe1b 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -767,14 +767,15 @@ def set_config(context, key, value, global_=False, parse=False, as_dict=False): frappe.destroy() -@click.command('version') -@click.option('--output', help='Output format. One of: plain, table, json, legacy.', default='legacy') +@click.command("version") +@click.option("-f", "--format", "output", + type=click.Choice(["plain", "table", "json", "legacy"]), help="Output format", default="legacy") def get_version(output): - "Show the versions of all the installed apps" + """Show the versions of all the installed apps.""" from git import Repo from frappe.utils.commands import render_table - frappe.init('') + frappe.init("") data = [] for app in sorted(frappe.get_all_apps()): @@ -786,27 +787,28 @@ def get_version(output): app_info.app = app app_info.branch = repo.head.ref.name app_info.commit = repo.head.ref.commit.hexsha[:7] - - if hasattr(app_hooks, '{0}_version'.format(app_info.branch)): - app_info.version = getattr(app_hooks, '{0}_version'.format(app_info.branch)) - elif hasattr(module, "__version__"): - app_info.version = module.__version__ + app_info.version = getattr(app_hooks, f"{app_info.branch}_version", None) or module.__version__ data.append(app_info) - if output == 'table': - table = [['App', 'Version', 'Branch', 'Commit']] - for app_info in data: - table.append([app_info.app, app_info.version, app_info.branch, app_info.commit]) - render_table(table) - elif output == 'json': - click.echo(json.dumps(data, indent=4)) - elif output == 'plain': - for app_info in data: - click.echo(f'{app_info.app} {app_info.version} {app_info.branch} ({app_info.commit})') - else: # legacy - for app_info in data: - click.echo(f'{app_info.app} {app_info.version}') + { + "legacy": lambda: [ + click.echo(f"{app_info.app} {app_info.version}") + for app_info in data + ], + "plain": lambda: [ + click.echo(f"{app_info.app} {app_info.version} {app_info.branch} ({app_info.commit})") + for app_info in data + ], + "table": lambda: render_table( + [["App", "Version", "Branch", "Commit"]] + + [ + [app_info.app, app_info.version, app_info.branch, app_info.commit] + for app_info in data + ] + ), + "json": lambda: click.echo(json.dumps(data, indent=4)), + }[output]() @click.command('rebuild-global-search') From d7e0479ee742073fc1093ef9f2177153e93ae4a2 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Mon, 5 Jul 2021 19:53:02 +0200 Subject: [PATCH 0326/1519] test: add test for `bench version` --- frappe/tests/test_commands.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 07bdf8791e..8f9bbb1afb 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -426,3 +426,13 @@ class TestCommands(BaseTestCommands): self.assertEqual(self.returncode, 0) self.assertIn("pong", self.stdout) + def test_version(self): + self.execute("bench version") + self.assertEqual(self.returncode, 0) + + for output in ["legacy", "plain", "table", "json"]: + self.execute(f"bench version -f {output}") + self.assertEqual(self.returncode, 0) + + self.execute("bench version -f invalid") + self.assertEqual(self.returncode, 1) From 1fa7011b886c7de1ae77b817963994e5dbdf8c3d Mon Sep 17 00:00:00 2001 From: hasnain2808 Date: Tue, 6 Jul 2021 11:59:23 +0530 Subject: [PATCH 0327/1519] fix: system notifications without email --- frappe/desk/doctype/notification_log/notification_log.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index 414f272f59..f5f1b3b124 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -12,7 +12,10 @@ class NotificationLog(Document): frappe.publish_realtime('notification', after_commit=True, user=self.for_user) set_notifications_as_unseen(self.for_user) if is_email_notifications_enabled_for_type(self.for_user, self.type): - send_notification_email(self) + try: + send_notification_email(self) + except frappe.OutgoingEmailError: + frappe.log_error(message = frappe.get_traceback(), title=_("Error Sending Notification Email(System Notification sent).")) def get_permission_query_conditions(for_user): From a1e84d234108c950d2d00a3df0eb70247c154966 Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Tue, 6 Jul 2021 13:28:18 +0530 Subject: [PATCH 0328/1519] fix: Accurately cast fieldtype in frappe.db.get_single_value() --- frappe/database/database.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 81e24cc7ad..d113adcdab 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -15,7 +15,7 @@ from frappe import _ from time import time from frappe.utils import now, getdate, cast_fieldtype, get_datetime from frappe.model.utils.link_count import flush_local_link_count -from frappe.utils import cint +from frappe.utils import cint, cast_fieldtype class Database(object): @@ -556,8 +556,7 @@ class Database(object): if not df: frappe.throw(_('Invalid field name: {0}').format(frappe.bold(fieldname)), self.InvalidColumnName) - if df.fieldtype in frappe.model.numeric_fieldtypes: - val = cint(val) + val = cast_fieldtype(df.fieldtype, val) self.value_cache[doctype][fieldname] = val From 64840aac6bcca0e1af5203a0d3e005359ade0f1b Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Tue, 6 Jul 2021 14:13:27 +0530 Subject: [PATCH 0329/1519] refactor(minor): Delete redundant imports --- frappe/database/database.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index d113adcdab..6012e47445 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -15,7 +15,6 @@ from frappe import _ from time import time from frappe.utils import now, getdate, cast_fieldtype, get_datetime from frappe.model.utils.link_count import flush_local_link_count -from frappe.utils import cint, cast_fieldtype class Database(object): From afe1dbe0f8c917cd8288e4521432879ef4d8fec6 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 6 Jul 2021 22:05:37 +0530 Subject: [PATCH 0330/1519] fix: Workspace 2.0 --- frappe/boot.py | 4 +- frappe/desk/desktop.py | 120 +-- frappe/desk/doctype/internal_wiki/__init__.py | 0 .../doctype/internal_wiki/internal_wiki.js | 8 - .../doctype/internal_wiki/internal_wiki.json | 52 - .../doctype/internal_wiki/internal_wiki.py | 111 --- .../internal_wiki/test_internal_wiki.py | 8 - .../doctype/internal_wiki_page/__init__.py | 0 .../internal_wiki_page/internal_wiki_page.js | 8 - .../internal_wiki_page.json | 55 -- .../internal_wiki_page/internal_wiki_page.py | 35 - .../test_internal_wiki_page.py | 10 - frappe/desk/doctype/workspace/workspace.json | 39 +- frappe/desk/doctype/workspace/workspace.py | 101 ++ frappe/desk/page/wiki/__init__.py | 0 frappe/desk/page/wiki/wiki.js | 15 - frappe/desk/page/wiki/wiki.json | 19 - frappe/patches.txt | 1 + frappe/patches/v13_0/update_workspace.py | 49 + frappe/public/build.json | 4 +- frappe/public/js/desk.bundle.js | 4 +- frappe/public/js/frappe/desk.js | 2 +- frappe/public/js/frappe/router.js | 17 +- frappe/public/js/frappe/views/wiki.js | 594 ------------ .../workspace/blocks}/block.js | 2 +- .../workspace/blocks}/card.js | 0 .../workspace/blocks}/chart.js | 0 .../workspace/blocks}/header.js | 0 .../js/frappe/views/workspace/blocks/index.js | 25 + .../workspace/blocks}/paragraph.js | 0 .../workspace/blocks}/shortcut.js | 0 .../workspace/blocks}/spacer.js | 0 .../workspace/blocks}/spacing_tune.js | 0 .../js/frappe/views/workspace/workspace.js | 898 +++++++++++------- frappe/public/js/frappe/wiki_blocks/blocks.js | 25 - frappe/public/scss/desk/desktop.scss | 249 +++++ frappe/public/scss/desk/index.scss | 1 - frappe/public/scss/desk/wiki.scss | 274 ------ 38 files changed, 1076 insertions(+), 1654 deletions(-) delete mode 100644 frappe/desk/doctype/internal_wiki/__init__.py delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.js delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.json delete mode 100644 frappe/desk/doctype/internal_wiki/internal_wiki.py delete mode 100644 frappe/desk/doctype/internal_wiki/test_internal_wiki.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/__init__.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json delete mode 100644 frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py delete mode 100644 frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py delete mode 100644 frappe/desk/page/wiki/__init__.py delete mode 100644 frappe/desk/page/wiki/wiki.js delete mode 100644 frappe/desk/page/wiki/wiki.json create mode 100644 frappe/patches/v13_0/update_workspace.py delete mode 100644 frappe/public/js/frappe/views/wiki.js rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/block.js (98%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/card.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/chart.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/header.js (100%) create mode 100644 frappe/public/js/frappe/views/workspace/blocks/index.js rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/paragraph.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/shortcut.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/spacer.js (100%) rename frappe/public/js/frappe/{wiki_blocks => views/workspace/blocks}/spacing_tune.js (100%) delete mode 100644 frappe/public/js/frappe/wiki_blocks/blocks.js delete mode 100644 frappe/public/scss/desk/wiki.scss diff --git a/frappe/boot.py b/frappe/boot.py index 0589e32ac8..1bcdca6a65 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -105,8 +105,8 @@ def load_conf_settings(bootinfo): if key in conf: bootinfo[key] = conf.get(key) def load_desktop_data(bootinfo): - from frappe.desk.desktop import get_desk_sidebar_items - bootinfo.allowed_workspaces = get_desk_sidebar_items() + from frappe.desk.doctype.workspace.workspace import get_pages + bootinfo.allowed_workspaces = get_pages().get('pages') bootinfo.module_page_map = get_controller("Workspace").get_module_page_map() bootinfo.dashboards = frappe.get_all("Dashboard") diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8e044ac7bd..a0d325e104 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -4,7 +4,6 @@ import frappe import json -from typing import Dict, List from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports @@ -29,10 +28,10 @@ def handle_not_exist(fn): class Workspace: - def __init__(self, page_name, minimal=False, wiki=False) -> List[Dict]: - if isinstance(wiki, str): - wiki = json.loads(wiki) - self.page_name = page_name + def __init__(self, page, minimal=False): + self.page_name = page.get('name') + self.page_title = page.get('title') + self.public_page = page.get('public') self.extended_links = [] self.extended_charts = [] self.extended_shortcuts = [] @@ -40,10 +39,7 @@ class Workspace: self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - if wiki: - self.doc = self.get_wiki_page_for_user() - else: - self.doc = self.get_page_for_user() + self.doc = self.get_page_for_user() if self.doc.module and self.doc.module not in self.allowed_modules: raise frappe.PermissionError @@ -109,40 +105,18 @@ class Workspace: return self.user.allow_modules def get_page_for_user(self): - filters = { - 'extends': self.page_name, - 'for_user': frappe.session.user, - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) + if self.public_page: + filters = { + 'label': self.page_name, + 'public': 1 + } + public_pages = frappe.get_all("Workspace", filters=filters, limit=1) + if public_pages: + return frappe.get_cached_doc("Workspace", public_pages[0]) filters = { - 'extends_another_page': 1, - 'extends': self.page_name, - 'is_default': 1 - } - default_page = frappe.get_all("Workspace", filters=filters, limit=1) - if default_page: - return frappe.get_cached_doc("Workspace", default_page[0]) - - self.get_pages_to_extend() - return frappe.get_cached_doc("Workspace", self.page_name) - - def get_wiki_page_for_user(self): - filters = { - 'wiki_label': self.page_name, - 'public': 1, - 'for_wiki': 1 - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - - filters = { - 'wiki_label': self.page_name, - 'for_user': frappe.session.user, - 'for_wiki': 1 + 'label': self.page_title + "-" + frappe.session.user, + 'for_user': frappe.session.user } user_pages = frappe.get_all("Workspace", filters=filters, limit=1) if user_pages: @@ -373,7 +347,7 @@ class Workspace: @frappe.whitelist() @frappe.read_only() -def get_desktop_page(page, wiki=False): +def get_desktop_page(page): """Applies permissions, customizations and returns the configruration for a page on desk. @@ -384,13 +358,7 @@ def get_desktop_page(page, wiki=False): dict: dictionary of cards, charts and shortcuts to be displayed on website """ try: - if wiki and not frappe.db.exists({ - 'doctype': 'Workspace', - 'wiki_label': page, - 'for_wiki': 1 - }): - return - wspace = Workspace(page, wiki=wiki) + wspace = Workspace(loads(page)) wspace.build_workspace() return { 'charts': wspace.charts, @@ -428,7 +396,7 @@ def get_desk_sidebar_items(): # Filter Page based on Permission for page in all_pages: try: - wspace = Workspace(page.get('name'), True) + wspace = Workspace(page.get('name')) if wspace.is_page_allowed(): pages.append(page) page['label'] = _(page.get('name')) @@ -511,42 +479,6 @@ def get_custom_workspace_for_user(page): doc.for_user = frappe.session.user return doc -def get_custom_wiki_for_user(page, public): - """Get custom page from workspace if exists or create one - - Args: - page (stirng): Page name - - Returns: - Object: Document object - """ - filters = { - 'wiki_label': page, - 'public': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) - - filters = { - 'wiki_label': page, - 'for_user': frappe.session.user, - 'for_wiki': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - return frappe.get_doc("Workspace", pages[0]) - doc = frappe.new_doc("Workspace") - doc.wiki_label = page - doc.label = page + '-Wiki-' + frappe.session.user - doc.for_user = frappe.session.user - doc.for_wiki = 1 - doc.public = public - doc.charts = [] - doc.shortcuts = [] - doc.links = [] - return doc - @frappe.whitelist() def save_customization(page, config): """Save customizations as a separate doctype in Workspace per user @@ -605,24 +537,23 @@ def save_customization(page, config): return True -def save_new_widget(page, blocks, new_widgets, public=False): - page_doc = get_custom_wiki_for_user(page, public) +def save_new_widget(doc, page, blocks, new_widgets): widgets = _dict(loads(new_widgets)) if widgets.chart: - page_doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) + doc.charts.extend(new_widget(widgets.chart, "Workspace Chart", "charts")) if widgets.shortcut: - page_doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) + doc.shortcuts.extend(new_widget(widgets.shortcut, "Workspace Shortcut", "shortcuts")) if widgets.card: - page_doc.build_links_table_from_card(widgets.card) + doc.build_links_table_from_card(widgets.card) # remove duplicate and unwanted widgets if widgets: - clean_up(page_doc, blocks) + clean_up(doc, blocks) try: - page_doc.save(ignore_permissions=True) + doc.save(ignore_permissions=True) except (ValidationError, TypeError) as e: # Create a json string to log json_config = dumps(widgets, sort_keys=True, indent=4) @@ -638,12 +569,11 @@ def save_new_widget(page, blocks, new_widgets, public=False): return False return True - def clean_up(original_page, blocks): page_widgets = {} for wid in ['shortcut', 'card', 'chart']: - # get list of widget's name from internal wiki page + # get list of widget's name from blocks page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] # shortcut & chart cleanup diff --git a/frappe/desk/doctype/internal_wiki/__init__.py b/frappe/desk/doctype/internal_wiki/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.js b/frappe/desk/doctype/internal_wiki/internal_wiki.js deleted file mode 100644 index 6c86ac23df..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Internal Wiki', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.json b/frappe/desk/doctype/internal_wiki/internal_wiki.json deleted file mode 100644 index 64c75c47ce..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "actions": [], - "autoname": "field:title", - "creation": "2021-06-02 18:41:57.221425", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "wiki_pages" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1, - "unique": 1 - }, - { - "fieldname": "wiki_pages", - "fieldtype": "Table", - "label": "Wiki Pages", - "options": "Internal Wiki Page" - } - ], - "index_web_pages_for_search": 1, - "links": [], - "modified": "2021-06-03 12:47:50.146962", - "modified_by": "Administrator", - "module": "Desk", - "name": "Internal Wiki", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "share": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/internal_wiki.py b/frappe/desk/doctype/internal_wiki/internal_wiki.py deleted file mode 100644 index a144d24c66..0000000000 --- a/frappe/desk/doctype/internal_wiki/internal_wiki.py +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright (c) 2021, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -import json -from frappe.desk.desktop import save_new_widget -from frappe.desk.doctype.internal_wiki_page.internal_wiki_page import new_internal_wiki_page, delete_page, sort_page -from frappe.model.document import Document - -class InternalWiki(Document): - pass - -@frappe.whitelist() -def get_wiki_pages(): - has_access = "System Manager" in frappe.get_roles() - - default_pages = frappe.get_doc("Internal Wiki", "Default").wiki_pages - pages = prepare_pages(default_pages) - if not frappe.db.exists("Internal Wiki", frappe.session.user): - return {"pages": pages, "has_access": has_access} - - user_pages = frappe.get_doc("Internal Wiki", frappe.session.user).wiki_pages - user_pages = prepare_pages(user_pages, True) - pages.extend(user_pages) - - return {"pages": pages, "has_access": has_access} - -def prepare_pages(pages, is_editable=False): - prepared_pages = [] - for p in pages: - page = { - "title": p.title, - "icon": p.icon, - "parent_wiki": p.parent, - "parent_page": p.parent_page, - "content": p.content, - "is_editable": is_editable or ("System Manager" in frappe.get_roles()) - } - prepared_pages.append(page) - return prepared_pages - -@frappe.whitelist() -def save_wiki_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): - save = frappe.parse_json(save) - public = frappe.parse_json(public) - if save: - # create new Internal Wiki Page - new_doc = new_internal_wiki_page(title, blocks, parent, 'wiki_pages') - - if public: - doc = frappe.get_doc("Internal Wiki", "Default") - doc.wiki_pages.extend([new_doc]) - elif not frappe.db.exists("Internal Wiki", frappe.session.user): - doc = frappe.new_doc("Internal Wiki") - doc.title = frappe.session.user - doc.wiki_pages = [new_doc] - else: - doc = frappe.get_doc("Internal Wiki", frappe.session.user) - doc.wiki_pages.extend([new_doc]) - doc.save(ignore_permissions=True) - else: - for page in ["Default", frappe.session.user]: - if frappe.db.exists("Internal Wiki", page): - doc = frappe.get_doc("Internal Wiki", page) - for d in doc.wiki_pages: - if d.title == title: - d.content = blocks - break - doc.save(ignore_permissions=True) - - if json.loads(deleted_pages): - return delete_pages(json.loads(deleted_pages)) - - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) - - if json.loads(new_widgets): - save_new_widget(title, blocks, new_widgets, public) - - return title - -def delete_pages(deleted_pages): - for page in deleted_pages: - # delete default Internal Wiki Page - if "System Manager" in frappe.get_roles(): - delete_page("Default", page) - - # delete user's Internal Wiki Page - if frappe.db.exists("Internal Wiki", frappe.session.user): - delete_page(frappe.session.user, page) - - # delete Workspace - filters = { - 'extends': page.get("title"), - 'for_user': frappe.session.user, - 'for_wiki': 1 - } - pages = frappe.get_list("Workspace", filters=filters) - if pages: - frappe.get_doc("Workspace", pages[0]).delete() - return 'Home' - -def sort_pages(sb_items): - # update the index of default Internal Wiki Pages based on sorted sidebar pages - if "System Manager" in frappe.get_roles(): - sort_page("Default", sb_items) - - # update the index of user's Internal Wiki Pages based on sorted sidebar pages - if frappe.db.exists("Internal Wiki", frappe.session.user): - sort_page(frappe.session.user, sb_items) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py b/frappe/desk/doctype/internal_wiki/test_internal_wiki.py deleted file mode 100644 index 15fb04b822..0000000000 --- a/frappe/desk/doctype/internal_wiki/test_internal_wiki.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2021, Frappe Technologies and Contributors -# See license.txt - -# import frappe -import unittest - -class TestInternalWiki(unittest.TestCase): - pass diff --git a/frappe/desk/doctype/internal_wiki_page/__init__.py b/frappe/desk/doctype/internal_wiki_page/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js deleted file mode 100644 index ece4bd5080..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.js +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2021, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Internal Wiki Page', { - // refresh: function(frm) { - - // } -}); diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json deleted file mode 100644 index 3bab22dbd0..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "actions": [], - "creation": "2021-05-02 14:44:26.490935", - "doctype": "DocType", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "title", - "icon", - "parent_page", - "section_break_7", - "content" - ], - "fields": [ - { - "fieldname": "title", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Title", - "reqd": 1 - }, - { - "fieldname": "icon", - "fieldtype": "Data", - "label": "Icon" - }, - { - "fieldname": "parent_page", - "fieldtype": "Data", - "in_list_view": 1, - "label": "Parent Page" - }, - { - "fieldname": "section_break_7", - "fieldtype": "Section Break" - }, - { - "fieldname": "content", - "fieldtype": "Long Text", - "label": "Content" - } - ], - "index_web_pages_for_search": 1, - "istable": 1, - "links": [], - "modified": "2021-06-03 12:46:31.540481", - "modified_by": "Administrator", - "module": "Desk", - "name": "Internal Wiki Page", - "owner": "Administrator", - "permissions": [], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1 -} \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py deleted file mode 100644 index b73f7e1ddc..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/internal_wiki_page.py +++ /dev/null @@ -1,35 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2021, Frappe Technologies and contributors -# For license information, please see license.txt - -from __future__ import unicode_literals -import frappe -from frappe.model.document import Document - -class InternalWikiPage(Document): - pass - -def new_internal_wiki_page(title, blocks, parent, parentfield): - new_doc = frappe.new_doc('Internal Wiki Page') - new_doc.title = title - new_doc.content = blocks - new_doc.parent_page = parent - new_doc.parentfield = parentfield - return new_doc - -def delete_page(user, wiki_page): - doc = frappe.get_doc("Internal Wiki", user) - for idx, page in enumerate(doc.wiki_pages): - if page.title == wiki_page.get("title") and page.parent == wiki_page.get("parent_wiki"): - del doc.wiki_pages[idx] - doc.save(ignore_permissions=True) - -def sort_page(user, pages): - doc = frappe.get_doc("Internal Wiki", user) - for seq, d in enumerate(pages): - for page in doc.wiki_pages: - if page.title == d.get('title'): - page.idx = seq + 1 - page.parent_page = d.get('parent_page') or "" - break - doc.save(ignore_permissions=True) \ No newline at end of file diff --git a/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py b/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py deleted file mode 100644 index 85623ad41a..0000000000 --- a/frappe/desk/doctype/internal_wiki_page/test_internal_wiki_page.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2021, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestInternalWikiPage(unittest.TestCase): - pass diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index 2fe53c03be..b531274884 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -8,9 +8,11 @@ "engine": "InnoDB", "field_order": [ "label", + "title", + "sequence_id", "for_user", "extends", - "wiki_label", + "parent_page", "module", "category", "icon", @@ -25,8 +27,9 @@ "pin_to_top", "pin_to_bottom", "hide_custom", - "for_wiki", "public", + "content_section", + "content", "section_break_2", "charts_label", "charts", @@ -219,12 +222,6 @@ "fieldtype": "Check", "label": "Is Default" }, - { - "default": "0", - "fieldname": "for_wiki", - "fieldtype": "Check", - "label": "For Wiki" - }, { "default": "0", "fieldname": "public", @@ -232,13 +229,33 @@ "label": "Public" }, { - "fieldname": "wiki_label", + "fieldname": "title", "fieldtype": "Data", - "label": "Wiki Label" + "label": "Title" + }, + { + "fieldname": "parent_page", + "fieldtype": "Data", + "label": "Parent Page" + }, + { + "fieldname": "content_section", + "fieldtype": "Section Break", + "label": "Content" + }, + { + "fieldname": "content", + "fieldtype": "Long Text", + "label": "Content" + }, + { + "fieldname": "sequence_id", + "fieldtype": "Int", + "label": "Sequence Id" } ], "links": [], - "modified": "2021-06-09 18:39:47.947069", + "modified": "2021-07-05 17:41:36.272294", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 2e522e6956..b0b03ca2f0 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -3,9 +3,11 @@ # For license information, please see license.txt import frappe +import json from frappe import _ from frappe.modules.export_file import export_to_files from frappe.model.document import Document +from frappe.desk.desktop import save_new_widget from frappe.desk.utils import validate_route_conflict from json import loads @@ -154,3 +156,102 @@ def get_link_type(key): def get_report_type(report): report_type = frappe.get_value("Report", report, "report_type") return report_type in ["Query Report", "Script Report", "Custom Report"] + + +@frappe.whitelist() +def get_pages(): + has_access = "System Manager" in frappe.get_roles() + fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] + + pages = get_page_list(fields, { 'public': 1 }) + private_pages = get_page_list(fields, { 'for_user': frappe.session.user }) + + if private_pages: + pages.extend(private_pages) + + return { 'pages': pages, 'has_access': has_access } + +@frappe.whitelist() +def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): + save = frappe.parse_json(save) + public = frappe.parse_json(public) + if save: + doc = frappe.new_doc('Workspace') + doc.title = title + doc.content = blocks + doc.parent_page = parent + + if public: + doc.label = title + doc.public = 1 + else: + doc.label = title + "-" + frappe.session.user + doc.for_user = frappe.session.user + doc.save(ignore_permissions=True) + else: + if public: + filters = { + 'public': public, + 'label': title + } + else: + filters = { + 'for_user': frappe.session.user, + 'label': title + "-" + frappe.session.user + } + pages = frappe.get_list("Workspace", filters=filters) + if pages: + doc = frappe.get_doc("Workspace", pages[0]) + + doc.content = blocks + doc.save(ignore_permissions=True) + + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + + if json.loads(new_widgets): + save_new_widget(doc, title, blocks, new_widgets) + + if json.loads(deleted_pages): + return delete_pages(json.loads(deleted_pages)) + + return { "name": title, "public": public } + +def delete_pages(deleted_pages): + for page in deleted_pages: + if page.get("public") and "System Manager" not in frappe.get_roles(): + return { "name": page.get("title"), "public": 1 } + + if frappe.db.exists("Workspace", page.get("name")): + frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) + + return { "name": "Home", "public": 1 } + +def sort_pages(sb_items): + public_pages = [page for page in sb_items if page.get('public')=='1'] + private_pages = [page for page in sb_items if page.get('public')=='0'] + + wspace_public_pages = get_page_list(['name', 'title'], { 'public': 1 }) + wspace_private_pages = get_page_list(['name', 'title'], { 'for_user': frappe.session.user }) + + sort_page(wspace_private_pages, private_pages) + + if "System Manager" in frappe.get_roles(): + sort_page(wspace_public_pages, public_pages) + +def sort_page(wspace_pages, pages): + for seq, d in enumerate(pages): + for page in wspace_pages: + if page.title == d.get('title'): + doc = frappe.get_doc('Workspace', page.name) + doc.sequence_id = seq + 1 + doc.parent_page = d.get('parent_page') or "" + doc.save(ignore_permissions=True) + break + +def get_page_list(fields, filters): + return frappe.get_list("Workspace", + fields=fields, + filters=filters, + order_by='sequence_id asc' + ) diff --git a/frappe/desk/page/wiki/__init__.py b/frappe/desk/page/wiki/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/desk/page/wiki/wiki.js b/frappe/desk/page/wiki/wiki.js deleted file mode 100644 index 6ac8bc89cb..0000000000 --- a/frappe/desk/page/wiki/wiki.js +++ /dev/null @@ -1,15 +0,0 @@ -frappe.provide('frappe.views'); - -frappe.pages['wiki'].on_page_load = function(wrapper) { - frappe.ui.make_app_page({ - parent: wrapper, - name: "Wiki", - single_column: false, - }); - - frappe.wiki = new frappe.views.Wiki(wrapper); - - $(wrapper).bind('show', function () { - frappe.wiki.show(); - }); -}; diff --git a/frappe/desk/page/wiki/wiki.json b/frappe/desk/page/wiki/wiki.json deleted file mode 100644 index f886264e1c..0000000000 --- a/frappe/desk/page/wiki/wiki.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "content": null, - "creation": "2021-05-02 14:50:05.327302", - "docstatus": 0, - "doctype": "Page", - "idx": 0, - "modified": "2021-05-02 14:50:05.327302", - "modified_by": "Administrator", - "module": "Desk", - "name": "wiki", - "owner": "Administrator", - "page_name": "wiki", - "roles": [], - "script": null, - "standard": "Yes", - "style": null, - "system_page": 0, - "title": "Wiki" -} \ No newline at end of file diff --git a/frappe/patches.txt b/frappe/patches.txt index 7605d8ea2b..0d46a2e3dd 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,3 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty +frappe.patches.v13_0.update_workspace diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py new file mode 100644 index 0000000000..6175184716 --- /dev/null +++ b/frappe/patches/v13_0/update_workspace.py @@ -0,0 +1,49 @@ +from hashlib import new +import frappe +import json +from frappe import _ + +def execute(): + frappe.reload_doc('desk', 'doctype', 'workspace', force=True) + order_by = "pin_to_top desc, pin_to_bottom asc, name asc" + for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): + doc = frappe.get_doc('Workspace', wspace.name) + content = create_content(doc) + create_wspace_copy(doc, seq, content) + frappe.db.commit() + +def create_content(doc): + content = [] + if doc.charts: + for c in doc.charts: + content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.shortcuts: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + for s in doc.shortcuts: + content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.links: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + for l in doc.links: + if l.type == 'Card Break': + content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + return content + +def create_wspace_copy(doc, seq, content): + new_doc = frappe.new_doc('Workspace') + new_doc.content = json.dumps(content) + new_doc.sequence_id = seq + 1 + new_doc.charts = doc.charts or [] + new_doc.shortcuts = doc.shortcuts or [] + new_doc.links = doc.links or [] + new_doc.label = doc.label + new_doc.icon = doc.icon + if doc.is_standard: + new_doc.public = 1 + new_doc.title = doc.label + else: + new_doc.for_user = doc.for_user + new_doc.title = doc.extends + doc.delete() + new_doc.insert() \ No newline at end of file diff --git a/frappe/public/build.json b/frappe/public/build.json index 4536e1d4bc..ccdb895366 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -178,7 +178,6 @@ "public/js/frappe/views/breadcrumbs.js", "public/js/frappe/views/factory.js", "public/js/frappe/views/pageview.js", - "public/js/frappe/views/wiki.js", "public/js/frappe/ui/toolbar/awesome_bar.js", "public/js/frappe/ui/toolbar/energy_points_notifications.js", @@ -194,11 +193,10 @@ "public/js/frappe/views/communication.js", "public/js/frappe/views/translation_manager.js", "public/js/frappe/views/workspace/workspace.js", + "public/js/frappe/views/workspace/blocks/index.js", "public/js/frappe/widgets/widget_group.js", - "public/js/frappe/wiki_blocks/blocks.js", - "public/js/frappe/ui/sort_selector.html", "public/js/frappe/ui/sort_selector.js", diff --git a/frappe/public/js/desk.bundle.js b/frappe/public/js/desk.bundle.js index 0f75ae2d6a..b243de205a 100644 --- a/frappe/public/js/desk.bundle.js +++ b/frappe/public/js/desk.bundle.js @@ -67,7 +67,6 @@ import "./frappe/views/container.js"; import "./frappe/views/breadcrumbs.js"; import "./frappe/views/factory.js"; import "./frappe/views/pageview.js"; -import "./frappe/views/wiki.js"; import "./frappe/ui/toolbar/awesome_bar.js"; // import "./frappe/ui/toolbar/energy_points_notifications.js"; @@ -83,11 +82,10 @@ import "./frappe/ui/toolbar/toolbar.js"; import "./frappe/views/communication.js"; import "./frappe/views/translation_manager.js"; import "./frappe/views/workspace/workspace.js"; +import "./frappe/views/workspace/blocks/index.js"; import "./frappe/widgets/widget_group.js"; -import "./frappe/wiki_blocks/blocks.js"; - import "./frappe/ui/sort_selector.html"; import "./frappe/ui/sort_selector.js"; diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 46812f5fb6..7de0ddd2b5 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -285,7 +285,7 @@ frappe.Application = class Application { frappe.workspaces = {}; for (let page of frappe.boot.allowed_workspaces || []) { frappe.modules[page.module]=page; - frappe.workspaces[frappe.router.slug(page.name)] = page; + frappe.workspaces[frappe.router.slug(page.title)] = page; } if (!frappe.workspaces['home']) { // default workspace is settings for Frappe diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 05f97cf24c..0781127071 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -119,7 +119,7 @@ frappe.router = { convert_to_standard_route(route) { // /app/settings = ["Workspaces", "Settings"] - // /app/wiki/accounting = ["wiki", "Accounting"] + // /app/private/settings = ["Workspaces", "private", "Settings"] // /app/user = ["List", "User"] // /app/user/view/report = ["List", "User", "Report"] // /app/user/view/tree = ["Tree", "User"] @@ -128,11 +128,11 @@ frappe.router = { // /app/event/view/calendar/default = ["List", "Event", "Calendar", "Default"] if (frappe.workspaces[route[0]]) { - // workspace - route = ['Workspaces', frappe.workspaces[route[0]].name]; - } else if (frappe.wiki_pages && frappe.wiki_pages[route[1]]) { - // wiki-pages - route = ['wiki', frappe.wiki_pages[route[1]].name]; + // public workspace + route = ['Workspaces', frappe.workspaces[route[0]].title]; + } else if (frappe.workspaces[route[1]]) { + // private workspace + route = ['Workspaces', 'private', frappe.workspaces[route[1]].title]; } else if (this.routes[route[0]]) { // route route = this.set_doctype_route(route); @@ -141,6 +141,11 @@ frappe.router = { return route; }, + doctype_route_exist(route) { + route = this.get_sub_path_string(route).split('/'); + return this.routes[route[0]] + }, + set_doctype_route(route) { let doctype_route = this.routes[route[0]]; // doctype route diff --git a/frappe/public/js/frappe/views/wiki.js b/frappe/public/js/frappe/views/wiki.js deleted file mode 100644 index fa3e43b656..0000000000 --- a/frappe/public/js/frappe/views/wiki.js +++ /dev/null @@ -1,594 +0,0 @@ -import EditorJS from '@editorjs/editorjs'; -import Undo from 'editorjs-undo'; - -frappe.views.Wiki = class Wiki { - constructor(wrapper) { - this.wrapper = $(wrapper); - this.page = wrapper.page; - this.pages = {}; - this.sections = {}; - this.sidebar_items = {}; - this.sorted_sidebar_items = []; - this.deleted_sidebar_items = []; - this.isReadOnly = true; - this.new_page = null; - this.prepare_container(); - this.setup_wiki_pages(); - this.tools = { - header: { - class: frappe.wiki_block.blocks['header'], - inlineToolbar: true - }, - paragraph: { - class: frappe.wiki_block.blocks['paragraph'], - inlineToolbar: true - }, - chart: { - class: frappe.wiki_block.blocks['chart'], - config: { - page_data: this.page_data || [] - } - }, - card: { - class: frappe.wiki_block.blocks['card'], - config: { - page_data: this.page_data || [] - } - }, - shortcut: { - class: frappe.wiki_block.blocks['shortcut'], - config: { - page_data: this.page_data || [] - } - }, - spacer: frappe.wiki_block.blocks['spacer'], - spacingTune: frappe.wiki_block.tunes['spacing_tune'], - }; - } - - prepare_container() { - let list_sidebar = $(` - - `).appendTo(this.wrapper.find(".layout-side-section")); - this.sidebar = list_sidebar.find(".desk-sidebar"); - this.body = this.wrapper.find(".layout-main-section"); - } - - setup_wiki_pages() { - this.get_wiki_pages().then(pages => { - this.all_pages = pages.pages; - this.has_access = pages.has_access; - if (this.all_pages) { - frappe.wiki_pages = {}; - for (let page of this.all_pages) { - frappe.wiki_pages[frappe.router.slug(page.title)] = {name: page.title}; - } - if (this.new_page) { - if (!frappe.wiki_pages[frappe.router.slug(this.new_page)]) { - this.new_page = this.all_pages[0].title; - } - frappe.set_route(`wiki/${frappe.router.slug(this.new_page)}`); - this.new_page = null; - } - this.make_sidebar(); - frappe.router.route(); - } - }); - } - - get_wiki_pages() { - return frappe.xcall("frappe.desk.doctype.internal_wiki.internal_wiki.get_wiki_pages"); - } - - sidebar_item_container(item) { - return $(` -
    -
    - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.title} - -
    -
    -
    - `); - } - - make_sidebar() { - if (this.sidebar.find('.standard-sidebar-section')[0]) { - this.sidebar.find('.standard-sidebar-section')[0].remove(); - } - let root_pages = this.all_pages.filter(page => page.parent_page == '' || page.parent_page == null); - let sidebar_section = $(`
    `); - this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); - } - - prepare_sidebar(items, child_container, item_container) { - items.forEach(item => this.append_item(item, child_container)); - child_container.appendTo(item_container); - } - - append_item(item, container) { - let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show()); - if (is_current_page) { - item.selected = true; - this.current_page_name = item.title; - } - - let $item_container = this.sidebar_item_container(item); - let sidebar_control = $item_container.find('.sidebar-item-control'); - - this.add_sidebar_actions(item, sidebar_control); - - let child_items = this.all_pages.filter(page => page.parent_page == item.title); - if (child_items.length > 0) { - let child_container = $(``); - this.prepare_sidebar(child_items, child_container, $item_container); - } - - $item_container.appendTo(container); - this.sidebar_items[item.title] = $item_container; - - if ($item_container.parent().hasClass('hidden') && is_current_page) { - $item_container.parent().toggleClass('hidden'); - } - - this.add_drop_icon(item, sidebar_control, $item_container); - } - - add_drop_icon(item, sidebar_control, item_container) { - let $child_item_section = item_container.find('.sidebar-child-item'); - let $drop_icon = $(``) - .appendTo(sidebar_control); - - if (this.all_pages.some(e => e.parent_page == item.title)) { - $drop_icon.removeClass('hidden'); - $drop_icon.on('click', () => { - let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; - $drop_icon.find("use").attr("href", icon); - $child_item_section.toggleClass("hidden"); - }); - } - } - - show() { - if (!this.all_pages) { - // pages not yet loaded, call again after a bit - setTimeout(() => { - this.show(); - }, 100); - return; - } - - let page = this.get_page_to_show(); - this.page.set_title(`${__(page)}`); - - this.show_page(page); - } - - get_data(page) { - return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: page, - wiki: true - }).then(data => { - this.page_data = data; - this.pages[page] && delete this.pages[page]; - this.pages[page] = data; - if (!this.page_data || Object.keys(this.page_data).length === 0) return; - - return frappe.dashboard_utils.get_dashboard_settings().then(settings => { - let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.page_data.charts && this.page_data.charts.items) { - this.page_data.charts.items.map(chart => { - chart.chart_settings = chart_config[chart.chart_name] || {}; - }); - } - }); - }); - } - - get_page_to_show() { - let default_page; - - if (localStorage.current_wiki_page) { - default_page = localStorage.current_wiki_page; - } else if (Object.keys(this.all_pages).length !== 0) { - default_page = this.all_pages[0].title; - } else { - default_page = "Build"; - } - - let page = frappe.get_route()[1] || default_page; - return page; - } - - show_page(page) { - if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { - this.sidebar_items[this.current_page_name][0].firstElementChild.classList.remove("selected"); - this.sidebar_items[page][0].firstElementChild.classList.add("selected"); - - if (this.sidebar_items[page].parents('.sidebar-item-container')[0]) { - this.sidebar_items[page] - .parents('.sidebar-item-container') - .find('.drop-icon use') - .attr("href", "#icon-small-up"); - } - } - - this.current_page_name = page; - localStorage.current_wiki_page = page; - - if (!this.body.find('#editorjs')[0]) { - this.$page = $(` -
    - `).appendTo(this.body); - } - - if (this.all_pages) { - let this_page = this.all_pages.filter(p => p.title == page)[0]; - this.setup_actions(page); - this.content = this_page && JSON.parse(this_page.content); - if (this.pages[page]) { - this.page_data = this.pages[page]; - this.prepare_editorjs(); - } else { - this.get_data(page).then(() => { - this.prepare_editorjs(); - }); - } - } - } - - prepare_editorjs() { - if (this.editor) { - this.editor.isReady.then(() => { - this.editor.configuration.tools.chart.config.page_data = this.page_data; - this.editor.configuration.tools.shortcut.config.page_data = this.page_data; - this.editor.configuration.tools.card.config.page_data = this.page_data; - this.editor.render({ - blocks: this.content || [] - }); - }); - } else { - this.initialize_editorjs(this.content); - } - } - - setup_actions(page) { - let this_page = this.all_pages.filter(p => p.title == page)[0]; - - if (!this.isReadOnly) { - this.setup_customization_buttons(this_page.is_editable); - return; - } - - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - this_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { - if (!this.editor || !this.editor.readOnly) return; - this.isReadOnly = false; - this.editor.readOnly.toggle(); - this.editor.isReady - .then(() => { - this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - }); - }); - - this.page.add_inner_button(__("Create Page"), () => { - this.initialize_new_page(); - }); - } - - initialize_editorjs_undo() { - this.undo = new Undo({ editor: this.editor }); - this.undo.initialize({blocks: this.content || []}); - this.undo.readOnly = false; - } - - setup_customization_buttons(is_editable) { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.page.clear_inner_toolbar(); - - is_editable && this.page.set_primary_action( - __("Save Customizations"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.undo.readOnly = true; - this.save_page(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - }, - null, - __("Saving") - ); - - this.page.set_secondary_action( - __("Discard"), - () => { - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.editor.readOnly.toggle(); - this.isReadOnly = true; - this.deleted_sidebar_items = []; - this.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - } - ); - } - - show_sidebar_actions() { - this.sidebar.find('.standard-sidebar-section').addClass('show-control'); - } - - add_sidebar_actions(item, sidebar_control) { - if (!item.is_editable) { - $(`${frappe.utils.icon("lock", "sm")}`) - .appendTo(sidebar_control); - sidebar_control.find('.sidebar-info').click(() => { - frappe.show_alert({ - message: __("Only owner can sort of edit this page"), - indicator: 'info' - }, 5); - }); - } else { - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - sidebar_control - ); - frappe.utils.add_custom_button( - frappe.utils.icon('delete', 'xs'), - () => this.delete_page(item), - "delete-page", - `${__('Delete')}`, - null, - sidebar_control - ); - } - } - - delete_page(item) { - frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { - this.deleted_sidebar_items.push(item); - this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"]`).addClass('hidden'); - }); - } - - make_sidebar_sortable() { - let me = this; - $('.nested-container').each( function() { - new Sortable(this, { - handle: ".drag-handle", - draggable: ".sidebar-item-container.is-draggable", - group: 'nested', - animation: 150, - fallbackOnBody: true, - swapThreshold: 0.65, - onEnd: function () { - me.prepare_sorted_sidebar(); - } - }); - }); - } - - prepare_sorted_sidebar() { - this.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { - let parent_page = ""; - if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { - parent_page = page.parentElement.parentElement.attributes["item-name"].value; - } - this.sorted_sidebar_items.push({ - title: page.attributes['item-name'].value, - parent_page: parent_page - }); - } - } - - make_blocks_sortable() { - let me = this; - this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { - handle: ".drag-handle", - draggable: ".ce-block", - animation: 150, - onEnd: function (evt) { - me.editor.blocks.move(evt.newIndex, evt.oldIndex); - }, - setData: function () { - //Do Nothing - } - }); - } - - initialize_new_page() { - let parent_pages = this.all_pages - .filter(page => !page.parent_page && page.parent_wiki != "Default") - .map(page => page.title); - if (this.has_access) { - parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); - } - parent_pages.unshift(''); - const d = new frappe.ui.Dialog({ - title: __('Set Title'), - fields: [ - { - label: __('Title'), - fieldtype: 'Data', - fieldname: 'title', - reqd: 1 - }, - { - label: __('Parent'), - fieldtype: 'Select', - fieldname: 'parent', - options: parent_pages - }, - { - label: __('Public'), - fieldtype: 'Check', - fieldname: 'public', - depends_on: `eval:${this.has_access}` - } - ], - primary_action_label: __('Create'), - primary_action: (values) => { - if (this.all_pages.filter(p => p.title == values.title)[0]) { - frappe.throw(__("Page with title '{0}' already exist.", [__(values.title)])); - return; - } - d.hide(); - this.initialize_editorjs_undo(); - this.setup_customization_buttons(true); - this.title = values.title; - this.parent = values.parent; - this.public = values.public; - this.editor.render({ - blocks: [ - { - type: "header", - data: { - text: this.title, - level: 4 - } - } - ] - }).then(() => { - if (this.editor.configuration.readOnly) { - this.isReadOnly = false; - this.editor.readOnly.toggle(); - } - this.add_page_to_sidebar(values); - this.show_sidebar_actions(); - this.make_sidebar_sortable(); - this.make_blocks_sortable(); - this.prepare_sorted_sidebar(); - }); - } - }); - d.show(); - } - - add_page_to_sidebar({title, parent}) { - let $sidebar = $('.standard-sidebar-section'); - let item = { - title: title, - parent_page: parent - }; - let $sidebar_item = this.sidebar_item_container(item); - - frappe.utils.add_custom_button( - frappe.utils.icon('drag', 'xs'), - null, - "drag-handle", - `${__('Drag')}`, - null, - $sidebar_item.find('.sidebar-item-control') - ); - - if (!parent) { - $sidebar_item.appendTo($sidebar); - } else { - let $item_container = $sidebar.find(`[item-name="${parent}"]`); - let $child_section = $item_container.find('.sidebar-child-item'); - let $drop_icon = $item_container.find('.drop-icon'); - if (!$child_section[0]) { - $child_section = $(``) - .appendTo($item_container); - $drop_icon.toggleClass('hidden'); - } - $sidebar_item.appendTo($child_section); - $child_section.removeClass('hidden'); - $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); - } - } - - initialize_editorjs(blocks) { - this.editor = new EditorJS({ - data: { - blocks: blocks || [] - }, - tools: this.tools, - autofocus: false, - tunes: ['spacingTune'], - readOnly: true, - logLevel: 'ERROR' - }); - } - - save_page() { - frappe.dom.freeze(); - let save = true; - if (!this.title && this.current_page_name) { - this.title = this.current_page_name; - this.public = this.all_pages.filter(p => p.title == this.title)[0].parent_wiki == "Default"; - save = false; - } else { - this.current_page_name = this.title; - } - let me = this; - this.editor.save().then((outputData) => { - let new_widgets = {}; - outputData.blocks.forEach(item => { - if (item.data.new) { - if (!new_widgets[item.type]) { - new_widgets[item.type] = []; - } - new_widgets[item.type].push(item.data.new); - delete item.data['new']; - } - }); - - frappe.call({ - method: "frappe.desk.doctype.internal_wiki.internal_wiki.save_wiki_page", - args: { - title: me.title, - parent: me.parent || '', - public: me.public || 0, - sb_items: me.sorted_sidebar_items, - deleted_pages: me.deleted_sidebar_items, - new_widgets: new_widgets, - blocks: JSON.stringify(outputData.blocks), - save: save - }, - callback: function(res) { - frappe.dom.unfreeze(); - if (res.message) { - frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); - me.pages[res.message] && delete me.pages[res.message]; - me.title = ''; - me.parent = ''; - me.public = false; - me.sorted_sidebar_items = []; - me.deleted_sidebar_items = []; - me.new_page = res.message; - me.reload(); - } - } - }); - }).catch((error) => { - error; - // console.log('Saving failed: ', error); - }); - } - - reload() { - this.setup_wiki_pages(); - this.undo.readOnly = true; - } -}; diff --git a/frappe/public/js/frappe/wiki_blocks/block.js b/frappe/public/js/frappe/views/workspace/blocks/block.js similarity index 98% rename from frappe/public/js/frappe/wiki_blocks/block.js rename to frappe/public/js/frappe/views/workspace/blocks/block.js index dde93b3887..8ae9610096 100644 --- a/frappe/public/js/frappe/wiki_blocks/block.js +++ b/frappe/public/js/frappe/views/workspace/blocks/block.js @@ -1,4 +1,4 @@ -import get_dialog_constructor from "../widgets/widget_dialog.js"; +import get_dialog_constructor from "../../../widgets/widget_dialog.js"; export default class Block { constructor(opts) { diff --git a/frappe/public/js/frappe/wiki_blocks/card.js b/frappe/public/js/frappe/views/workspace/blocks/card.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/card.js rename to frappe/public/js/frappe/views/workspace/blocks/card.js diff --git a/frappe/public/js/frappe/wiki_blocks/chart.js b/frappe/public/js/frappe/views/workspace/blocks/chart.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/chart.js rename to frappe/public/js/frappe/views/workspace/blocks/chart.js diff --git a/frappe/public/js/frappe/wiki_blocks/header.js b/frappe/public/js/frappe/views/workspace/blocks/header.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/header.js rename to frappe/public/js/frappe/views/workspace/blocks/header.js diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js new file mode 100644 index 0000000000..d8b303133f --- /dev/null +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -0,0 +1,25 @@ +// import blocks +import Header from "./header"; +import Paragraph from "./paragraph"; +import Card from "./card"; +import Chart from "./chart"; +import Shortcut from "./shortcut"; +import Spacer from "./spacer"; + +// import tunes +import SpacingTune from "./spacing_tune"; + +frappe.provide("frappe.wspace_block"); + +frappe.wspace_block.blocks = { + header: Header, + paragraph: Paragraph, + card: Card, + chart: Chart, + shortcut: Shortcut, + spacer: Spacer, +}; + +frappe.wspace_block.tunes = { + spacing_tune: SpacingTune +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/paragraph.js b/frappe/public/js/frappe/views/workspace/blocks/paragraph.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/paragraph.js rename to frappe/public/js/frappe/views/workspace/blocks/paragraph.js diff --git a/frappe/public/js/frappe/wiki_blocks/shortcut.js b/frappe/public/js/frappe/views/workspace/blocks/shortcut.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/shortcut.js rename to frappe/public/js/frappe/views/workspace/blocks/shortcut.js diff --git a/frappe/public/js/frappe/wiki_blocks/spacer.js b/frappe/public/js/frappe/views/workspace/blocks/spacer.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/spacer.js rename to frappe/public/js/frappe/views/workspace/blocks/spacer.js diff --git a/frappe/public/js/frappe/wiki_blocks/spacing_tune.js b/frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js similarity index 100% rename from frappe/public/js/frappe/wiki_blocks/spacing_tune.js rename to frappe/public/js/frappe/views/workspace/blocks/spacing_tune.js diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 80f8c00705..8a4f49a8a3 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -1,3 +1,6 @@ +import EditorJS from '@editorjs/editorjs'; +import Undo from 'editorjs-undo'; + frappe.standard_pages['Workspaces'] = function() { var wrapper = frappe.container.add_page('Workspaces'); @@ -17,37 +20,51 @@ frappe.views.Workspace = class Workspace { constructor(wrapper) { this.wrapper = $(wrapper); this.page = wrapper.page; - this.prepare_container(); - this.show_or_hide_sidebar(); - this.setup_dropdown(); - this.pages = {}; - this.sidebar_items = {}; - this.sidebar_categories = [ - "Modules", - "Domains", - "Places", - "Administration" - ]; - - this.setup_workspaces(); - this.make_sidebar(); - } - - setup_workspaces() { - // workspaces grouped by categories - this.workspaces = {}; - for (let page of frappe.boot.allowed_workspaces) { - if (!this.workspaces[page.category]) { - this.workspaces[page.category] = []; - } - this.workspaces[page.category].push(page); + this.isReadOnly = true; + this.new_page = null; + this.sorted_sidebar_items = []; + this.deleted_sidebar_items = []; + this.sidebar_items = { + 'public': {}, + 'private': {} } - } + this.sidebar_categories = [ + "Public", + frappe.user.first_name() + ]; + this.tools = { + header: { + class: frappe.wspace_block.blocks['header'], + inlineToolbar: true + }, + paragraph: { + class: frappe.wspace_block.blocks['paragraph'], + inlineToolbar: true + }, + chart: { + class: frappe.wspace_block.blocks['chart'], + config: { + page_data: this.page_data || [] + } + }, + card: { + class: frappe.wspace_block.blocks['card'], + config: { + page_data: this.page_data || [] + } + }, + shortcut: { + class: frappe.wspace_block.blocks['shortcut'], + config: { + page_data: this.page_data || [] + } + }, + spacer: frappe.wspace_block.blocks['spacer'], + spacingTune: frappe.wspace_block.tunes['spacing_tune'], + }; - show() { - let page = this.get_page_to_show(); - this.page.set_title(`${__(page)}`); - this.show_page(page); + this.prepare_container(); + this.setup_pages(); } prepare_container() { @@ -57,229 +74,175 @@ frappe.views.Workspace = class Workspace {
    `).appendTo(this.wrapper.find(".layout-side-section")); this.sidebar = list_sidebar.find(".desk-sidebar"); - this.body = this.wrapper.find(".layout-main-section"); } - get_page_to_show() { - let default_page; + setup_pages() { + this.get_pages().then(pages => { + this.all_pages = pages.pages; + this.has_access = pages.has_access; - if (localStorage.current_workspace) { - default_page = localStorage.current_workspace; - } else if (this.workspaces) { - default_page = this.workspaces["Modules"][0].name; - } else if (frappe.boot.allowed_workspaces) { - default_page = frappe.boot.allowed_workspaces[0].name; - } else { - default_page = "Build"; - } + this.all_pages.forEach(page => { + page.is_editable = !page.public || pages.has_access; + }); - let page = frappe.get_route()[1] || default_page; - return page; + this.public_pages = this.all_pages.filter(page => page.public); + this.private_pages = this.all_pages.filter(page => !page.public); + + if (this.all_pages) { + frappe.workspaces = {}; + for (let page of this.all_pages) { + frappe.workspaces[frappe.router.slug(page.title)] = {title: page.title}; + } + if (this.new_page && this.new_page.name) { + if (!frappe.workspaces[frappe.router.slug(this.new_page.name)]) { + this.new_page = { name:this.all_pages[0].title, public:this.all_pages[0].public }; + } + if (this.new_page.public) { + frappe.set_route(`${frappe.router.slug(this.new_page.name)}`); + } else{ + frappe.set_route(`private/${frappe.router.slug(this.new_page.name)}`); + } + this.new_page = null; + } + this.make_sidebar(); + frappe.router.route(); + } + }); + } + + get_pages() { + return frappe.xcall("frappe.desk.doctype.workspace.workspace.get_pages"); + } + + sidebar_item_container(item) { + return $(` +
    +
    + + ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${item.title} + +
    +
    +
    + `); } make_sidebar() { + if (this.sidebar.find('.standard-sidebar-section')[0]) { + this.sidebar.find('.standard-sidebar-section').remove(); + } + this.sidebar_categories.forEach(category => { - if (this.workspaces[category]) { - this.build_sidebar_section(category, this.workspaces[category]); + let root_pages = this.public_pages.filter(page => page.parent_page == '' || page.parent_page == null); + if (category != 'Public') { + root_pages = this.private_pages.filter(page => page.parent_page == '' || page.parent_page == null); } + this.build_sidebar_section(category, root_pages); }); } - build_sidebar_section(title, items) { - let sidebar_section = $(`
    `); + build_sidebar_section(title, root_pages) { + let sidebar_section = $(`
    `); - // DO NOT REMOVE: Comment to load translation - // __("Modules") __("Domains") __("Places") __("Administration") - $(`
    ${__(title)}
    `) - .appendTo(sidebar_section); + let $title = $(`
    + ${frappe.utils.icon("small-down", "xs")} + ${__(title)} +
    `).appendTo(sidebar_section); + this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); - const get_sidebar_item = function (item) { - return $(` - - ${frappe.utils.icon(item.icon || "folder-normal", "md")} - ${item.label || item.name} - - `); - }; + $title.on('click', (e) => { + let icon = $(e.target).find("span use").attr("href")==="#icon-small-down" ? "#icon-right" : "#icon-small-down"; + $(e.target).find("span use").attr("href", icon); + $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); + }) - const make_sidebar_category_item = item => { - if (item.name == this.get_page_to_show()) { - item.selected = true; - this.current_page_name = item.name; - } - - let $item = get_sidebar_item(item); - - $item.appendTo(sidebar_section); - this.sidebar_items[item.name] = $item; - }; - - items.forEach(item => make_sidebar_category_item(item)); - - sidebar_section.appendTo(this.sidebar); - } - - show_page(page) { - if (this.current_page_name && this.pages[this.current_page_name]) { - this.pages[this.current_page_name].hide(); - } - - if (this.sidebar_items && this.sidebar_items[this.current_page_name]) { - this.sidebar_items[this.current_page_name].removeClass("selected"); - this.sidebar_items[page].addClass("selected"); - } - this.current_page_name = page; - localStorage.current_workspace = page; - - this.pages[page] ? this.pages[page].show() : this.make_page(page); - this.current_page = this.pages[page]; - this.setup_dropdown(); - } - - make_page(page) { - const $page = new DesktopPage({ - container: this.body, - page_name: page - }); - - this.pages[page] = $page; - return $page; - } - - customize() { - if (this.current_page && this.current_page.allow_customization) { - this.page.clear_menu(); - this.current_page.customize(); - - this.page.set_primary_action( - __("Save Customizations"), - () => { - this.current_page.save_customization(); - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.setup_dropdown(); - }, - null, - __("Saving") - ); - - this.page.set_secondary_action( - __("Discard"), - () => { - this.current_page.reload(); - frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); - this.page.clear_primary_action(); - this.page.clear_secondary_action(); - this.setup_dropdown(); - } - ); + if (Object.keys(root_pages).length === 0) { + sidebar_section.addClass('hidden'); } } - setup_dropdown() { - this.page.clear_menu(); - - this.page.set_secondary_action(__('Customize'), () => { - this.customize(); - }); - - this.page.add_menu_item(__('Reset Customizations'), () => { - this.current_page.reset_customization(); - }, 1); - - this.page.add_menu_item(__('Toggle Sidebar'), () => { - this.toggle_side_bar(); - }, 1); + prepare_sidebar(items, child_container, item_container) { + items.forEach(item => this.append_item(item, child_container)); + child_container.appendTo(item_container); } - toggle_side_bar() { - let show_workspace_sidebar = JSON.parse(localStorage.show_workspace_sidebar || "true"); - show_workspace_sidebar = !show_workspace_sidebar; - localStorage.show_workspace_sidebar = show_workspace_sidebar; - this.show_or_hide_sidebar(); - $(document.body).trigger("toggleDeskSidebar"); + append_item(item, container) { + let is_current_page = frappe.router.slug(item.title) == frappe.router.slug(this.get_page_to_show().name) + && item.public == this.get_page_to_show().public; + if (is_current_page) { + item.selected = true; + this.current_page = { name: item.title, public: item.public }; + } + + let $item_container = this.sidebar_item_container(item); + let sidebar_control = $item_container.find('.sidebar-item-control'); + + this.add_sidebar_actions(item, sidebar_control); + let pages = item.public ? this.public_pages : this.private_pages; + + let child_items = pages.filter(page => page.parent_page == item.title); + if (child_items.length > 0) { + let child_container = $(``); + this.prepare_sidebar(child_items, child_container, $item_container); + } + + $item_container.appendTo(container); + this.sidebar_items[item.public ? 'public' : 'private'][item.title] = $item_container; + + if ($item_container.parent().hasClass('hidden') && is_current_page) { + $item_container.parent().toggleClass('hidden'); + } + + this.add_drop_icon(item, sidebar_control, $item_container); } - show_or_hide_sidebar() { - let show_workspace_sidebar = JSON.parse(localStorage.show_workspace_sidebar || "true"); - $('#page-workspace .layout-side-section').toggleClass('hidden', !show_workspace_sidebar); - } -}; - -class DesktopPage { - constructor({ container, page_name }) { - frappe.desk_page = this; - this.container = container; - this.page_name = page_name; - this.sections = {}; - this.allow_customization = false; - this.reload(); - } - - show() { - frappe.desk_page = this; - this.page.show(); - if (this.sections.shortcuts) { - this.sections.shortcuts.widgets_list.forEach(wid => { - wid.set_actions(); + add_drop_icon(item, sidebar_control, item_container) { + let $child_item_section = item_container.find('.sidebar-child-item'); + let $drop_icon = $(``) + .appendTo(sidebar_control); + let pages = item.public ? this.public_pages : this.private_pages; + if (pages.some(e => e.parent_page == item.title)) { + $drop_icon.removeClass('hidden'); + $drop_icon.on('click', () => { + let icon = $drop_icon.find("use").attr("href")==="#icon-small-down" ? "#icon-small-up" : "#icon-small-down"; + $drop_icon.find("use").attr("href", icon); + $child_item_section.toggleClass("hidden"); }); } } - hide() { - this.page.hide(); - } - - reload() { - this.in_customize_mode = false; - this.page && this.page.remove(); - this.make(); - } - - make() { - this.page = $(`
    `); - this.page.append(frappe.render_template('workspace_loading_skeleton')); - this.page.appendTo(this.container); - - this.get_data().then(() => { - if (Object.keys(this.data).length == 0) { - delete localStorage.current_workspace; - frappe.set_route("workspace"); - return; - } - this.refresh(); - }).finally(this.page.find('.workspace_loading_skeleton').remove); - } - - refresh() { - this.page.empty(); - this.allow_customization = this.data.allow_customization || false; - - if (frappe.is_mobile()) { - this.allow_customization = false; + show() { + if (!this.all_pages) { + // pages not yet loaded, call again after a bit + setTimeout(() => this.show(), 100); + return; } - this.data.onboarding && this.data.onboarding.items.length && this.make_onboarding(); - this.make_charts(); - this.make_shortcuts(); - this.make_cards(); + let page = { + name: this.get_page_to_show().name, + public: this.get_page_to_show().public + } + this.page.set_title(`${__(page.name)}`); + + this.show_page(page); } - get_data() { + get_data(page) { return frappe.xcall("frappe.desk.desktop.get_desktop_page", { - page: this.page_name + page: page }).then(data => { - this.data = data; - if (Object.keys(this.data).length == 0) return; + this.page_data = data; + if (!this.page_data || Object.keys(this.page_data).length === 0) return; return frappe.dashboard_utils.get_dashboard_settings().then(settings => { let chart_config = settings.chart_config ? JSON.parse(settings.chart_config) : {}; - if (this.data.charts.items) { - this.data.charts.items.map(chart => { + if (this.page_data.charts && this.page_data.charts.items) { + this.page_data.charts.items.map(chart => { chart.chart_settings = chart_config[chart.chart_name] || {}; }); } @@ -287,128 +250,429 @@ class DesktopPage { }); } - customize() { - if (this.in_customize_mode) { + get_page_to_show() { + let default_page; + + if (localStorage.current_page) { + default_page = { name:localStorage.current_page, public:localStorage.is_current_page_public == 'true' }; + } else if (Object.keys(this.all_pages).length !== 0) { + default_page = { name:this.all_pages[0].title, public:true }; + } else { + default_page = { name:"Build", public:true }; + } + + let page = (frappe.get_route()[1] == 'private' ? frappe.get_route()[2] : frappe.get_route()[1]) || default_page.name; + let is_public = frappe.get_route()[1] ? frappe.get_route()[1] != 'private' : default_page.public; + return { name:page, public:is_public }; + } + + show_page(page) { + let section = this.current_page.public ? 'public' : 'private'; + if (this.sidebar_items && this.sidebar_items[section] && this.sidebar_items[section][this.current_page.name]) { + this.sidebar_items[section][this.current_page.name][0].firstElementChild.classList.remove("selected"); + this.sidebar_items[page.public ? 'public':'private'][page.name][0].firstElementChild.classList.add("selected"); + + if (this.sidebar_items[page.public ? 'public':'private'][page.name].parents('.sidebar-item-container')[0]) { + this.sidebar_items[page.public ? 'public':'private'][page.name] + .parents('.sidebar-item-container') + .find('.drop-icon use') + .attr("href", "#icon-small-up"); + } + } + + this.current_page = { name:page.name, public:page.public }; + localStorage.current_page = page.name; + localStorage.is_current_page_public = page.public; + + if (!this.body.find('#editorjs')[0]) { + this.$page = $(` +
    + `).appendTo(this.body); + } + this.$page.prepend(frappe.render_template('workspace_loading_skeleton')); + this.$page.find('.codex-editor').addClass('hidden'); + + if (this.all_pages) { + let pages = page.public ? this.public_pages : this.private_pages; + let this_page = pages.filter(p => p.title == page.name)[0]; + this.setup_actions(page); + this.content = this_page && JSON.parse(this_page.content); + $('.item-anchor').addClass('disable-click'); + this.get_data(this_page).then(() => { + this.prepare_editorjs(); + $('.item-anchor').removeClass('disable-click'); + this.$page.find('.codex-editor').removeClass('hidden'); + this.$page.find('.workspace-skeleton').remove(); + }); + } + } + + prepare_editorjs() { + if (this.editor) { + this.editor.isReady.then(() => { + this.editor.configuration.tools.chart.config.page_data = this.page_data; + this.editor.configuration.tools.shortcut.config.page_data = this.page_data; + this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.render({ blocks: this.content || [] }); + }); + } else { + this.initialize_editorjs(this.content); + } + } + + setup_actions(page) { + let pages = page.public ? this.public_pages : this.private_pages; + let current_page = pages.filter(p => p.title == page.name)[0]; + + if (!this.isReadOnly) { + this.setup_customization_buttons(current_page.is_editable); return; } - // We need to remove this as the chart group will be visible during customization - $('.widget.onboarding-widget-box').hide(); + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); - Object.keys(this.sections).forEach(section => { - this.sections[section].customize(); + current_page.is_editable && this.page.set_secondary_action(__("Customize"), () => { + if (!this.editor || !this.editor.readOnly) return; + this.isReadOnly = false; + this.editor.readOnly.toggle(); + this.editor.isReady.then(() => { + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + }); }); - this.in_customize_mode = true; + this.page.add_inner_button(__("Create Page"), () => { + this.initialize_new_page(); + }); } - save_customization() { - frappe.dom.freeze(); - const config = {}; + initialize_editorjs_undo() { + this.undo = new Undo({ editor: this.editor }); + this.undo.initialize({ blocks: this.content || [] }); + this.undo.readOnly = false; + } - if (this.sections.charts) config.charts = this.sections.charts.get_widget_config(); - if (this.sections.shortcuts) config.shortcuts = this.sections.shortcuts.get_widget_config(); - if (this.sections.cards) config.cards = this.sections.cards.get_widget_config(); + setup_customization_buttons(is_editable) { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.page.clear_inner_toolbar(); - frappe.call('frappe.desk.desktop.save_customization', { - page: this.page_name, - config: config - }).then(res => { - frappe.dom.unfreeze(); - if (res.message) { - frappe.show_alert({ message: __("Customizations Saved Successfully"), indicator: "green" }); + is_editable && this.page.set_primary_action( + __("Save Customizations"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.undo.readOnly = true; + this.save_page(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + }, + null, + __("Saving") + ); + + this.page.set_secondary_action( + __("Discard"), + () => { + this.page.clear_primary_action(); + this.page.clear_secondary_action(); + this.editor.readOnly.toggle(); + this.isReadOnly = true; + this.deleted_sidebar_items = []; this.reload(); + frappe.show_alert({ message: __("Customizations Discarded"), indicator: "info" }); + } + ); + } + + show_sidebar_actions() { + this.sidebar.find('.standard-sidebar-section').addClass('show-control'); + } + + add_sidebar_actions(item, sidebar_control) { + if (!item.is_editable) { + $(`${frappe.utils.icon("lock", "sm")}`) + .appendTo(sidebar_control); + sidebar_control.find('.sidebar-info').click(() => { + frappe.show_alert({ + message: __("Only owner can sort of edit this page"), + indicator: 'info' + }, 5); + }); + } else { + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + sidebar_control + ); + frappe.utils.add_custom_button( + frappe.utils.icon('delete', 'xs'), + () => this.delete_page(item), + "delete-page", + `${__('Delete')}`, + null, + sidebar_control + ); + } + } + + delete_page(item) { + frappe.confirm(__("Are you sure you want to delete page {0}?", [item.title]), () => { + this.deleted_sidebar_items.push(item); + this.sidebar.find(`.standard-sidebar-section [item-name="${item.title}"][item-public="${item.public}"]`).addClass('hidden'); + }); + } + + make_sidebar_sortable() { + let me = this; + $('.nested-container').each( function() { + new Sortable(this, { + handle: ".drag-handle", + draggable: ".sidebar-item-container.is-draggable", + group: 'nested', + animation: 150, + fallbackOnBody: true, + swapThreshold: 0.65, + onEnd: function () { + me.prepare_sorted_sidebar(); + } + }); + }); + } + + prepare_sorted_sidebar() { + this.sorted_sidebar_items = []; + for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + let parent_page = ""; + if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { + parent_page = page.parentElement.parentElement.attributes["item-name"].value; + } + this.sorted_sidebar_items.push({ + title: page.attributes['item-name'].value, + parent_page: parent_page, + public: page.attributes['item-public'].value + }); + } + } + + make_blocks_sortable() { + let me = this; + this.page_sortable = Sortable.create(this.page.main.find(".codex-editor__redactor").get(0), { + handle: ".drag-handle", + draggable: ".ce-block", + animation: 150, + onEnd: function (evt) { + me.editor.blocks.move(evt.newIndex, evt.oldIndex); + }, + setData: function () { + //Do Nothing + } + }); + } + + initialize_new_page() { + let parent_pages = this.private_pages.filter(page => !page.parent_page).map(page => page.title); + + if (this.has_access) { + parent_pages = this.all_pages.filter(page => !page.parent_page).map(page => page.title); + } + parent_pages.unshift(''); + const d = new frappe.ui.Dialog({ + title: __('Set Title'), + fields: [ + { + label: __('Title'), + fieldtype: 'Data', + fieldname: 'title', + reqd: 1 + }, + { + label: __('Parent'), + fieldtype: 'Select', + fieldname: 'parent', + options: parent_pages + }, + { + label: __('Public'), + fieldtype: 'Check', + fieldname: 'is_public', + depends_on: `eval:${this.has_access}` + } + ], + primary_action_label: __('Create'), + primary_action: (values) => { + if (!this.validate_page(values)) return; + d.hide(); + this.initialize_editorjs_undo(); + this.setup_customization_buttons(true); + this.title = values.title; + this.parent = values.parent; + this.public = values.is_public; + this.editor.render({ + blocks: [ + { + type: "header", + data: { + text: this.title, + level: 4 + } + } + ] + }).then(() => { + if (this.editor.configuration.readOnly) { + this.isReadOnly = false; + this.editor.readOnly.toggle(); + } + this.add_page_to_sidebar(values); + this.show_sidebar_actions(); + this.make_sidebar_sortable(); + this.make_blocks_sortable(); + this.prepare_sorted_sidebar(); + }); + } + }); + d.show(); + } + + validate_page(values) { + let message = ""; + let pages = values.is_public ? this.public_pages : this.private_pages; + + if (pages && pages.filter(p => p.title == values.title)[0]) { + message = "Page with title '{0}' already exist."; + } else if (frappe.router.doctype_route_exist(frappe.router.slug(values.title))) { + message = "Doctype with same route already exist. Please choose different title."; + } + + if (message) { + frappe.throw(__(message, [__(values.title)])); + return false; + } + return true; + } + + add_page_to_sidebar({title, parent, is_public}) { + let $sidebar = $('.standard-sidebar-section'); + let item = { + title: title, + parent_page: parent, + public: is_public + }; + let $sidebar_item = this.sidebar_item_container(item); + $sidebar_item.addClass('is-draggable'); + + frappe.utils.add_custom_button( + frappe.utils.icon('drag', 'xs'), + null, + "drag-handle", + `${__('Drag')}`, + null, + $sidebar_item.find('.sidebar-item-control') + ); + $sidebar_item.find('.sidebar-item-control .drag-handle').css('margin-right', '8px'); + + if (!parent) { + if (is_public) { + $sidebar_item.appendTo($sidebar[0]); } else { - frappe.throw({ message: __("Something went wrong while saving customizations"), indicator: "red" }); - this.reload(); + $sidebar.last().removeClass('hidden'); + $sidebar_item.appendTo($sidebar[1]); } - }); - } - - reset_customization() { - frappe.call('frappe.desk.desktop.reset_customization', { - page: this.page_name - }).then(() => { - frappe.show_alert({ message: __("Removed page customizations"), indicator: "green" }); - this.reload(); - }); - } - - make_onboarding() { - this.onboarding_widget = frappe.widget.make_widget({ - label: this.data.onboarding.label || __("Let's Get Started"), - subtitle: this.data.onboarding.subtitle, - steps: this.data.onboarding.items, - success: this.data.onboarding.success, - docs_url: this.data.onboarding.docs_url, - user_can_dismiss: this.data.onboarding.user_can_dismiss, - widget_type: 'onboarding', - container: this.page, - options: { - allow_sorting: false, - allow_create: false, - allow_delete: false, - allow_hiding: false, - allow_edit: false, - max_widget_count: 2, + } else { + let $item_container = $sidebar.find(`[item-name="${parent}"]`); + let $child_section = $item_container.find('.sidebar-child-item'); + let $drop_icon = $item_container.find('.drop-icon'); + if (!$child_section[0]) { + $child_section = $(``) + .appendTo($item_container); + $drop_icon.toggleClass('hidden'); } - }); + $sidebar_item.appendTo($child_section); + $child_section.removeClass('hidden'); + $item_container.find('.drop-icon use').attr("href", "#icon-small-up"); + } + this.make_sidebar_sortable(); } - make_charts() { - this.sections["charts"] = new frappe.widget.WidgetGroup({ - container: this.page, - type: "chart", - columns: 1, - class_name: "widget-charts", - hidden: Boolean(this.onboarding_widget), - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - max_widget_count: 2, + initialize_editorjs(blocks) { + this.editor = new EditorJS({ + data: { + blocks: blocks || [] }, - widgets: this.data.charts.items + tools: this.tools, + autofocus: false, + tunes: ['spacingTune'], + readOnly: true, + logLevel: 'ERROR' }); } - make_shortcuts() { - this.sections["shortcuts"] = new frappe.widget.WidgetGroup({ - title: this.data.shortcuts.label || __('Your Shortcuts'), - container: this.page, - type: "shortcut", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: this.allow_customization, - allow_delete: this.allow_customization, - allow_hiding: false, - allow_edit: true, - }, - widgets: this.data.shortcuts.items + save_page() { + frappe.dom.freeze(); + let save = true; + if (!this.title && this.current_page) { + let pages = this.current_page.public ? this.public_pages : this.private_pages; + this.title = this.current_page.name; + this.public = pages.filter(p => p.title == this.title)[0].public; + save = false; + } else { + this.current_page = { name: this.title, public: this.public }; + } + let me = this; + this.editor.save().then((outputData) => { + let new_widgets = {}; + outputData.blocks.forEach(item => { + if (item.data.new) { + if (!new_widgets[item.type]) { + new_widgets[item.type] = []; + } + new_widgets[item.type].push(item.data.new); + delete item.data['new']; + } + }); + + frappe.call({ + method: "frappe.desk.doctype.workspace.workspace.save_page", + args: { + title: me.title, + parent: me.parent || '', + public: me.public || 0, + sb_items: me.sorted_sidebar_items, + deleted_pages: me.deleted_sidebar_items, + new_widgets: new_widgets, + blocks: JSON.stringify(outputData.blocks), + save: save + }, + callback: function(res) { + frappe.dom.unfreeze(); + if (res.message) { + frappe.show_alert({ message: __("Page Saved Successfully"), indicator: "green" }); + me.new_page = res.message; + me.title = ''; + me.parent = ''; + me.public = false; + me.sorted_sidebar_items = []; + me.deleted_sidebar_items = []; + me.reload(); + } + } + }); + }).catch((error) => { + error; + // console.log('Saving failed: ', error); }); } - make_cards() { - let cards = new frappe.widget.WidgetGroup({ - title: this.data.cards.label || __("Reports & Masters"), - container: this.page, - type: "links", - columns: 3, - options: { - allow_sorting: this.allow_customization, - allow_create: false, - allow_delete: false, - allow_hiding: this.allow_customization, - allow_edit: false, - }, - widgets: this.data.cards.items - }); - - this.sections["cards"] = cards; + reload() { + this.setup_pages(); + this.undo.readOnly = true; } -} - - +}; \ No newline at end of file diff --git a/frappe/public/js/frappe/wiki_blocks/blocks.js b/frappe/public/js/frappe/wiki_blocks/blocks.js deleted file mode 100644 index dc69db66ca..0000000000 --- a/frappe/public/js/frappe/wiki_blocks/blocks.js +++ /dev/null @@ -1,25 +0,0 @@ -// import blocks -import Header from "../wiki_blocks/header"; -import Paragraph from "../wiki_blocks/paragraph"; -import Card from "../wiki_blocks/card"; -import Chart from "../wiki_blocks/chart"; -import Shortcut from "../wiki_blocks/shortcut"; -import Spacer from "../wiki_blocks/spacer"; - -// import tunes -import SpacingTune from "../wiki_blocks/spacing_tune"; - -frappe.provide("frappe.wiki_block"); - -frappe.wiki_block.blocks = { - header: Header, - paragraph: Paragraph, - card: Card, - chart: Chart, - shortcut: Shortcut, - spacer: Spacer, -}; - -frappe.wiki_block.tunes = { - spacing_tune: SpacingTune -}; \ No newline at end of file diff --git a/frappe/public/scss/desk/desktop.scss b/frappe/public/scss/desk/desktop.scss index ac3b1a4f7c..8644310e52 100644 --- a/frappe/public/scss/desk/desktop.scss +++ b/frappe/public/scss/desk/desktop.scss @@ -9,6 +9,11 @@ body { .standard-sidebar-label { font-size: var(--text-xs); text-transform: uppercase; + cursor: pointer; + + span { + pointer-events: none; + } } .standard-sidebar-section { @@ -781,4 +786,248 @@ body { } } } + + .standard-sidebar-item { + justify-content: space-between; + padding: 0px; + + .sidebar-item-control { + + > * { + align-self: center; + margin-left: 3px; + box-shadow: none; + } + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + display: none; + } + + .delete-page { + display: none; + } + + .drop-icon { + padding: 10px 12px 10px 2px; + } + + .sidebar-info { + display: none; + } + + svg { + margin-right: 0; + } + } + + .sidebar-item-label { + flex: 1; + } + + .item-anchor { + display: flex; + overflow: hidden; + padding: 8px 0px 8px 12px; + flex: 1; + } + } + + .sidebar-item-container { + .sidebar-item-container{ + margin-left: 10px; + + .standard-sidebar-item { + justify-content: start; + } + } + } + + .standard-sidebar-section.show-control { + .desk-sidebar-item.standard-sidebar-item { + + &:hover, &.selected { + .drag-handle { + display: inline-block; + } + + .delete-page { + display: inline-block; + margin-right: 8px; + } + + .sidebar-info { + display: inline-block; + margin-right: 8px; + } + + .drop-icon { + padding: 10px 8px 10px 2px; + margin-left: -4px; + } + } + + .block-click { + pointer-events:none; + } + } + } + + .codex-editor { + min-height: 630px; + + .codex-editor__redactor{ + display: flex; + flex-wrap: wrap; + flex-direction: row; + margin: 0px -7px; + padding-bottom: 20px !important; + + .ce-block{ + width: 100%; + padding-left: 0; + padding-right: 0; + + &.ce-block--selected { + .ce-block__content { + background-color: inherit; + } + } + + .ce-block__content { + max-width: 100%; + height: 100%; + padding: 7px; + + &> div { + height: 100%; + } + + .tune-btn > * { + pointer-events: none; + } + + .ce-header { + padding: 0 !important; + margin-bottom: 0 !important; + flex: 1; + } + + .widget{ + &.header { + display: flex; + justify-content: center; + flex: 1; + padding-left: 15px !important; + padding-right: 15px !important; + min-height: 50px; + box-shadow: none; + background-color: var(--control-bg); + color: var(--text-muted); + } + + &:focus { + outline: none; + } + + &.new-widget { + align-items: inherit; + } + + .paragraph-control { + display: flex; + flex-direction: row-reverse; + position: absolute; + right: 20px; + gap: 5px; + background-color: var(--card-bg); + padding-left: 5px; + + .drag-handle { + cursor: all-scroll; + cursor: -webkit-grabbing; + } + } + } + } + } + } + + svg { + fill: none; + } + + .ce-toolbar { + svg { + fill: currentColor; + } + + .icon { + stroke: none; + width: fit-content; + } + + .ce-settings { + width: fit-content; + + .cdx-settings-button.disabled{ + pointer-events: none; + opacity: .5 + } + .cdx-settings-sidebar{ + position: absolute; + right: 100%; + top:0; + background: #fff; + width: 108px; + height: 145px; + box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); + border-radius: 0 4px 4px 0;z-index: 0; + } + } + + .ce-toolbar__settings-btn { + display: none; + } + } + + .ce-inline-tool, .ce-inline-toolbar__dropdown { + .icon { + fill: currentColor; + } + } + + @media (min-width: 1199px) { + .ce-toolbar__content { + max-width: 930px; + } + } + @media (max-width: 995px) { + .ce-toolbar__content { + max-width: 760px; + } + } + + @media (max-width: 1199px) { + .ce-block.col-4 { + flex: 0 0 50%; + max-width: 50%; + } + } + + @media (max-width: 750px) { + .ce-block.col-4 { + flex: 0 0 100%; + max-width: 100%; + } + } + @media (max-width: 750px) { + .ce-block.col-6 { + flex: 0 0 100%; + max-width: 100%; + } + } + + } } diff --git a/frappe/public/scss/desk/index.scss b/frappe/public/scss/desk/index.scss index 446aa25d20..c5b8271a36 100644 --- a/frappe/public/scss/desk/index.scss +++ b/frappe/public/scss/desk/index.scss @@ -25,7 +25,6 @@ @import "notification"; @import "global_search"; @import "desktop"; -@import "wiki"; @import "../common/awesomeplete"; @import "sidebar"; @import "filters"; diff --git a/frappe/public/scss/desk/wiki.scss b/frappe/public/scss/desk/wiki.scss deleted file mode 100644 index 517e2a8182..0000000000 --- a/frappe/public/scss/desk/wiki.scss +++ /dev/null @@ -1,274 +0,0 @@ -[data-page-route="wiki"] { - @media (min-width: map-get($grid-breakpoints, "lg")) { - .layout-main { - height: calc(100vh - var(--navbar-height) - var(--page-head-height) - 5px); - .layout-side-section, .layout-main-section-wrapper { - height: 100%; - overflow-y: auto; - padding-right: 25px; - scrollbar-color: var(--gray-200) transparent; - [data-theme="dark"] & { - scrollbar-color: var(--gray-800) transparent; - } - - &::-webkit-scrollbar-track { - background: transparent; - } - - &::-webkit-scrollbar-thumb { - background: var(--gray-200); - [data-theme="dark"] & { - background: var(--gray-800); - } - } - } - - .desk-sidebar { - margin-bottom: var(--margin-2xl); - } - } - } - - .standard-sidebar-item { - justify-content: space-between; - padding: 0px; - - .sidebar-item-control { - - > * { - align-self: center; - margin-left: 3px; - box-shadow: none; - } - - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; - display: none; - } - - .delete-page { - display: none; - } - - .drop-icon { - padding: 10px 12px 10px 2px; - } - - .sidebar-info { - display: none; - } - - svg { - margin-right: 0; - } - } - - .sidebar-item-label { - flex: 1; - } - - .item-anchor { - display: flex; - overflow: hidden; - padding: 8px 0px 8px 12px; - flex: 1; - } - } - - .sidebar-item-container { - .sidebar-item-container{ - margin-left: 10px; - - .standard-sidebar-item { - justify-content: start; - } - } - } - - .standard-sidebar-section.show-control { - .desk-sidebar-item.standard-sidebar-item { - - &:hover, &.selected { - .drag-handle { - display: inline-block; - } - - .delete-page { - display: inline-block; - margin-right: 8px; - } - - .sidebar-info { - display: inline-block; - } - - .drop-icon { - padding: 10px 8px 10px 2px; - margin-left: -4px; - } - } - - .block-click { - pointer-events:none; - } - } - } -} - -.codex-editor { - min-height: 630px; - - .codex-editor__redactor{ - display: flex; - flex-wrap: wrap; - flex-direction: row; - margin: 0px -7px; - padding-bottom: 20px !important; - - .ce-block{ - width: 100%; - padding-left: 0; - padding-right: 0; - - &.ce-block--selected { - .ce-block__content { - background-color: inherit; - } - } - - .ce-block__content { - max-width: 100%; - height: 100%; - padding: 7px; - - &> div { - height: 100%; - } - - .tune-btn > * { - pointer-events: none; - } - - .ce-header { - padding: 0 !important; - margin-bottom: 0 !important; - flex: 1; - } - - .widget{ - &.header { - display: flex; - justify-content: center; - flex: 1; - padding-left: 15px !important; - padding-right: 15px !important; - min-height: 50px; - box-shadow: none; - background-color: var(--control-bg); - color: var(--text-muted); - } - - &:focus { - outline: none; - } - - &.new-widget { - align-items: inherit; - } - - .paragraph-control { - display: flex; - flex-direction: row-reverse; - position: absolute; - right: 20px; - gap: 5px; - background-color: var(--card-bg); - padding-left: 5px; - - .drag-handle { - cursor: all-scroll; - cursor: -webkit-grabbing; - } - } - } - } - } - } - - svg { - fill: none; - } - - .ce-toolbar { - svg { - fill: currentColor; - } - - .icon { - stroke: none; - width: fit-content; - } - - .ce-settings { - width: fit-content; - - .cdx-settings-button.disabled{ - pointer-events: none; - opacity: .5 - } - .cdx-settings-sidebar{ - position: absolute; - right: 100%; - top:0; - background: #fff; - width: 108px; - height: 145px; - box-shadow: 0 3px 15px -3px rgba(13,20,33,.13); - border-radius: 0 4px 4px 0;z-index: 0; - } - } - - .ce-toolbar__settings-btn { - display: none; - } - } - - .ce-inline-tool, .ce-inline-toolbar__dropdown { - .icon { - fill: currentColor; - } - } - - @media (min-width: 1199px) { - .ce-toolbar__content { - max-width: 930px; - } - } - @media (max-width: 995px) { - .ce-toolbar__content { - max-width: 760px; - } - } - - @media (max-width: 1199px) { - .ce-block.col-4 { - flex: 0 0 50%; - max-width: 50%; - } - } - - @media (max-width: 750px) { - .ce-block.col-4 { - flex: 0 0 100%; - max-width: 100%; - } - } - @media (max-width: 750px) { - .ce-block.col-6 { - flex: 0 0 100%; - max-width: 100%; - } - } - -} \ No newline at end of file From dd39b539a971b82d44639b5b05cf8cb55a3afe75 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 10:33:26 +0530 Subject: [PATCH 0331/1519] fix: sider fix --- frappe/desk/doctype/workspace/workspace.py | 22 ++++++++----------- frappe/patches/v13_0/update_workspace.py | 3 +-- frappe/public/js/frappe/router.js | 2 +- frappe/public/js/frappe/utils/utils.js | 2 +- .../js/frappe/views/workspace/workspace.js | 20 ++++++++--------- 5 files changed, 22 insertions(+), 27 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index ed542a0fd2..4eede2211e 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -163,13 +163,13 @@ def get_pages(): has_access = "System Manager" in frappe.get_roles() fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] - pages = get_page_list(fields, { 'public': 1 }) - private_pages = get_page_list(fields, { 'for_user': frappe.session.user }) + pages = get_page_list(fields, {'public': 1}) + private_pages = get_page_list(fields, {'for_user': frappe.session.user}) if private_pages: pages.extend(private_pages) - return { 'pages': pages, 'has_access': has_access } + return {'pages': pages, 'has_access': has_access} @frappe.whitelist() def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): @@ -215,24 +215,24 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) - return { "name": title, "public": public } + return {"name": title, "public": public} def delete_pages(deleted_pages): for page in deleted_pages: if page.get("public") and "System Manager" not in frappe.get_roles(): - return { "name": page.get("title"), "public": 1 } + return {"name": page.get("title"), "public": 1} if frappe.db.exists("Workspace", page.get("name")): frappe.get_doc("Workspace", page.get("name")).delete(ignore_permissions=True) - return { "name": "Home", "public": 1 } + return {"name": "Home", "public": 1} def sort_pages(sb_items): public_pages = [page for page in sb_items if page.get('public')=='1'] private_pages = [page for page in sb_items if page.get('public')=='0'] - wspace_public_pages = get_page_list(['name', 'title'], { 'public': 1 }) - wspace_private_pages = get_page_list(['name', 'title'], { 'for_user': frappe.session.user }) + wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) + wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) sort_page(wspace_private_pages, private_pages) @@ -250,8 +250,4 @@ def sort_page(wspace_pages, pages): break def get_page_list(fields, filters): - return frappe.get_list("Workspace", - fields=fields, - filters=filters, - order_by='sequence_id asc' - ) + return frappe.get_list("Workspace", fields=fields, filters=filters, order_by='sequence_id asc') diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index 6175184716..737e151796 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -1,11 +1,10 @@ -from hashlib import new import frappe import json from frappe import _ def execute(): frappe.reload_doc('desk', 'doctype', 'workspace', force=True) - order_by = "pin_to_top desc, pin_to_bottom asc, name asc" + order_by = "is_standard asc, pin_to_top desc, pin_to_bottom asc, name asc" for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 0781127071..dd2cbb430c 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -143,7 +143,7 @@ frappe.router = { doctype_route_exist(route) { route = this.get_sub_path_string(route).split('/'); - return this.routes[route[0]] + return this.routes[route[0]]; }, set_doctype_route(route) { diff --git a/frappe/public/js/frappe/utils/utils.js b/frappe/public/js/frappe/utils/utils.js index a366ca15a3..36dac31184 100644 --- a/frappe/public/js/frappe/utils/utils.js +++ b/frappe/public/js/frappe/utils/utils.js @@ -1334,7 +1334,7 @@ Object.assign(frappe.utils, { }); !prepend && button.appendTo(wrapper); prepend && wrapper.prepend(button); - }, + }, sleep(time) { return new Promise((resolve) => setTimeout(resolve, time)); diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 8a4f49a8a3..5d07d5e453 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -27,7 +27,7 @@ frappe.views.Workspace = class Workspace { this.sidebar_items = { 'public': {}, 'private': {} - } + }; this.sidebar_categories = [ "Public", frappe.user.first_name() @@ -96,11 +96,11 @@ frappe.views.Workspace = class Workspace { } if (this.new_page && this.new_page.name) { if (!frappe.workspaces[frappe.router.slug(this.new_page.name)]) { - this.new_page = { name:this.all_pages[0].title, public:this.all_pages[0].public }; + this.new_page = { name: this.all_pages[0].title, public: this.all_pages[0].public }; } if (this.new_page.public) { frappe.set_route(`${frappe.router.slug(this.new_page.name)}`); - } else{ + } else { frappe.set_route(`private/${frappe.router.slug(this.new_page.name)}`); } this.new_page = null; @@ -159,7 +159,7 @@ frappe.views.Workspace = class Workspace { let icon = $(e.target).find("span use").attr("href")==="#icon-small-down" ? "#icon-right" : "#icon-small-down"; $(e.target).find("span use").attr("href", icon); $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); - }) + }); if (Object.keys(root_pages).length === 0) { sidebar_section.addClass('hidden'); @@ -226,7 +226,7 @@ frappe.views.Workspace = class Workspace { let page = { name: this.get_page_to_show().name, public: this.get_page_to_show().public - } + }; this.page.set_title(`${__(page.name)}`); this.show_page(page); @@ -254,16 +254,16 @@ frappe.views.Workspace = class Workspace { let default_page; if (localStorage.current_page) { - default_page = { name:localStorage.current_page, public:localStorage.is_current_page_public == 'true' }; + default_page = { name: localStorage.current_page, public: localStorage.is_current_page_public == 'true' }; } else if (Object.keys(this.all_pages).length !== 0) { - default_page = { name:this.all_pages[0].title, public:true }; + default_page = { name: this.all_pages[0].title, public: true }; } else { - default_page = { name:"Build", public:true }; + default_page = { name: "Build", public: true }; } let page = (frappe.get_route()[1] == 'private' ? frappe.get_route()[2] : frappe.get_route()[1]) || default_page.name; let is_public = frappe.get_route()[1] ? frappe.get_route()[1] != 'private' : default_page.public; - return { name:page, public:is_public }; + return { name: page, public: is_public }; } show_page(page) { @@ -280,7 +280,7 @@ frappe.views.Workspace = class Workspace { } } - this.current_page = { name:page.name, public:page.public }; + this.current_page = { name: page.name, public: page.public }; localStorage.current_page = page.name; localStorage.is_current_page_public = page.public; From bda2a26528458baa7f25127253d55018dc030f48 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 12:01:33 +0530 Subject: [PATCH 0332/1519] fix: Updated patch --- frappe/patches/v13_0/update_workspace.py | 40 ++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index 737e151796..d8fcabce50 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -8,7 +8,7 @@ def execute(): for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) - create_wspace_copy(doc, seq, content) + update_wspace(doc, seq, content) frappe.db.commit() def create_content(doc): @@ -29,20 +29,28 @@ def create_content(doc): content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) return content -def create_wspace_copy(doc, seq, content): - new_doc = frappe.new_doc('Workspace') - new_doc.content = json.dumps(content) - new_doc.sequence_id = seq + 1 - new_doc.charts = doc.charts or [] - new_doc.shortcuts = doc.shortcuts or [] - new_doc.links = doc.links or [] - new_doc.label = doc.label - new_doc.icon = doc.icon +def update_wspace(doc, seq, content): + doc.sequence_id = seq + 1 + doc.content = json.dumps(content) if doc.is_standard: - new_doc.public = 1 - new_doc.title = doc.label + doc.public = 1 + doc.for_user = '' + doc.title = doc.label else: - new_doc.for_user = doc.for_user - new_doc.title = doc.extends - doc.delete() - new_doc.insert() \ No newline at end of file + doc.public = 0 + doc.for_user = doc.for_user + doc.title = doc.extends + doc.extends = '' + doc.module = '' + doc.category = '' + doc.restrict_to_domain = '' + doc.onboarding = '' + doc.extends_another_page = 0 + doc.is_default = 0 + doc.is_standard = 0 + doc.developer_mode_only = 0 + doc.disable_user_customization = 0 + doc.pin_to_top = 0 + doc.pin_to_bottom = 0 + doc.hide_custom = 0 + doc.save() \ No newline at end of file From 60322c58e1e371ce14ac47c6b579625eb7865a53 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 7 Jul 2021 12:29:45 +0530 Subject: [PATCH 0333/1519] fix: init driver only if necessary --- frappe/public/js/frappe/form/form_tour.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index 5f4920f415..0cdefa1968 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -2,8 +2,6 @@ frappe.ui.form.FormTour = class FormTour { constructor({ frm }) { this.frm = frm; this.driver_steps = []; - - this.init_driver(); } init_driver() { @@ -48,6 +46,7 @@ frappe.ui.form.FormTour = class FormTour { if (on_finish) this.on_finish = on_finish; + this.init_driver(); this.build_steps(); this.update_driver_steps(); } From acf46c4ddd604da766d50cb5c44a16b847a0d59f Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 7 Jul 2021 12:31:04 +0530 Subject: [PATCH 0334/1519] fix: add missing semicolon --- frappe/public/js/frappe/form/form_tour.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index 0cdefa1968..ee18db055e 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -38,7 +38,7 @@ frappe.ui.form.FormTour = class FormTour { } else { const doctype_tour_exists = await frappe.db.exists('Form Tour', this.frm.doctype); if (doctype_tour_exists) { - this.tour = await frappe.db.get_doc('Form Tour', this.frm.doctype) + this.tour = await frappe.db.get_doc('Form Tour', this.frm.doctype); } else { this.tour = { steps: frappe.tour[this.frm.doctype] }; } From e9ec018b23c4af7ecd314051e3aa58401c6fe177 Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Wed, 7 Jul 2021 12:40:40 +0530 Subject: [PATCH 0335/1519] revert: "feat: submit on completion" --- frappe/desk/doctype/form_tour/form_tour.json | 10 +---- frappe/public/js/frappe/form/form_tour.js | 42 ++------------------ 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/frappe/desk/doctype/form_tour/form_tour.json b/frappe/desk/doctype/form_tour/form_tour.json index 44f39766b3..e4ea528fcc 100644 --- a/frappe/desk/doctype/form_tour/form_tour.json +++ b/frappe/desk/doctype/form_tour/form_tour.json @@ -11,7 +11,6 @@ "module", "is_standard", "save_on_complete", - "submit_on_complete", "section_break_3", "steps" ], @@ -63,18 +62,11 @@ "label": "Module", "options": "Module Def", "read_only": 1 - }, - { - "default": "0", - "depends_on": "save_on_complete", - "fieldname": "submit_on_complete", - "fieldtype": "Check", - "label": "Submit on Completion" } ], "index_web_pages_for_search": 1, "links": [], - "modified": "2021-06-29 15:23:26.893068", + "modified": "2021-06-06 20:32:54.068774", "modified_by": "Administrator", "module": "Desk", "name": "Form Tour", diff --git a/frappe/public/js/frappe/form/form_tour.js b/frappe/public/js/frappe/form/form_tour.js index ee18db055e..6bef2a0cb8 100644 --- a/frappe/public/js/frappe/form/form_tour.js +++ b/frappe/public/js/frappe/form/form_tour.js @@ -15,9 +15,8 @@ frappe.ui.form.FormTour = class FormTour { prevBtnText: 'Previous', opacity: 0.25, onHighlighted: (step) => { - // if last step is to save, or if is submit step - // then attach a listener on highlighted elem to reset the driver - if ((step.options.is_save_step && !this.driver.hasNextStep())|| step.options.is_submit_step) { + // if last step is to save, then attach a listener to save button + if (step.options.is_save_step) { $(step.options.element).one('click', () => this.driver.reset()); } @@ -74,10 +73,6 @@ frappe.ui.form.FormTour = class FormTour { if (this.tour.save_on_complete) { this.add_step_to_save(); } - - if (this.tour.submit_on_complete) { - this.add_step_to_submit(); - } } is_next_condition_satisfied(step) { @@ -259,37 +254,6 @@ frappe.ui.form.FormTour = class FormTour { } }; this.driver_steps.push(save_step); - - let after_save = () => this.on_finish && this.on_finish(); - - if (this.tour.submit_on_complete) { - after_save = () => { - this.update_driver_steps(); - this.driver.start(this.driver.steps.length - 1); - } - } - frappe.ui.form.on(this.frm.doctype, 'after_save', after_save); - } - - add_step_to_submit() { - const page_id = `[id="page-${this.frm.doctype}"]`; - const $submit_btn = `${page_id} .standard-actions .primary-action`; - const submit_step = { - element: $submit_btn, - is_submit_step: true, - allowClose: false, - overlayClickNext: false, - popover: { - title: __("Submit"), - description: "", - position: "left", - doneBtnText: __("Submit") - }, - onNext: () => { - this.frm.savesubmit(); - } - }; - this.driver_steps.push(submit_step); - frappe.ui.form.on(this.frm.doctype, 'after_submit', () => this.on_finish && this.on_finish()); + frappe.ui.form.on(this.frm.doctype, 'after_save', () => this.on_finish && this.on_finish()); } }; \ No newline at end of file From f052af56636b0be09f3ddebf2178c64a30eb8b4e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 14:38:48 +0530 Subject: [PATCH 0336/1519] fix: updated patch to remove invalid links --- frappe/patches/v13_0/update_workspace.py | 15 +++++++++++++++ .../public/js/frappe/views/workspace/workspace.js | 1 + 2 files changed, 16 insertions(+) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index d8fcabce50..c93e4e230a 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -14,19 +14,34 @@ def execute(): def create_content(doc): content = [] if doc.charts: + invalid_links = [] for c in doc.charts: content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if c.get_invalid_links()[0]: + invalid_links.append(c) + for l in invalid_links: + del doc.charts[doc.charts.index(l)] if doc.shortcuts: + invalid_links = [] content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if s.get_invalid_links()[0]: + invalid_links.append(s) + for l in invalid_links: + del doc.shortcuts[doc.shortcuts.index(l)] if doc.links: + invalid_links = [] content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.cards_label or _("Reports & Masters"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in doc.links: if l.type == 'Card Break': content.append({"type":"card","data":{"card_name":l.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) + if l.get_invalid_links()[0]: + invalid_links.append(l) + for l in invalid_links: + del doc.links[doc.links.index(l)] return content def update_wspace(doc, seq, content): diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 5d07d5e453..2bc21060bd 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -24,6 +24,7 @@ frappe.views.Workspace = class Workspace { this.new_page = null; this.sorted_sidebar_items = []; this.deleted_sidebar_items = []; + this.current_page = {}; this.sidebar_items = { 'public': {}, 'private': {} From 8cfe63f32ef901df9c9d4515046722f268d6888b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 15:05:05 +0530 Subject: [PATCH 0337/1519] fix: updated patch --- frappe/patches/v13_0/update_workspace.py | 42 ++++++++++-------------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace.py index c93e4e230a..89eaef8fb2 100644 --- a/frappe/patches/v13_0/update_workspace.py +++ b/frappe/patches/v13_0/update_workspace.py @@ -16,9 +16,10 @@ def create_content(doc): if doc.charts: invalid_links = [] for c in doc.charts: - content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) if c.get_invalid_links()[0]: invalid_links.append(c) + else: + content.append({"type":"chart","data":{"chart_name":c.label,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in invalid_links: del doc.charts[doc.charts.index(l)] if doc.shortcuts: @@ -26,9 +27,10 @@ def create_content(doc): content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: - content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) if s.get_invalid_links()[0]: invalid_links.append(s) + else: + content.append({"type":"shortcut","data":{"shortcut_name":s.label,"col":4,"pt":0,"pr":0,"pb":0,"pl":0}}) for l in invalid_links: del doc.shortcuts[doc.shortcuts.index(l)] if doc.links: @@ -45,27 +47,19 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - doc.sequence_id = seq + 1 - doc.content = json.dumps(content) + new_doc = frappe.new_doc('Workspace') + new_doc.label = doc.label + new_doc.icon = doc.icon + new_doc.sequence_id = seq + 1 + new_doc.content = json.dumps(content) + new_doc.charts = doc.charts or [] + new_doc.shortcuts = doc.shortcuts or [] + new_doc.links = doc.links or [] if doc.is_standard: - doc.public = 1 - doc.for_user = '' - doc.title = doc.label + new_doc.public = 1 + new_doc.title = doc.label else: - doc.public = 0 - doc.for_user = doc.for_user - doc.title = doc.extends - doc.extends = '' - doc.module = '' - doc.category = '' - doc.restrict_to_domain = '' - doc.onboarding = '' - doc.extends_another_page = 0 - doc.is_default = 0 - doc.is_standard = 0 - doc.developer_mode_only = 0 - doc.disable_user_customization = 0 - doc.pin_to_top = 0 - doc.pin_to_bottom = 0 - doc.hide_custom = 0 - doc.save() \ No newline at end of file + new_doc.for_user = doc.for_user + new_doc.title = doc.extends + doc.delete() + new_doc.save() \ No newline at end of file From 7454c455a82c88e57028fd4cf64463c9eceb80df Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 15:26:20 +0530 Subject: [PATCH 0338/1519] fix: updated patch name --- frappe/patches.txt | 2 +- .../v13_0/{update_workspace.py => update_workspace2_0.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename frappe/patches/v13_0/{update_workspace.py => update_workspace2_0.py} (100%) diff --git a/frappe/patches.txt b/frappe/patches.txt index 0d46a2e3dd..1287dfb990 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,4 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.update_workspace +frappe.patches.v13_0.update_workspace2_0 diff --git a/frappe/patches/v13_0/update_workspace.py b/frappe/patches/v13_0/update_workspace2_0.py similarity index 100% rename from frappe/patches/v13_0/update_workspace.py rename to frappe/patches/v13_0/update_workspace2_0.py From d25252b1e16f4292bec32ed130e6afc4451d0f37 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Wed, 7 Jul 2021 15:52:19 +0530 Subject: [PATCH 0339/1519] perf: Index workflow action fields (#13622) * feat: add number format parameter in doc.get_formatted * fix: add test cases * fix: test_document test * fix: test_document test fix * fix: readding test for test_formatter * perf: add indexes in workflow action * chore: commit auto created file * Revert "feat: add number format parameter in doc.get_formatted" This reverts commit 6bdcae1201de560971dc882c901ad18eb7f71f26. * Revert "fix: add test cases" This reverts commit 4bafae6e38d898096c49ce2bf5600f0772f05f17. * Revert "fix: test_document test" This reverts commit 3336915dae72836ff85396f2c344422348bc9e8d. * Revert "fix: readding test for test_formatter" This reverts commit f5e40141af794ae770df3c39ee130a8509b07f50. * chore: remove unwanted changes * chore: remove unwanted changes Co-authored-by: Kenneth Sequeira --- .../workflow_action/test_workflow_action.py | 8 + .../workflow_action/workflow_action.json | 223 ++---------------- 2 files changed, 27 insertions(+), 204 deletions(-) create mode 100644 frappe/workflow/doctype/workflow_action/test_workflow_action.py diff --git a/frappe/workflow/doctype/workflow_action/test_workflow_action.py b/frappe/workflow/doctype/workflow_action/test_workflow_action.py new file mode 100644 index 0000000000..a2f4f26193 --- /dev/null +++ b/frappe/workflow/doctype/workflow_action/test_workflow_action.py @@ -0,0 +1,8 @@ +# Copyright (c) 2021, Frappe Technologies and Contributors +# See license.txt + +# import frappe +import unittest + +class TestWorkflowAction(unittest.TestCase): + pass diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.json b/frappe/workflow/doctype/workflow_action/workflow_action.json index 810f22c184..f1290d001f 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.json +++ b/frappe/workflow/doctype/workflow_action/workflow_action.json @@ -1,262 +1,77 @@ { - "allow_copy": 0, - "allow_events_in_timeline": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "", - "beta": 0, + "actions": [], "creation": "2018-05-17 18:29:03.923384", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "status", + "reference_name", + "reference_doctype", + "user", + "workflow_state", + "completed_by" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "status", "fieldtype": "Select", - "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": "Status", - "length": 0, - "no_copy": 0, - "options": "Open\nCompleted", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "options": "Open\nCompleted" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "reference_name", "fieldtype": "Dynamic Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Reference Name", - "length": 0, - "no_copy": 0, "options": "reference_doctype", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "search_index": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "reference_doctype", "fieldtype": "Link", - "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": "Reference Document Type", - "length": 0, - "no_copy": 0, "options": "DocType", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "search_index": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "user", "fieldtype": "Link", "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "User", - "length": 0, - "no_copy": 0, "options": "User", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "search_index": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "workflow_state", "fieldtype": "Data", "hidden": 1, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Workflow State", - "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": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "search_index": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "completed_by", "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Completed By", - "length": 0, - "no_copy": 0, - "options": "User", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "options": "User" } ], - "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": "2019-09-05 14:22:27.664645", + "links": [], + "modified": "2021-07-01 09:07:52.848618", "modified_by": "Administrator", "module": "Workflow", "name": "Workflow Action", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 0, "delete": 1, - "email": 0, - "export": 0, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 0, "read": 1, - "report": 0, - "role": "All", - "set_user_permissions": 0, - "share": 0, - "submit": 0, - "write": 0 + "role": "All" } ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", "title_field": "reference_name", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + "track_changes": 1 } \ No newline at end of file From b0ef6328e72265f31a881f5ba72c293b139ce99b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 7 Jul 2021 16:32:31 +0530 Subject: [PATCH 0340/1519] fix: updated patch name --- frappe/patches.txt | 2 +- .../v13_0/{update_workspace2_0.py => update_workspace2.py} | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) rename frappe/patches/v13_0/{update_workspace2_0.py => update_workspace2.py} (96%) diff --git a/frappe/patches.txt b/frappe/patches.txt index 1287dfb990..e03b28e494 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,4 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty -frappe.patches.v13_0.update_workspace2_0 +frappe.patches.v13_0.update_workspace2 diff --git a/frappe/patches/v13_0/update_workspace2_0.py b/frappe/patches/v13_0/update_workspace2.py similarity index 96% rename from frappe/patches/v13_0/update_workspace2_0.py rename to frappe/patches/v13_0/update_workspace2.py index 89eaef8fb2..4fecfb2769 100644 --- a/frappe/patches/v13_0/update_workspace2_0.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -61,5 +61,5 @@ def update_wspace(doc, seq, content): else: new_doc.for_user = doc.for_user new_doc.title = doc.extends - doc.delete() - new_doc.save() \ No newline at end of file + frappe.delete_doc("Workspace", doc.name, force=1) + new_doc.insert(ignore_permissions=True) \ No newline at end of file From ecfa8c843f13e6ab7abb629a51a8ce7c44df386e Mon Sep 17 00:00:00 2001 From: codescientist703 Date: Wed, 7 Jul 2021 17:33:59 +0530 Subject: [PATCH 0341/1519] fix: child results should appear for parent search query --- frappe/desk/search.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index 64ae7f7b7a..b0e9592c72 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -167,15 +167,16 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, as_list=not as_dict, strict=False) - # Filtering the values array so that query is included in very element - values = tuple( - [ - v for v in list(values) - if re.search( - re.escape(txt) + ".*", (_(v.name) if as_dict else _(v[0])), re.IGNORECASE - ) - ] - ) + if doctype in UNTRANSLATED_DOCTYPES: + # Filtering the values array so that query is included in very element + values = tuple( + [ + v for v in list(values) + if re.search( + re.escape(txt) + ".*", (_(v.name) if as_dict else _(v[0])), re.IGNORECASE + ) + ] + ) # Sorting the values array so that relevant results always come first # This will first bring elements on top in which query is a prefix of element From 121ae7e36b03ec33b95c9a0b5ee6aa8200e6485e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 7 Jul 2021 17:58:45 +0530 Subject: [PATCH 0342/1519] fix: Allow to open folders that are nested inside 2 folders --- frappe/public/js/frappe/router.js | 8 ++++---- frappe/public/js/frappe/views/file/file_view.js | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 12caf4ab94..2bfa7c7be6 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -171,8 +171,8 @@ frappe.router = { } else { standard_route = ['List', doctype_route.doctype, frappe.utils.to_title_case(route[2])]; if (route[3]) { - // calendar / kanban / dashboard name - standard_route.push(route[3]); + // calendar / kanban / dashboard / folder name + standard_route.push(...route.splice(3, route.length)); } } return standard_route; @@ -297,8 +297,8 @@ frappe.router = { if (route[2] && route[2] !== 'list' && !$.isPlainObject(route[2])) { new_route = [this.slug(route[1]), 'view', route[2].toLowerCase()]; - // calendar / inbox - if (route[3]) new_route.push(route[3]); + // calendar / inbox / file folder + if (route[3]) new_route.push(...route.slice(3, route.length)); } else { if ($.isPlainObject(route[2])) { frappe.route_options = route[2]; diff --git a/frappe/public/js/frappe/views/file/file_view.js b/frappe/public/js/frappe/views/file/file_view.js index 6f0cdcc0f1..e020bff4dd 100644 --- a/frappe/public/js/frappe/views/file/file_view.js +++ b/frappe/public/js/frappe/views/file/file_view.js @@ -315,7 +315,7 @@ frappe.views.FileView = class FileView extends frappe.views.ListView { acc += "/" + curr; } return acc; - }, "/app/file"); + }, "/app/file/view"); return `${folder}`; }) From ee75cea4fe22c79b3163c2a593c7be61622f4a9c Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 7 Jul 2021 22:39:12 +0530 Subject: [PATCH 0343/1519] fix: Enable set_open_count perf: move set_open_count to after_refresh to avoid unnecessary calls --- frappe/public/js/frappe/form/dashboard.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/dashboard.js b/frappe/public/js/frappe/form/dashboard.js index 6833f68073..b2b0c11d54 100644 --- a/frappe/public/js/frappe/form/dashboard.js +++ b/frappe/public/js/frappe/form/dashboard.js @@ -5,7 +5,6 @@ frappe.ui.form.Dashboard = class FormDashboard { constructor(opts) { $.extend(this, opts); this.setup_dashboard_sections(); - this.set_open_count = frappe.utils.throttle(this.set_open_count, 500); } setup_dashboard_sections() { @@ -179,7 +178,6 @@ frappe.ui.form.Dashboard = class FormDashboard { return; } this.render_links(); - // this.set_open_count(); show = true; } @@ -206,6 +204,7 @@ frappe.ui.form.Dashboard = class FormDashboard { $(this).removeClass('hidden'); } }); + this.set_open_count(); } init_data() { From ba062adca84dfecb0e129c292b30303156213db4 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 8 Jul 2021 13:36:25 +0530 Subject: [PATCH 0344/1519] refactor(search): Improvements in search_widget, search_link APIs * Minor perf enhancements * Renamed sorting_comparator to relevance_sorter --- frappe/desk/search.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index b0e9592c72..3cce80a1a0 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -169,19 +169,17 @@ def search_widget(doctype, txt, query=None, searchfield=None, start=0, if doctype in UNTRANSLATED_DOCTYPES: # Filtering the values array so that query is included in very element - values = tuple( - [ - v for v in list(values) - if re.search( - re.escape(txt) + ".*", (_(v.name) if as_dict else _(v[0])), re.IGNORECASE - ) - ] + values = ( + v for v in values + if re.search( + f"{re.escape(txt)}.*", _(v.name if as_dict else v[0]), re.IGNORECASE ) + ) # Sorting the values array so that relevant results always come first # This will first bring elements on top in which query is a prefix of element # Then it will bring the rest of the elements and sort them in lexicographical order - values = sorted(values, key=lambda x: sorting_comparator(x, txt, as_dict)) + values = sorted(values, key=lambda x: relevance_sorter(x, txt, as_dict)) # remove _relevance from results if as_dict: @@ -221,10 +219,10 @@ def scrub_custom_query(query, key, txt): query = query.replace('%s', ((txt or '') + '%')) return query -def sorting_comparator(key, query, as_dict): - value = (_(key.name) if as_dict else _(key[0])) +def relevance_sorter(key, query, as_dict): + value = _(key.name if as_dict else key[0]) return ( - value.lower().startswith(query.lower()) is False, + value.lower().startswith(query.lower()) == False, value ) From f2a91f5709ed4cbe6c4ae83c82b840cf746a5e14 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 15:37:01 +0530 Subject: [PATCH 0345/1519] fix: updated wspace json files --- frappe/automation/workspace/tools/tools.json | 36 ++++++++++-- frappe/core/workspace/build/build.json | 33 +++++++++-- frappe/core/workspace/settings/settings.json | 55 +++++++++++++++++-- frappe/core/workspace/users/users.json | 29 ++++++++-- .../customization/customization.json | 27 +++++++-- .../workspace/integrations/integrations.json | 53 +++++++++++++----- frappe/website/workspace/website/website.json | 45 +++++++++++---- 7 files changed, 231 insertions(+), 47 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index 4a0835657b..1f81050d78 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -1,22 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"ToDo\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Note\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"File\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Assignment Rule\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Auto Repeat\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Tools\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Automation\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Event Streaming\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:53:24.980279", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "tool", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Tools", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Tools", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "To Do", + "link_count": 0, "link_to": "ToDo", "link_type": "DocType", "onboard": 1, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Calendar", + "link_count": 0, "link_to": "Event", "link_type": "DocType", "onboard": 1, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Note", + "link_count": 0, "link_to": "Note", "link_type": "DocType", "onboard": 1, @@ -55,6 +63,7 @@ "hidden": 0, "is_query_report": 0, "label": "Files", + "link_count": 0, "link_to": "File", "link_type": "DocType", "onboard": 0, @@ -65,6 +74,7 @@ "hidden": 0, "is_query_report": 0, "label": "Activity", + "link_count": 0, "link_to": "activity", "link_type": "Page", "onboard": 0, @@ -74,6 +84,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Newsletter", + "link_count": 0, "link_to": "Newsletter", "link_type": "DocType", "onboard": 1, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Group", + "link_count": 0, "link_to": "Email Group", "link_type": "DocType", "onboard": 0, @@ -101,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Automation", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -109,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Assignment Rule", + "link_count": 0, "link_to": "Assignment Rule", "link_type": "DocType", "onboard": 0, @@ -119,6 +134,7 @@ "hidden": 0, "is_query_report": 0, "label": "Milestone", + "link_count": 0, "link_to": "Milestone", "link_type": "DocType", "onboard": 0, @@ -129,6 +145,7 @@ "hidden": 0, "is_query_report": 0, "label": "Auto Repeat", + "link_count": 0, "link_to": "Auto Repeat", "link_type": "DocType", "onboard": 0, @@ -138,6 +155,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Streaming", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -146,6 +164,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Producer", + "link_count": 0, "link_to": "Event Producer", "link_type": "DocType", "onboard": 0, @@ -156,6 +175,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Consumer", + "link_count": 0, "link_to": "Event Consumer", "link_type": "DocType", "onboard": 0, @@ -166,6 +186,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Update Log", + "link_count": 0, "link_to": "Event Update Log", "link_type": "DocType", "onboard": 0, @@ -176,6 +197,7 @@ "hidden": 0, "is_query_report": 0, "label": "Event Sync Log", + "link_count": 0, "link_to": "Event Sync Log", "link_type": "DocType", "onboard": 0, @@ -186,19 +208,24 @@ "hidden": 0, "is_query_report": 0, "label": "Document Type Mapping", + "link_count": 0, "link_to": "Document Type Mapping", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.950350", + "modified": "2021-07-08 15:32:01.445886", "modified_by": "Administrator", "module": "Automation", "name": "Tools", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 26, "shortcuts": [ { "label": "ToDo", @@ -225,5 +252,6 @@ "link_to": "Auto Repeat", "type": "DocType" } - ] + ], + "title": "Tools" } \ No newline at end of file diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index aefda698b1..ac103452c0 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -1,24 +1,28 @@ { "cards_label": "Elements", - "category": "Modules", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"DocType\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Workspace\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Report\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Elements\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Modules\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Models\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Views\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Scripting\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2021-01-02 10:51:16.579957", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "tool", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Build", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Modules", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -28,6 +32,7 @@ "hidden": 0, "is_query_report": 0, "label": "Module Def", + "link_count": 0, "link_to": "Module Def", "link_type": "DocType", "onboard": 0, @@ -38,6 +43,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workspace", + "link_count": 0, "link_to": "Workspace", "link_type": "DocType", "onboard": 0, @@ -48,6 +54,7 @@ "hidden": 0, "is_query_report": 0, "label": "Module Onboarding", + "link_count": 0, "link_to": "Module Onboarding", "link_type": "DocType", "onboard": 0, @@ -58,6 +65,7 @@ "hidden": 0, "is_query_report": 0, "label": "Block Module", + "link_count": 0, "link_to": "Block Module", "link_type": "DocType", "onboard": 0, @@ -68,6 +76,7 @@ "hidden": 0, "is_query_report": 0, "label": "Models", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -77,6 +86,7 @@ "hidden": 0, "is_query_report": 0, "label": "DocType", + "link_count": 0, "link_to": "DocType", "link_type": "DocType", "onboard": 0, @@ -87,6 +97,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "link_to": "Workflow", "link_type": "DocType", "onboard": 0, @@ -97,6 +108,7 @@ "hidden": 0, "is_query_report": 0, "label": "Views", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -106,6 +118,7 @@ "hidden": 0, "is_query_report": 0, "label": "Report", + "link_count": 0, "link_to": "Report", "link_type": "DocType", "onboard": 0, @@ -116,6 +129,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format", + "link_count": 0, "link_to": "Print Format", "link_type": "DocType", "onboard": 0, @@ -126,6 +140,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workspace", + "link_count": 0, "link_to": "Workspace", "link_type": "DocType", "onboard": 0, @@ -136,6 +151,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard", + "link_count": 0, "link_to": "Dashboard", "link_type": "DocType", "onboard": 0, @@ -146,6 +162,7 @@ "hidden": 0, "is_query_report": 0, "label": "Scripting", + "link_count": 0, "link_type": "DocType", "onboard": 0, "only_for": "", @@ -155,6 +172,7 @@ "hidden": 0, "is_query_report": 0, "label": "Server Script", + "link_count": 0, "link_to": "Server Script", "link_type": "DocType", "onboard": 0, @@ -165,6 +183,7 @@ "hidden": 0, "is_query_report": 0, "label": "Client Script", + "link_count": 0, "link_to": "Client Script", "link_type": "DocType", "onboard": 0, @@ -175,6 +194,7 @@ "hidden": 0, "is_query_report": 0, "label": "Scheduled Job Type", + "link_count": 0, "link_to": "Scheduled Job Type", "link_type": "DocType", "onboard": 0, @@ -182,13 +202,17 @@ "type": "Link" } ], - "modified": "2021-02-04 13:48:48.493146", + "modified": "2021-07-08 15:31:32.760553", "modified_by": "Administrator", "module": "Core", "name": "Build", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 5, "shortcuts": [ { "doc_view": "", @@ -208,5 +232,6 @@ "link_to": "Report", "type": "DocType" } - ] + ], + "title": "Build" } \ No newline at end of file diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index fb26b73cfc..ab8381b7fd 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -1,22 +1,27 @@ { - "category": "Modules", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Settings\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"System Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Print Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Data\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Email / Notifications\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Website\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Core\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Printing\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Workflow\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:09:40.527211", "developer_mode_only": 0, - "disable_user_customization": 1, + "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "setting", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Settings", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Data", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Import Data", + "link_count": 0, "link_to": "Data Import", "link_type": "DocType", "onboard": 0, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Export Data", + "link_count": 0, "link_to": "Data Export", "link_type": "DocType", "onboard": 0, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Bulk Update", + "link_count": 0, "link_to": "Bulk Update", "link_type": "DocType", "onboard": 0, @@ -55,6 +63,7 @@ "hidden": 0, "is_query_report": 0, "label": "Download Backups", + "link_count": 0, "link_to": "backups", "link_type": "Page", "onboard": 0, @@ -65,6 +74,7 @@ "hidden": 0, "is_query_report": 0, "label": "Deleted Documents", + "link_count": 0, "link_to": "Deleted Document", "link_type": "DocType", "onboard": 0, @@ -74,6 +84,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email / Notifications", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Account", + "link_count": 0, "link_to": "Email Account", "link_type": "DocType", "onboard": 0, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Domain", + "link_count": 0, "link_to": "Email Domain", "link_type": "DocType", "onboard": 0, @@ -102,6 +115,7 @@ "hidden": 0, "is_query_report": 0, "label": "Notification", + "link_count": 0, "link_to": "Notification", "link_type": "DocType", "onboard": 0, @@ -112,6 +126,7 @@ "hidden": 0, "is_query_report": 0, "label": "Email Template", + "link_count": 0, "link_to": "Email Template", "link_type": "DocType", "onboard": 0, @@ -122,6 +137,7 @@ "hidden": 0, "is_query_report": 0, "label": "Auto Email Report", + "link_count": 0, "link_to": "Auto Email Report", "link_type": "DocType", "onboard": 0, @@ -132,6 +148,7 @@ "hidden": 0, "is_query_report": 0, "label": "Newsletter", + "link_count": 0, "link_to": "Newsletter", "link_type": "DocType", "onboard": 0, @@ -142,6 +159,7 @@ "hidden": 0, "is_query_report": 0, "label": "Notification Settings", + "link_count": 0, "link_to": "Notification Settings", "link_type": "DocType", "onboard": 0, @@ -151,6 +169,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -159,6 +178,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Settings", + "link_count": 0, "link_to": "Website Settings", "link_type": "DocType", "onboard": 1, @@ -169,6 +189,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Theme", + "link_count": 0, "link_to": "Website Theme", "link_type": "DocType", "onboard": 1, @@ -179,6 +200,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Script", + "link_count": 0, "link_to": "Website Script", "link_type": "DocType", "onboard": 0, @@ -189,6 +211,7 @@ "hidden": 0, "is_query_report": 0, "label": "About Us Settings", + "link_count": 0, "link_to": "About Us Settings", "link_type": "DocType", "onboard": 0, @@ -199,6 +222,7 @@ "hidden": 0, "is_query_report": 0, "label": "Contact Us Settings", + "link_count": 0, "link_to": "Contact Us Settings", "link_type": "DocType", "onboard": 0, @@ -208,6 +232,7 @@ "hidden": 0, "is_query_report": 0, "label": "Core", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -216,6 +241,7 @@ "hidden": 0, "is_query_report": 0, "label": "System Settings", + "link_count": 0, "link_to": "System Settings", "link_type": "DocType", "onboard": 0, @@ -226,6 +252,7 @@ "hidden": 0, "is_query_report": 0, "label": "Error Log", + "link_count": 0, "link_to": "Error Log", "link_type": "DocType", "onboard": 0, @@ -236,6 +263,7 @@ "hidden": 0, "is_query_report": 0, "label": "Error Snapshot", + "link_count": 0, "link_to": "Error Snapshot", "link_type": "DocType", "onboard": 0, @@ -246,6 +274,7 @@ "hidden": 0, "is_query_report": 0, "label": "Domain Settings", + "link_count": 0, "link_to": "Domain Settings", "link_type": "DocType", "onboard": 0, @@ -255,6 +284,7 @@ "hidden": 0, "is_query_report": 0, "label": "Printing", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -263,6 +293,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format Builder", + "link_count": 0, "link_to": "print-format-builder", "link_type": "Page", "onboard": 0, @@ -273,6 +304,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Settings", + "link_count": 0, "link_to": "Print Settings", "link_type": "DocType", "onboard": 0, @@ -283,6 +315,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Format", + "link_count": 0, "link_to": "Print Format", "link_type": "DocType", "onboard": 0, @@ -293,6 +326,7 @@ "hidden": 0, "is_query_report": 0, "label": "Print Style", + "link_count": 0, "link_to": "Print Style", "link_type": "DocType", "onboard": 0, @@ -302,6 +336,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -310,6 +345,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow", + "link_count": 0, "link_to": "Workflow", "link_type": "DocType", "onboard": 0, @@ -320,6 +356,7 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow State", + "link_count": 0, "link_to": "Workflow State", "link_type": "DocType", "onboard": 0, @@ -330,19 +367,24 @@ "hidden": 0, "is_query_report": 0, "label": "Workflow Action", + "link_count": 0, "link_to": "Workflow Action", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:40.235323", + "modified": "2021-07-08 15:32:04.133559", "modified_by": "Administrator", "module": "Core", "name": "Settings", + "onboarding": "", "owner": "Administrator", - "pin_to_bottom": 1, + "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 29, "shortcuts": [ { "icon": "setting", @@ -363,5 +405,6 @@ "type": "DocType" } ], - "shortcuts_label": "Settings" + "shortcuts_label": "Settings", + "title": "Settings" } \ No newline at end of file diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index ba82461b57..f9713222f5 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -1,23 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Permission Manager\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Profile\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"User Type\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Users\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Logs\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Permissions\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:12:16.754449", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "users", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Users", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Users", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -26,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "User", + "link_count": 0, "link_to": "User", "link_type": "DocType", "onboard": 0, @@ -36,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role", + "link_count": 0, "link_to": "Role", "link_type": "DocType", "onboard": 0, @@ -46,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Profile", + "link_count": 0, "link_to": "Role Profile", "link_type": "DocType", "onboard": 0, @@ -55,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Logs", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -63,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Activity Log", + "link_count": 0, "link_to": "Activity Log", "link_type": "DocType", "onboard": 0, @@ -73,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Access Log", + "link_count": 0, "link_to": "Access Log", "link_type": "DocType", "onboard": 0, @@ -82,6 +92,7 @@ "hidden": 0, "is_query_report": 0, "label": "Permissions", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -90,6 +101,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Permissions Manager", + "link_count": 0, "link_to": "permission-manager", "link_type": "Page", "onboard": 0, @@ -100,6 +112,7 @@ "hidden": 0, "is_query_report": 0, "label": "User Permissions", + "link_count": 0, "link_to": "User Permission", "link_type": "DocType", "onboard": 0, @@ -110,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Role Permission for Page and Report", + "link_count": 0, "link_to": "Role Permission for Page and Report", "link_type": "DocType", "onboard": 0, @@ -120,6 +134,7 @@ "hidden": 0, "is_query_report": 1, "label": "Permitted Documents For User", + "link_count": 0, "link_to": "Permitted Documents For User", "link_type": "Report", "onboard": 0, @@ -130,19 +145,24 @@ "hidden": 0, "is_query_report": 0, "label": "Document Share Report", + "link_count": 0, "link_to": "Document Share Report", "link_type": "Report", "onboard": 0, "type": "Link" } ], - "modified": "2021-03-25 23:02:34.582569", + "modified": "2021-07-08 15:32:02.279021", "modified_by": "Administrator", "module": "Core", "name": "Users", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 27, "shortcuts": [ { "label": "User", @@ -170,5 +190,6 @@ "link_to": "User Type", "type": "DocType" } - ] + ], + "title": "Users" } \ No newline at end of file diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index cdc3b73366..5e0c96e648 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -1,23 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Customize Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Custom Role\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Client Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Server Script\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Dashboards\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Form Customization\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Other\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:15:03.839594", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "customization", "idx": 0, "is_default": 0, - "is_standard": 1, + "is_standard": 0, "label": "Customization", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Dashboards", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -26,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard", + "link_count": 0, "link_to": "Dashboard", "link_type": "DocType", "onboard": 0, @@ -36,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard Chart", + "link_count": 0, "link_to": "Dashboard Chart", "link_type": "DocType", "onboard": 0, @@ -46,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dashboard Chart Source", + "link_count": 0, "link_to": "Dashboard Chart Source", "link_type": "DocType", "onboard": 0, @@ -55,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Form Customization", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -63,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Customize Form", + "link_count": 0, "link_to": "Customize Form", "link_type": "DocType", "onboard": 0, @@ -73,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Custom Field", + "link_count": 0, "link_to": "Custom Field", "link_type": "DocType", "onboard": 0, @@ -83,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Client Script", + "link_count": 0, "link_to": "Client Script", "link_type": "DocType", "onboard": 0, @@ -93,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "DocType", + "link_count": 0, "link_to": "DocType", "link_type": "DocType", "onboard": 0, @@ -102,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Other", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -110,19 +123,24 @@ "hidden": 0, "is_query_report": 0, "label": "Custom Translations", + "link_count": 0, "link_to": "Translation", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2021-02-04 13:50:35.750463", + "modified": "2021-07-08 15:31:37.060381", "modified_by": "Administrator", "module": "Custom", "name": "Customization", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 8, "shortcuts": [ { "label": "Customize Form", @@ -145,5 +163,6 @@ "link_to": "Server Script", "type": "DocType" } - ] + ], + "title": "Customization" } \ No newline at end of file diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index db96304207..9650bb2ed6 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -1,22 +1,27 @@ { - "category": "Administration", + "category": "", "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Backup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Google Services\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Authentication\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Payments\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 15:16:18.714190", "developer_mode_only": 0, - "disable_user_customization": 1, + "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "integration", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Integrations", "links": [ { "hidden": 0, "is_query_report": 0, "label": "Backup", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -25,6 +30,7 @@ "hidden": 0, "is_query_report": 0, "label": "Dropbox Settings", + "link_count": 0, "link_to": "Dropbox Settings", "link_type": "DocType", "onboard": 0, @@ -35,6 +41,7 @@ "hidden": 0, "is_query_report": 0, "label": "S3 Backup Settings", + "link_count": 0, "link_to": "S3 Backup Settings", "link_type": "DocType", "onboard": 0, @@ -45,6 +52,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Drive", + "link_count": 0, "link_to": "Google Drive", "link_type": "DocType", "onboard": 0, @@ -54,6 +62,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Services", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -62,6 +71,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Settings", + "link_count": 0, "link_to": "Google Settings", "link_type": "DocType", "onboard": 0, @@ -72,6 +82,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Contacts", + "link_count": 0, "link_to": "Google Contacts", "link_type": "DocType", "onboard": 0, @@ -82,6 +93,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Calendar", + "link_count": 0, "link_to": "Google Calendar", "link_type": "DocType", "onboard": 0, @@ -92,6 +104,7 @@ "hidden": 0, "is_query_report": 0, "label": "Google Drive", + "link_count": 0, "link_to": "Google Drive", "link_type": "DocType", "onboard": 0, @@ -101,6 +114,7 @@ "hidden": 0, "is_query_report": 0, "label": "Authentication", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -109,6 +123,7 @@ "hidden": 0, "is_query_report": 0, "label": "Social Login Key", + "link_count": 0, "link_to": "Social Login Key", "link_type": "DocType", "onboard": 0, @@ -119,6 +134,7 @@ "hidden": 0, "is_query_report": 0, "label": "LDAP Settings", + "link_count": 0, "link_to": "LDAP Settings", "link_type": "DocType", "onboard": 0, @@ -129,6 +145,7 @@ "hidden": 0, "is_query_report": 0, "label": "OAuth Client", + "link_count": 0, "link_to": "OAuth Client", "link_type": "DocType", "onboard": 0, @@ -139,6 +156,7 @@ "hidden": 0, "is_query_report": 0, "label": "OAuth Provider Settings", + "link_count": 0, "link_to": "OAuth Provider Settings", "link_type": "DocType", "onboard": 0, @@ -148,6 +166,7 @@ "hidden": 0, "is_query_report": 0, "label": "Payments", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -156,6 +175,7 @@ "hidden": 0, "is_query_report": 0, "label": "Braintree Settings", + "link_count": 0, "link_to": "Braintree Settings", "link_type": "DocType", "onboard": 0, @@ -166,6 +186,7 @@ "hidden": 0, "is_query_report": 0, "label": "PayPal Settings", + "link_count": 0, "link_to": "PayPal Settings", "link_type": "DocType", "onboard": 0, @@ -176,6 +197,7 @@ "hidden": 0, "is_query_report": 0, "label": "Razorpay Settings", + "link_count": 0, "link_to": "Razorpay Settings", "link_type": "DocType", "onboard": 0, @@ -186,6 +208,7 @@ "hidden": 0, "is_query_report": 0, "label": "Stripe Settings", + "link_count": 0, "link_to": "Stripe Settings", "link_type": "DocType", "onboard": 0, @@ -196,6 +219,7 @@ "hidden": 0, "is_query_report": 0, "label": "Paytm Settings", + "link_count": 0, "link_to": "Paytm Settings", "link_type": "DocType", "onboard": 0, @@ -205,6 +229,7 @@ "hidden": 0, "is_query_report": 0, "label": "Settings", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -213,6 +238,7 @@ "hidden": 0, "is_query_report": 0, "label": "Webhook", + "link_count": 0, "link_to": "Webhook", "link_type": "DocType", "onboard": 0, @@ -223,38 +249,35 @@ "hidden": 0, "is_query_report": 0, "label": "Slack Webhook URL", + "link_count": 0, "link_to": "Slack Webhook URL", "link_type": "DocType", "onboard": 0, "type": "Link" }, - { - "dependencies": "", - "hidden": 0, - "is_query_report": 0, - "label": "Twilio Settings", - "link_to": "Twilio Settings", - "link_type": "DocType", - "onboard": 0, - "type": "Link" - }, { "dependencies": "", "hidden": 0, "is_query_report": 0, "label": "SMS Settings", + "link_count": 0, "link_to": "SMS Settings", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.706680", + "modified": "2021-07-08 15:31:47.399175", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, - "shortcuts": [] + "public": 1, + "restrict_to_domain": "", + "sequence_id": 15, + "shortcuts": [], + "title": "Integrations" } \ No newline at end of file diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index a2a4a299c4..afb73125cd 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -1,20 +1,20 @@ { - "category": "Modules", - "charts": [ - { - "chart_name": "Website Analytics" - } - ], + "category": "", + "charts": [], + "content": "[{\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Your Shortcuts\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blog Post\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Blogger\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Page\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Web Form\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"shortcut\", \"data\": {\"shortcut_name\": \"Website Settings\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"spacer\", \"data\": {\"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"header\", \"data\": {\"text\": \"Reports & Masters\", \"level\": 4, \"col\": 12, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Setup\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Blog\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Web Site\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Portal\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}, {\"type\": \"card\", \"data\": {\"card_name\": \"Knowledge Base\", \"col\": 4, \"pt\": 0, \"pr\": 0, \"pb\": 0, \"pl\": 0}}]", "creation": "2020-03-02 14:13:51.089373", "developer_mode_only": 0, "disable_user_customization": 0, "docstatus": 0, "doctype": "Workspace", + "extends": "", "extends_another_page": 0, + "for_user": "", "hide_custom": 0, "icon": "website", "idx": 0, - "is_standard": 1, + "is_default": 0, + "is_standard": 0, "label": "Website", "links": [ { @@ -22,6 +22,7 @@ "icon": "setting", "is_query_report": 0, "label": "Setup", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -30,6 +31,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Settings", + "link_count": 0, "link_to": "Website Settings", "link_type": "DocType", "onboard": 1, @@ -40,6 +42,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Theme", + "link_count": 0, "link_to": "Website Theme", "link_type": "DocType", "onboard": 1, @@ -50,6 +53,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Script", + "link_count": 0, "link_to": "Website Script", "link_type": "DocType", "onboard": 0, @@ -60,6 +64,7 @@ "hidden": 0, "is_query_report": 0, "label": "About Us Settings", + "link_count": 0, "link_to": "About Us Settings", "link_type": "DocType", "onboard": 0, @@ -70,6 +75,7 @@ "hidden": 0, "is_query_report": 0, "label": "Contact Us Settings", + "link_count": 0, "link_to": "Contact Us Settings", "link_type": "DocType", "onboard": 0, @@ -80,6 +86,7 @@ "icon": "", "is_query_report": 0, "label": "Blog", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -88,6 +95,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blog Post", + "link_count": 0, "link_to": "Blog Post", "link_type": "DocType", "onboard": 1, @@ -98,6 +106,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blogger", + "link_count": 0, "link_to": "Blogger", "link_type": "DocType", "onboard": 0, @@ -108,6 +117,7 @@ "hidden": 0, "is_query_report": 0, "label": "Blog Category", + "link_count": 0, "link_to": "Blog Category", "link_type": "DocType", "onboard": 0, @@ -118,6 +128,7 @@ "icon": "website", "is_query_report": 0, "label": "Web Site", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -126,6 +137,7 @@ "hidden": 0, "is_query_report": 0, "label": "Web Page", + "link_count": 0, "link_to": "Web Page", "link_type": "DocType", "onboard": 1, @@ -136,6 +148,7 @@ "hidden": 0, "is_query_report": 0, "label": "Web Form", + "link_count": 0, "link_to": "Web Form", "link_type": "DocType", "onboard": 1, @@ -146,6 +159,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Sidebar", + "link_count": 0, "link_to": "Website Sidebar", "link_type": "DocType", "onboard": 0, @@ -156,6 +170,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Slideshow", + "link_count": 0, "link_to": "Website Slideshow", "link_type": "DocType", "onboard": 0, @@ -166,6 +181,7 @@ "hidden": 0, "is_query_report": 0, "label": "Website Route Meta", + "link_count": 0, "link_to": "Website Route Meta", "link_type": "DocType", "onboard": 0, @@ -176,6 +192,7 @@ "icon": "website", "is_query_report": 0, "label": "Portal", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -184,6 +201,7 @@ "hidden": 0, "is_query_report": 0, "label": "Portal Settings", + "link_count": 0, "link_to": "Portal Settings", "link_type": "DocType", "onboard": 1, @@ -194,6 +212,7 @@ "icon": "project", "is_query_report": 0, "label": "Knowledge Base", + "link_count": 0, "onboard": 0, "type": "Card Break" }, @@ -202,6 +221,7 @@ "hidden": 0, "is_query_report": 0, "label": "Help Category", + "link_count": 0, "link_to": "Help Category", "link_type": "DocType", "onboard": 0, @@ -212,20 +232,24 @@ "hidden": 0, "is_query_report": 0, "label": "Help Article", + "link_count": 0, "link_to": "Help Article", "link_type": "DocType", "onboard": 0, "type": "Link" } ], - "modified": "2020-12-01 13:38:39.556588", + "modified": "2021-07-08 15:32:03.078096", "modified_by": "Administrator", "module": "Website", "name": "Website", - "onboarding": "Website", + "onboarding": "", "owner": "Administrator", "pin_to_bottom": 0, "pin_to_top": 0, + "public": 1, + "restrict_to_domain": "", + "sequence_id": 28, "shortcuts": [ { "color": "Green", @@ -261,5 +285,6 @@ "link_to": "Website Settings", "type": "DocType" } - ] + ], + "title": "Website" } \ No newline at end of file From 169e14f97fea9534ed799c4529dc0db597d73b1f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 16:00:28 +0530 Subject: [PATCH 0346/1519] fix: updated patch --- frappe/desk/doctype/workspace/workspace.py | 6 ++-- frappe/patches/v13_0/update_workspace2.py | 36 ++++++++++++---------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 4eede2211e..29a8100bd9 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -26,10 +26,10 @@ class Workspace(Document): frappe.throw(_("You can only have one default page that extends a particular standard page.")) def on_update(self): - if disable_saving_as_standard(): - return + # if disable_saving_as_standard(): + # return - if frappe.conf.developer_mode and self.is_standard: + if frappe.conf.developer_mode and self.module and self.public: export_to_files(record_list=[['Workspace', self.name]], record_module=self.module) @staticmethod diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 4fecfb2769..3561a8ff3e 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -4,7 +4,7 @@ from frappe import _ def execute(): frappe.reload_doc('desk', 'doctype', 'workspace', force=True) - order_by = "is_standard asc, pin_to_top desc, pin_to_bottom asc, name asc" + order_by = "pin_to_top desc, pin_to_bottom asc, name asc" for seq, wspace in enumerate(frappe.get_all('Workspace', order_by=order_by)): doc = frappe.get_doc('Workspace', wspace.name) content = create_content(doc) @@ -47,19 +47,21 @@ def create_content(doc): return content def update_wspace(doc, seq, content): - new_doc = frappe.new_doc('Workspace') - new_doc.label = doc.label - new_doc.icon = doc.icon - new_doc.sequence_id = seq + 1 - new_doc.content = json.dumps(content) - new_doc.charts = doc.charts or [] - new_doc.shortcuts = doc.shortcuts or [] - new_doc.links = doc.links or [] - if doc.is_standard: - new_doc.public = 1 - new_doc.title = doc.label - else: - new_doc.for_user = doc.for_user - new_doc.title = doc.extends - frappe.delete_doc("Workspace", doc.name, force=1) - new_doc.insert(ignore_permissions=True) \ No newline at end of file + if not doc.is_standard and not doc.public: + doc.sequence_id = seq + 1 + doc.content = json.dumps(content) + doc.public = 0 + doc.title = doc.extends + doc.extends = '' + doc.category = '' + doc.restrict_to_domain = '' + doc.onboarding = '' + doc.extends_another_page = 0 + doc.is_default = 0 + doc.is_standard = 0 + doc.developer_mode_only = 0 + doc.disable_user_customization = 0 + doc.pin_to_top = 0 + doc.pin_to_bottom = 0 + doc.hide_custom = 0 + doc.save(ignore_permissions=True) \ No newline at end of file From 098005b3051d3958a7ab288fe08de623cdb7055e Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 16:52:51 +0530 Subject: [PATCH 0347/1519] fix: minor fix --- frappe/desk/desktop.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 8de6c1301d..ac0db1b2d3 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -390,14 +390,14 @@ def get_desk_sidebar_items(): # pages sorted based on pinned to top and then by name order_by = "pin_to_top desc, pin_to_bottom asc, name asc" - all_pages = frappe.get_all("Workspace", fields=["name", "category", "icon", "module"], + all_pages = frappe.get_all("Workspace", fields=["name", "title", "public", "module", "icon"], filters=filters, order_by=order_by, ignore_permissions=True) pages = [] # Filter Page based on Permission for page in all_pages: try: - wspace = Workspace(page.get('name')) + wspace = Workspace(page) if wspace.is_page_allowed(): pages.append(page) page['label'] = _(page.get('name')) From 8475c6c4261e74bbe591761e369eef7e0e4ca020 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 17:41:22 +0530 Subject: [PATCH 0348/1519] fix: updated wspace json files --- frappe/automation/workspace/tools/tools.json | 3 ++- frappe/core/workspace/build/build.json | 3 ++- frappe/core/workspace/settings/settings.json | 3 ++- frappe/core/workspace/users/users.json | 3 ++- frappe/custom/workspace/customization/customization.json | 3 ++- frappe/integrations/workspace/integrations/integrations.json | 3 ++- frappe/website/workspace/website/website.json | 3 ++- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/frappe/automation/workspace/tools/tools.json b/frappe/automation/workspace/tools/tools.json index 1f81050d78..eb399f6e0b 100644 --- a/frappe/automation/workspace/tools/tools.json +++ b/frappe/automation/workspace/tools/tools.json @@ -215,12 +215,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:01.445886", + "modified": "2021-07-08 17:36:29.878969", "modified_by": "Administrator", "module": "Automation", "name": "Tools", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/build/build.json b/frappe/core/workspace/build/build.json index ac103452c0..a911a928f5 100644 --- a/frappe/core/workspace/build/build.json +++ b/frappe/core/workspace/build/build.json @@ -202,12 +202,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:32.760553", + "modified": "2021-07-08 17:36:06.916752", "modified_by": "Administrator", "module": "Core", "name": "Build", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/settings/settings.json b/frappe/core/workspace/settings/settings.json index ab8381b7fd..2f6ab32070 100644 --- a/frappe/core/workspace/settings/settings.json +++ b/frappe/core/workspace/settings/settings.json @@ -374,12 +374,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:04.133559", + "modified": "2021-07-08 17:36:32.236600", "modified_by": "Administrator", "module": "Core", "name": "Settings", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/core/workspace/users/users.json b/frappe/core/workspace/users/users.json index f9713222f5..f1994b54d9 100644 --- a/frappe/core/workspace/users/users.json +++ b/frappe/core/workspace/users/users.json @@ -152,12 +152,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:02.279021", + "modified": "2021-07-08 17:36:30.639286", "modified_by": "Administrator", "module": "Core", "name": "Users", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/custom/workspace/customization/customization.json b/frappe/custom/workspace/customization/customization.json index 5e0c96e648..6b1c0f1c78 100644 --- a/frappe/custom/workspace/customization/customization.json +++ b/frappe/custom/workspace/customization/customization.json @@ -130,12 +130,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:37.060381", + "modified": "2021-07-08 17:36:10.615028", "modified_by": "Administrator", "module": "Custom", "name": "Customization", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/integrations/workspace/integrations/integrations.json b/frappe/integrations/workspace/integrations/integrations.json index 9650bb2ed6..3c579052ca 100644 --- a/frappe/integrations/workspace/integrations/integrations.json +++ b/frappe/integrations/workspace/integrations/integrations.json @@ -267,12 +267,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:31:47.399175", + "modified": "2021-07-08 17:36:18.712550", "modified_by": "Administrator", "module": "Integrations", "name": "Integrations", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, diff --git a/frappe/website/workspace/website/website.json b/frappe/website/workspace/website/website.json index afb73125cd..09af279410 100644 --- a/frappe/website/workspace/website/website.json +++ b/frappe/website/workspace/website/website.json @@ -239,12 +239,13 @@ "type": "Link" } ], - "modified": "2021-07-08 15:32:03.078096", + "modified": "2021-07-08 17:36:31.292527", "modified_by": "Administrator", "module": "Website", "name": "Website", "onboarding": "", "owner": "Administrator", + "parent_page": "", "pin_to_bottom": 0, "pin_to_top": 0, "public": 1, From e8e7211d62ff8b5fe9c0fea435505cba83e5d6f2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Thu, 8 Jul 2021 20:56:58 +0530 Subject: [PATCH 0349/1519] fix: Auto scroll sidebar to selected page --- frappe/desk/doctype/workspace/workspace.py | 6 +++--- frappe/public/js/frappe/views/workspace/workspace.js | 8 +++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 29a8100bd9..93a7b13d17 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -206,12 +206,12 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block doc.content = blocks doc.save(ignore_permissions=True) - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) - if json.loads(new_widgets): save_new_widget(doc, title, blocks, new_widgets) + if json.loads(sb_items): + sort_pages(json.loads(sb_items)) + if json.loads(deleted_pages): return delete_pages(json.loads(deleted_pages)) diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 2bc21060bd..c65c8aa232 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -145,6 +145,8 @@ frappe.views.Workspace = class Workspace { } this.build_sidebar_section(category, root_pages); }); + + this.sidebar.find('.selected')[0].scrollIntoView(); } build_sidebar_section(title, root_pages) { @@ -152,7 +154,7 @@ frappe.views.Workspace = class Workspace { let $title = $(`
    ${frappe.utils.icon("small-down", "xs")} - ${__(title)} + ${__(title)}
    `).appendTo(sidebar_section); this.prepare_sidebar(root_pages, sidebar_section, this.sidebar); @@ -162,6 +164,10 @@ frappe.views.Workspace = class Workspace { $(e.target).parent().find('.sidebar-item-container').toggleClass('hidden'); }); + if (!this.current_page.name) { + $title.trigger("click"); + } + if (Object.keys(root_pages).length === 0) { sidebar_section.addClass('hidden'); } From 6fd762da966b7b7faa101a115d34e8e685a574f0 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Fri, 9 Jul 2021 18:02:19 +0530 Subject: [PATCH 0350/1519] fix: send me a copy not working --- frappe/core/doctype/communication/mixins.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/core/doctype/communication/mixins.py b/frappe/core/doctype/communication/mixins.py index 82a47d24d9..160018c4a2 100644 --- a/frappe/core/doctype/communication/mixins.py +++ b/frappe/core/doctype/communication/mixins.py @@ -89,7 +89,7 @@ class CommunicationEmailMixin: return self._final_cc def get_mail_cc_with_displayname(self, is_inbound_mail_communcation=False, include_sender = False): - cc_list = self.mail_cc(is_inbound_mail_communcation=False, include_sender = False) + cc_list = self.mail_cc(is_inbound_mail_communcation=is_inbound_mail_communcation, include_sender = include_sender) return [self.get_email_with_displayname(email) for email in cc_list] def mail_bcc(self, is_inbound_mail_communcation=False): From 1e839f0ab1ca0e00a0492a2f67fcb7eab13a6720 Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Fri, 9 Jul 2021 18:36:06 +0530 Subject: [PATCH 0351/1519] test: Add test for frappe.db.get_single_value --- frappe/tests/test_db.py | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index a31a898d73..dcc70969a1 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -5,6 +5,7 @@ import unittest from random import choice +import datetime import frappe from frappe.custom.doctype.custom_field.custom_field import create_custom_field @@ -45,11 +46,27 @@ class TestDB(unittest.TestCase): frappe.db.escape("香港濟生堂製藥有限公司 - IT".encode("utf-8")) def test_get_single_value(self): - frappe.db.set_value('System Settings', 'System Settings', 'backup_limit', 5) - frappe.db.commit() + #setup + fieldtypes = ['Float', 'Int', 'Percent', 'Currency', 'Data', 'Date', 'Datetime', 'Time'] + values = [1.5, 1, 55.5, 12.5, 'Test', datetime.datetime.now().date(), datetime.datetime.now(), datetime.timedelta(hours=9, minutes=45, seconds=10)] + test_inputs = [{ + 'fieldtype': fieldtypes[i], + 'value': values[i]} for i in range(len(fieldtypes))] + for fieldtype in fieldtypes: + create_custom_field('Print Settings', { + "fieldname": 'test_'+fieldtype.lower(), + "label": 'Test '+fieldtype, + "fieldtype": fieldtype, + }) + + #test + for inp in test_inputs: + fieldname = 'test_'+inp['fieldtype'].lower() + frappe.db.set_value('Print Settings', 'Print Settings', fieldname, inp['value']) + self.assertEqual(frappe.db.get_single_value('Print Settings', fieldname), inp['value']) - limit = frappe.db.get_single_value('System Settings', 'backup_limit') - self.assertEqual(limit, 5) + #teardown + clear_custom_fields('Print Settings') def test_log_touched_tables(self): frappe.flags.in_migrate = True From 95550861a74eb1d56b72ef7536e111b703b2fa86 Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Fri, 9 Jul 2021 18:48:12 +0530 Subject: [PATCH 0352/1519] refactor(minor): Fix indentation --- frappe/tests/test_db.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index dcc70969a1..920ec0d827 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -57,8 +57,8 @@ class TestDB(unittest.TestCase): "fieldname": 'test_'+fieldtype.lower(), "label": 'Test '+fieldtype, "fieldtype": fieldtype, - }) - + }) + #test for inp in test_inputs: fieldname = 'test_'+inp['fieldtype'].lower() From b6c71251a3cb73622ed91897b7d9c31610471123 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Sat, 10 Jul 2021 21:58:57 +0530 Subject: [PATCH 0353/1519] feat: Icon Picker --- frappe/core/doctype/docfield/docfield.json | 4 +- .../doctype/custom_field/custom_field.json | 4 +- .../customize_form_field.json | 4 +- frappe/database/mariadb/database.py | 3 +- frappe/database/postgres/database.py | 3 +- frappe/model/__init__.py | 3 +- .../public/js/frappe/form/controls/control.js | 1 + frappe/public/js/frappe/form/controls/icon.js | 93 +++++++++++++++++++ frappe/public/js/frappe/form/formatters.js | 6 ++ .../js/frappe/icon_picker/icon_picker.js | 86 +++++++++++++++++ frappe/public/scss/common/controls.scss | 1 + frappe/public/scss/common/icon_picker.scss | 85 +++++++++++++++++ 12 files changed, 284 insertions(+), 9 deletions(-) create mode 100644 frappe/public/js/frappe/form/controls/icon.js create mode 100644 frappe/public/js/frappe/icon_picker/icon_picker.js create mode 100644 frappe/public/scss/common/icon_picker.scss diff --git a/frappe/core/doctype/docfield/docfield.json b/frappe/core/doctype/docfield/docfield.json index ca134665b8..ce62adc8be 100644 --- a/frappe/core/doctype/docfield/docfield.json +++ b/frappe/core/doctype/docfield/docfield.json @@ -90,7 +90,7 @@ "label": "Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", "reqd": 1, "search_index": 1 }, @@ -487,7 +487,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-10-29 06:09:26.454990", + "modified": "2021-07-10 21:56:04.167745", "modified_by": "Administrator", "module": "Core", "name": "DocField", diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index 2f0819ab68..442dbd61d6 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -120,7 +120,7 @@ "label": "Field Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nIcon\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", "reqd": 1 }, { @@ -417,7 +417,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-10-29 06:14:43.073329", + "modified": "2021-07-10 21:56:40.655396", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", diff --git a/frappe/custom/doctype/customize_form_field/customize_form_field.json b/frappe/custom/doctype/customize_form_field/customize_form_field.json index 227114137c..0a456b1026 100644 --- a/frappe/custom/doctype/customize_form_field/customize_form_field.json +++ b/frappe/custom/doctype/customize_form_field/customize_form_field.json @@ -82,7 +82,7 @@ "label": "Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nIcon\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSignature\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime", "reqd": 1, "search_index": 1 }, @@ -428,7 +428,7 @@ "index_web_pages_for_search": 1, "istable": 1, "links": [], - "modified": "2020-10-29 06:11:57.661039", + "modified": "2021-07-10 21:57:24.479749", "modified_by": "Administrator", "module": "Custom", "name": "Customize Form Field", diff --git a/frappe/database/mariadb/database.py b/frappe/database/mariadb/database.py index 879c8394d7..e86edaa96f 100644 --- a/frappe/database/mariadb/database.py +++ b/frappe/database/mariadb/database.py @@ -49,7 +49,8 @@ class MariaDBDatabase(Database): 'Color': ('varchar', self.VARCHAR_LEN), 'Barcode': ('longtext', ''), 'Geolocation': ('longtext', ''), - 'Duration': ('decimal', '18,6') + 'Duration': ('decimal', '18,6'), + 'Icon': ('varchar', self.VARCHAR_LEN) } def get_connection(self): diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py index 8235277e30..9265d701bf 100644 --- a/frappe/database/postgres/database.py +++ b/frappe/database/postgres/database.py @@ -58,7 +58,8 @@ class PostgresDatabase(Database): 'Color': ('varchar', self.VARCHAR_LEN), 'Barcode': ('text', ''), 'Geolocation': ('text', ''), - 'Duration': ('decimal', '18,6') + 'Duration': ('decimal', '18,6'), + 'Icon': ('varchar', self.VARCHAR_LEN) } def get_connection(self): diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 75122f5aba..f63c76d2da 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -34,7 +34,8 @@ data_fieldtypes = ( 'Color', 'Barcode', 'Geolocation', - 'Duration' + 'Duration', + 'Icon' ) no_value_fields = ( diff --git a/frappe/public/js/frappe/form/controls/control.js b/frappe/public/js/frappe/form/controls/control.js index 168da2717c..bd04938e35 100644 --- a/frappe/public/js/frappe/form/controls/control.js +++ b/frappe/public/js/frappe/form/controls/control.js @@ -39,6 +39,7 @@ import './multiselect_pills'; import './multiselect_list'; import './rating'; import './duration'; +import './icon'; frappe.ui.form.make_control = function (opts) { var control_class_name = "Control" + opts.df.fieldtype.replace(/ /g, ""); diff --git a/frappe/public/js/frappe/form/controls/icon.js b/frappe/public/js/frappe/form/controls/icon.js new file mode 100644 index 0000000000..4692d6a3eb --- /dev/null +++ b/frappe/public/js/frappe/form/controls/icon.js @@ -0,0 +1,93 @@ +import Picker from '../../icon_picker/icon_picker'; + +frappe.ui.form.ControlIcon = class ControlIcon extends frappe.ui.form.ControlData { + make_input() { + this.df.placeholder = this.df.placeholder || __('Choose an icon'); + super.make_input(); + this.get_all_icons(); + this.make_icon_input(); + } + + get_all_icons() { + frappe.symbols = []; + $("#all-symbols > symbol[id]").each(function() { + frappe.symbols.push(this.id.replace('icon-','')); + }); + } + + make_icon_input() { + let picker_wrapper = $('
    '); + this.picker = new Picker({ + parent: picker_wrapper, + icon: this.get_icon(), + icons: frappe.symbols + }); + + this.$wrapper.popover({ + trigger: 'manual', + offset: `${-this.$wrapper.width() / 4}, 5`, + boundary: 'viewport', + placement: 'bottom', + template: ` +
    +
    +
    +
    + `, + content: () => picker_wrapper, + html: true + }).on('show.bs.popover', () => { + setTimeout(() => { + this.picker.refresh(); + }, 10); + }).on('hidden.bs.popover', () => { + $('body').off('click.icon-popover'); + $(window).off('hashchange.icon-popover'); + }); + + this.picker.on_change = (icon) => { + this.set_value(icon); + }; + + if (!this.selected_icon) { + this.selected_icon = $(`
    ${frappe.utils.icon("folder-normal", "md")}
    `); + this.selected_icon.insertAfter(this.$input); + } + + this.$wrapper.find('.selected-icon').parent().on('click', (e) => { + this.$wrapper.popover('toggle'); + if (!this.get_icon()) { + this.$input.val(''); + } + e.stopPropagation(); + $('body').on('click.icon-popover', (ev) => { + if (!$(ev.target).parents().is('.popover')) { + this.$wrapper.popover('hide'); + } + }); + $(window).on('hashchange.icon-popover', () => { + this.$wrapper.popover('hide'); + }); + }); + } + + refresh() { + super.refresh(); + let icon = this.get_icon(); + if (this.picker && this.picker.icon !== icon) { + this.picker.icon = icon; + this.picker.refresh(); + } + } + + set_formatted_input(value) { + super.set_formatted_input(value); + this.$input.val(value); + this.selected_icon.find("use").attr("href", "#icon-"+(value || "folder-normal")); + this.selected_icon.toggleClass('no-value', !value); + } + + get_icon() { + return this.get_value() || 'folder-normal'; + } +}; diff --git a/frappe/public/js/frappe/form/formatters.js b/frappe/public/js/frappe/form/formatters.js index b9a838688d..bb46c82b21 100644 --- a/frappe/public/js/frappe/form/formatters.js +++ b/frappe/public/js/frappe/form/formatters.js @@ -303,6 +303,12 @@ frappe.form.formatters = {
    ${value}
    ` : ''; + }, + Icon: (value) => { + return value ? `
    +
    ${frappe.utils.icon(value , "md")}
    + ${value} +
    ` : ''; } }; diff --git a/frappe/public/js/frappe/icon_picker/icon_picker.js b/frappe/public/js/frappe/icon_picker/icon_picker.js new file mode 100644 index 0000000000..21805f963b --- /dev/null +++ b/frappe/public/js/frappe/icon_picker/icon_picker.js @@ -0,0 +1,86 @@ +class Picker { + constructor(opts) { + this.parent = opts.parent; + this.width = opts.width; + this.height = opts.height; + this.set_icon(opts.icon); + this.icons = opts.icons; + this.setup_picker(); + } + + refresh() { + this.update_icon_selected(true); + } + + setup_picker() { + this.icon_picker_wrapper = $(` +
    +
    + + ${frappe.utils.icon('search', "sm")} +
    +
    +
    +
    +
    + `); + this.parent.append(this.icon_picker_wrapper); + this.icon_wrapper = this.icon_picker_wrapper.find('.icons'); + this.search_input = this.icon_picker_wrapper.find('.search-icons > input'); + this.refresh(); + this.setup_icons(); + } + + setup_icons() { + this.icons.forEach(icon => { + let $icon = $(`
    ${frappe.utils.icon(icon, "md")}
    `); + this.icon_wrapper.append($icon); + const set_values = () => { + this.set_icon(icon); + this.update_icon_selected(); + }; + $icon.on('click', () => { + set_values(); + }); + $icon.keydown((e) => { + const key_code = e.keyCode; + if ([13, 32].includes(key_code)) { + e.preventDefault(); + set_values(); + } + }); + this.search_input.keyup((e) => { + e.preventDefault(); + this.filter_icons(); + }); + + this.search_input.on('search', () => { + this.filter_icons(); + }); + }); + } + + filter_icons() { + let value = this.search_input.val(); + if (!value) { + this.icon_wrapper.find(".icon-wrapper").removeClass('hidden'); + } else { + this.icon_wrapper.find(".icon-wrapper").addClass('hidden'); + this.icon_wrapper.find(`.icon-wrapper[id*='${value}']`).removeClass('hidden'); + } + } + + update_icon_selected(silent) { + !silent && this.on_change && this.on_change(this.get_icon()); + } + + set_icon(icon) { + this.icon = icon || ''; + } + + get_icon() { + return this.icon || ''; + } +} + +export default Picker; \ No newline at end of file diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss index c939c6de39..4d66797bba 100644 --- a/frappe/public/scss/common/controls.scss +++ b/frappe/public/scss/common/controls.scss @@ -1,5 +1,6 @@ @import "grid"; @import "color_picker"; +@import "icon_picker"; @import "datepicker"; // password diff --git a/frappe/public/scss/common/icon_picker.scss b/frappe/public/scss/common/icon_picker.scss new file mode 100644 index 0000000000..d352c5c670 --- /dev/null +++ b/frappe/public/scss/common/icon_picker.scss @@ -0,0 +1,85 @@ +.icon-picker { + font-size: var(--text-xs); + color: var(--text-muted); + --icon-picker-width: 240px; + width: var(--icon-picker-width); + .icons { + margin-top: 10px; + display: flex; + flex-wrap: wrap; + overflow-y: scroll; + max-height: 210px; + cursor: pointer; + + .icon-wrapper { + display: flex; + width: 30px; + height: 30px; + text-align: center; + align-items: center; + } + } + + .search-icons { + position: relative; + + input[type='search'] { + height: inherit; + padding-left: 30px; + } + + .search-icon { + position: absolute; + top: 7px; + left: 7px; + } + } + + /* Hide scrollbar for Chrome, Safari and Opera */ + .icons::-webkit-scrollbar { + display: none; + } + + /* Hide scrollbar for IE, Edge and Firefox */ + .icons { + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + } +} +.icon-picker-popover { + .picker-arrow { + left: 15px !important; + } +} + +.frappe-control[data-fieldtype='Icon'] { + input { + padding-left: 40px; + } + .selected-icon { + cursor: pointer; + width: 22px; + height: 22px; + border-radius: 5px; + position: absolute; + top: calc(50% + 1px); + left: 8px; + content: ' '; + } + .like-disabled-input { + .icon-value { + padding-left: 25px; + } + .selected-icon { + top: 20%; + cursor: default; + } + } +} + +.data-row.row { + .selected-icon { + top: calc(50% - 11px); + z-index: 2; + } +} \ No newline at end of file From d54bc4fc7068a627021d422956a2f09e024a9498 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Sun, 11 Jul 2021 21:00:03 +0530 Subject: [PATCH 0354/1519] fix: Make scrollbar thumb rounded --- frappe/public/scss/desk/scrollbar.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/desk/scrollbar.scss b/frappe/public/scss/desk/scrollbar.scss index d8fb49e5ce..9790ed0116 100644 --- a/frappe/public/scss/desk/scrollbar.scss +++ b/frappe/public/scss/desk/scrollbar.scss @@ -11,6 +11,7 @@ html { /* Works on Chrome, Edge, and Safari */ *::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb-color); + border-radius: 6px; } *::-webkit-scrollbar-track, From fe21efb76f82554602aa150b04d7a484cff9500a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Mon, 12 Jul 2021 10:06:06 +0530 Subject: [PATCH 0355/1519] fix: Keep charts as it is - Frappe Charts do not support RTL and rtlcss does not work on SVG... Setting direction as ltr to keep charts as it is --- frappe/public/scss/desk/global.scss | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frappe/public/scss/desk/global.scss b/frappe/public/scss/desk/global.scss index 1168c8ce8c..d1205e0e38 100644 --- a/frappe/public/scss/desk/global.scss +++ b/frappe/public/scss/desk/global.scss @@ -302,15 +302,6 @@ select.input-xs { } } -/*!rtl:raw: -.dropdown-menu { - right: auto; -} -.popover { - right: auto; -} -*/ - .custom-control.custom-switch { font-size: var(--text-md); line-height: 1.6; @@ -583,3 +574,15 @@ details > summary:focus { // font-family: 'Octicons'; // content: "\f00b"; // } + +/*rtl:raw: +.dropdown-menu { + right: auto; +} +.popover { + right: auto; +} +.chart-container { + direction: ltr; +} +*/ \ No newline at end of file From 6386414e1e298e7ead36e2522b047baaf66cbb91 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 11:08:24 +0530 Subject: [PATCH 0356/1519] fix: popover position --- frappe/public/icons/timeless/symbol-defs.svg | 2 +- frappe/public/js/frappe/form/controls/icon.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/public/icons/timeless/symbol-defs.svg b/frappe/public/icons/timeless/symbol-defs.svg index 5e52336bfa..7845811627 100644 --- a/frappe/public/icons/timeless/symbol-defs.svg +++ b/frappe/public/icons/timeless/symbol-defs.svg @@ -1,4 +1,4 @@ -
    -
    ${frappe.utils.icon(value , "md")}
    +
    ${frappe.utils.icon(value, "md")}
    ${value}
    ` : ''; } diff --git a/frappe/public/scss/common/icon_picker.scss b/frappe/public/scss/common/icon_picker.scss index d352c5c670..dbb4c00b65 100644 --- a/frappe/public/scss/common/icon_picker.scss +++ b/frappe/public/scss/common/icon_picker.scss @@ -11,6 +11,15 @@ max-height: 210px; cursor: pointer; + /* Hide scrollbar for IE, Edge and Firefox */ + -ms-overflow-style: none; /* IE and Edge */ + scrollbar-width: none; /* Firefox */ + + /* Hide scrollbar for Chrome, Safari and Opera */ + &::-webkit-scrollbar { + display: none; + } + .icon-wrapper { display: flex; width: 30px; @@ -34,17 +43,6 @@ left: 7px; } } - - /* Hide scrollbar for Chrome, Safari and Opera */ - .icons::-webkit-scrollbar { - display: none; - } - - /* Hide scrollbar for IE, Edge and Firefox */ - .icons { - -ms-overflow-style: none; /* IE and Edge */ - scrollbar-width: none; /* Firefox */ - } } .icon-picker-popover { .picker-arrow { @@ -82,4 +80,16 @@ top: calc(50% - 11px); z-index: 2; } +} + +.dt-cell__content { + .selected-icon { + display: contents; + } +} + +.dt-cell__edit, .filter-field { + .selected-icon { + top: 5px !important; + } } \ No newline at end of file From 934fc17a3b0aa10c65cd24e87606c674070c61f7 Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Mon, 12 Jul 2021 15:52:57 +0530 Subject: [PATCH 0358/1519] refactor: Improve readability, consistency --- frappe/tests/test_db.py | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index 920ec0d827..fc87c5a336 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -47,26 +47,34 @@ class TestDB(unittest.TestCase): def test_get_single_value(self): #setup - fieldtypes = ['Float', 'Int', 'Percent', 'Currency', 'Data', 'Date', 'Datetime', 'Time'] - values = [1.5, 1, 55.5, 12.5, 'Test', datetime.datetime.now().date(), datetime.datetime.now(), datetime.timedelta(hours=9, minutes=45, seconds=10)] + values_dict = { + "Float": 1.5, + "Int": 1, + "Percent": 55.5, + "Currency": 12.5, + "Data": "Test", + "Date": datetime.datetime.now().date(), + "Datetime": datetime.datetime.now(), + "Time": datetime.timedelta(hours=9, minutes=45, seconds=10) + } test_inputs = [{ - 'fieldtype': fieldtypes[i], - 'value': values[i]} for i in range(len(fieldtypes))] - for fieldtype in fieldtypes: - create_custom_field('Print Settings', { - "fieldname": 'test_'+fieldtype.lower(), - "label": 'Test '+fieldtype, + "fieldtype": fieldtype, + "value": value} for fieldtype, value in values_dict.items()] + for fieldtype in values_dict.keys(): + create_custom_field("Print Settings", { + "fieldname": "test_{0}".format(fieldtype.lower()), + "label": "Test {0}".format(fieldtype), "fieldtype": fieldtype, }) #test for inp in test_inputs: - fieldname = 'test_'+inp['fieldtype'].lower() - frappe.db.set_value('Print Settings', 'Print Settings', fieldname, inp['value']) - self.assertEqual(frappe.db.get_single_value('Print Settings', fieldname), inp['value']) + fieldname = "test_{0}".format(inp["fieldtype"].lower()) + frappe.db.set_value("Print Settings", "Print Settings", fieldname, inp["value"]) + self.assertEqual(frappe.db.get_single_value("Print Settings", fieldname), inp["value"]) #teardown - clear_custom_fields('Print Settings') + clear_custom_fields("Print Settings") def test_log_touched_tables(self): frappe.flags.in_migrate = True From d39a389fd5a066bb08b5805550f6b86d0b4618d3 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 17:01:30 +0530 Subject: [PATCH 0359/1519] fix: app check condition for getting correct list_context --- frappe/www/list.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/www/list.py b/frappe/www/list.py index 975347adac..3ed103b69d 100644 --- a/frappe/www/list.py +++ b/frappe/www/list.py @@ -161,11 +161,11 @@ def get_list_context(context, doctype, web_form_name=None): module = load_doctype_module(doctype) list_context = update_context_from_module(module, list_context) - # get context for custom doctype - if meta.custom: - get_custom_website_context = frappe.get_hooks('get_custom_website_context') - if get_custom_website_context: - out = frappe._dict(frappe.get_attr(get_custom_website_context[0])() or {}) + # get context for custom webform + if meta.custom and web_form_name: + list_context_for_custom_webform = frappe.get_hooks('get_list_context_for_custom_webform') + if list_context_for_custom_webform: + out = frappe._dict(frappe.get_attr(list_context_for_custom_webform[0])(meta.module) or {}) if out: list_context = out From 10fde05950d1284a2aeafa15367260f4231fffa5 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 12 Jul 2021 17:43:15 +0530 Subject: [PATCH 0360/1519] fix: custom script to duplicate row not working in v13 (#13667) (cherry picked from commit 1615baf69a476a4c8361cd8af19e2edada6b4784) --- frappe/public/js/frappe/form/form.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 8064f90a98..faaa3dfbd9 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -1265,7 +1265,9 @@ frappe.ui.form.Form = class FrappeForm { if (df && df[property] != value) { df[property] = value; if (table_field && table_row_name) { - this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name].refresh_field(fieldname); + if (this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name]) { + this.fields_dict[fieldname].grid.grid_rows_by_docname[table_row_name].refresh_field(fieldname); + } } else { this.refresh_field(fieldname); } From 42585579e6faf3ed285752cc8e408dd59a2e3d90 Mon Sep 17 00:00:00 2001 From: Mitul David <49085834+MitulDavid@users.noreply.github.com> Date: Mon, 12 Jul 2021 19:13:29 +0530 Subject: [PATCH 0361/1519] refactor: Replace str.format() with f-strings --- frappe/tests/test_db.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index fc87c5a336..04c9a525b1 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -62,14 +62,14 @@ class TestDB(unittest.TestCase): "value": value} for fieldtype, value in values_dict.items()] for fieldtype in values_dict.keys(): create_custom_field("Print Settings", { - "fieldname": "test_{0}".format(fieldtype.lower()), - "label": "Test {0}".format(fieldtype), + "fieldname": f"test_{fieldtype.lower()}", + "label": f"Test {fieldtype}", "fieldtype": fieldtype, }) #test for inp in test_inputs: - fieldname = "test_{0}".format(inp["fieldtype"].lower()) + fieldname = f"test_{inp['fieldtype'].lower()}" frappe.db.set_value("Print Settings", "Print Settings", fieldname, inp["value"]) self.assertEqual(frappe.db.get_single_value("Print Settings", fieldname), inp["value"]) @@ -157,29 +157,29 @@ class TestDB(unittest.TestCase): # Testing read self.assertEqual(list(frappe.get_all("ToDo", fields=[random_field], limit=1)[0])[0], random_field) - self.assertEqual(list(frappe.get_all("ToDo", fields=["`{0}` as total".format(random_field)], limit=1)[0])[0], "total") + self.assertEqual(list(frappe.get_all("ToDo", fields=[f"`{random_field}` as total"], limit=1)[0])[0], "total") # Testing read for distinct and sql functions self.assertEqual(list( frappe.get_all("ToDo", - fields=["`{0}` as total".format(random_field)], + fields=[f"`{random_field}` as total"], distinct=True, limit=1, )[0] )[0], "total") self.assertEqual(list( frappe.get_all("ToDo", - fields=["`{0}`".format(random_field)], + fields=[f"`{random_field}`"], distinct=True, limit=1, )[0] )[0], random_field) self.assertEqual(list( frappe.get_all("ToDo", - fields=["count(`{0}`)".format(random_field)], + fields=[f"count(`{random_field}`)"], limit=1 )[0] - )[0], "count" if frappe.conf.db_type == "postgres" else "count(`{0}`)".format(random_field)) + )[0], "count" if frappe.conf.db_type == "postgres" else f"count(`{random_field}`)") # Testing update frappe.db.set_value(test_doctype, random_doc, random_field, random_value) From 3709992dc1d7c9517e0efa2717c281069bd095d8 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 21:27:38 +0530 Subject: [PATCH 0362/1519] fix: query_report & report_view single vertical scrollbar --- .../js/frappe/views/reports/query_report.js | 3 ++ .../js/frappe/views/reports/report_view.js | 2 ++ frappe/public/scss/desk/report.scss | 28 +++++++++++++++---- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/frappe/public/js/frappe/views/reports/query_report.js b/frappe/public/js/frappe/views/reports/query_report.js index 208d5b2f67..2027311bfe 100644 --- a/frappe/public/js/frappe/views/reports/query_report.js +++ b/frappe/public/js/frappe/views/reports/query_report.js @@ -518,6 +518,9 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList { } else { this.page.show_form(); } + + this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); + this.page.body.parent().css('margin-bottom', 'unset'); } set_filters(filters) { diff --git a/frappe/public/js/frappe/views/reports/report_view.js b/frappe/public/js/frappe/views/reports/report_view.js index 6a324f6034..2547dd6407 100644 --- a/frappe/public/js/frappe/views/reports/report_view.js +++ b/frappe/public/js/frappe/views/reports/report_view.js @@ -49,6 +49,8 @@ frappe.views.ReportView = class ReportView extends frappe.views.ListView { this.setup_columns(); super.setup_new_doc_event(); this.page.main.addClass('report-view'); + this.page.body[0].style.setProperty('--report-filter-height', this.page.page_form.css('height')); + this.page.body.parent().css('margin-bottom', 'unset'); } toggle_side_bar() { diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 3e26081d62..b849f42b36 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -84,28 +84,44 @@ margin-bottom: 10px; } +.layout-main-section .frappe-card { + --report-filter-height: 0px; +} + .report-wrapper { overflow: auto; + + .datatable { + height: calc(100vh - var(--report-filter-height) - 205px); + + .dt-scrollable { + height: calc(100vh - var(--report-filter-height) - 275px); + } + } } .report-view { - margin-bottom: calc(var(--page-bottom-margin) * -1); - .result { - min-height: calc(100vh - 320px) !important; - .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); } } - .dt-scrollable { - height: 30vw; + .datatable { + height: calc(100vh - var(--report-filter-height) - 225px); + + .dt-scrollable { + height: calc(100vh - var(--report-filter-height) - 295px); + } } } } +// .frappe-card { +// height: calc(100vh - 165px); +// } + .group-by-button { margin: 5px; max-width: 125px; From 0967316c77f45772c099f781047b170b8c4f709c Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 12 Jul 2021 21:44:21 +0530 Subject: [PATCH 0363/1519] chore: remove commented code --- frappe/public/scss/desk/report.scss | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index b849f42b36..061fdef776 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -118,9 +118,6 @@ } } -// .frappe-card { -// height: calc(100vh - 165px); -// } .group-by-button { margin: 5px; From 959a5549d120b436f7469b7ff87cb919635f4e39 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 13 Jul 2021 09:51:40 +0530 Subject: [PATCH 0364/1519] fix(minor): website_builder.scss padding and line-height for cards --- frappe/public/scss/website/page_builder.scss | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/frappe/public/scss/website/page_builder.scss b/frappe/public/scss/website/page_builder.scss index 6eb6dae5d2..6e30836c71 100644 --- a/frappe/public/scss/website/page_builder.scss +++ b/frappe/public/scss/website/page_builder.scss @@ -151,14 +151,10 @@ } .card-title { - line-height: 1; + line-height: 1.3; } &.card-sm { - .card-body { - padding: 1.5rem; - } - .card-title { font-size: $font-size-base; font-weight: 600; @@ -169,10 +165,6 @@ } } &.card-md { - .card-body { - padding: 1.75rem; - } - .card-title { font-size: $font-size-lg; font-weight: 600; @@ -186,10 +178,6 @@ } } &.card-lg { - .card-body { - padding: 2rem; - } - .card-title { font-size: $font-size-xl; font-weight: bold; From 372447846efceb9f0af28cd7cb94e119a1bb0bf5 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Tue, 13 Jul 2021 10:14:43 +0530 Subject: [PATCH 0365/1519] fix(minor): website_builder.scss removed border for cards --- frappe/public/scss/website.bundle.scss | 2 +- frappe/public/scss/website/page_builder.scss | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/website.bundle.scss b/frappe/public/scss/website.bundle.scss index bcbb6f3c6a..06ec73c386 100644 --- a/frappe/public/scss/website.bundle.scss +++ b/frappe/public/scss/website.bundle.scss @@ -1 +1 @@ -@import './website/index'; \ No newline at end of file +@import './website/index'; diff --git a/frappe/public/scss/website/page_builder.scss b/frappe/public/scss/website/page_builder.scss index 6e30836c71..ff9f4ae1e6 100644 --- a/frappe/public/scss/website/page_builder.scss +++ b/frappe/public/scss/website/page_builder.scss @@ -145,6 +145,11 @@ .section-with-cards .card { @include transition(); + border: none; + + .card-body { + padding: 0 1.5rem 2rem 0; + } &:hover { border-color: $gray-500; From 792319444970d67d7414fb7ab14dfe44409e6a77 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 10:29:53 +0530 Subject: [PATCH 0366/1519] fix: min-height for report view --- frappe/public/scss/desk/report.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 061fdef776..564b813ab2 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -102,6 +102,7 @@ .report-view { .result { + min-height: calc(100vh - 320px); .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); From f5c77f547ffd3db384feff6dc6cc554a8ec6347b Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 10:41:25 +0530 Subject: [PATCH 0367/1519] fix: minor fix --- frappe/public/scss/desk/report.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/public/scss/desk/report.scss b/frappe/public/scss/desk/report.scss index 564b813ab2..e2aae431aa 100644 --- a/frappe/public/scss/desk/report.scss +++ b/frappe/public/scss/desk/report.scss @@ -102,7 +102,7 @@ .report-view { .result { - min-height: calc(100vh - 320px); + min-height: 50vh !important; .dt-row:last-child:not(.dt-row-filter) { .dt-cell { border-bottom: 1px solid var(--border-color); @@ -119,7 +119,6 @@ } } - .group-by-button { margin: 5px; max-width: 125px; From 45cdf7a2695a4e123184982167e736e04a1c140e Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Mohsin Rajan Date: Tue, 13 Jul 2021 11:15:22 +0530 Subject: [PATCH 0368/1519] chore: correct error message --- frappe/desk/doctype/notification_log/notification_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index f5f1b3b124..af09d65015 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -15,7 +15,7 @@ class NotificationLog(Document): try: send_notification_email(self) except frappe.OutgoingEmailError: - frappe.log_error(message = frappe.get_traceback(), title=_("Error Sending Notification Email(System Notification sent).")) + frappe.log_error(message = frappe.get_traceback(), title=_("Error Sending Notification Email.")) def get_permission_query_conditions(for_user): From dc50b77179326bd8f06fa524b6e4182ac1737ef5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Jun 2021 13:08:25 +0530 Subject: [PATCH 0369/1519] chore: Drop Data Import Legacy --- frappe/commands/utils.py | 32 +- .../doctype/data_import_legacy/__init__.py | 0 .../data_import_legacy/data_import_legacy.js | 324 ----------- .../data_import_legacy.json | 218 ------- .../data_import_legacy/data_import_legacy.py | 126 ---- .../data_import_legacy_list.js | 24 - .../doctype/data_import_legacy/importer.py | 538 ------------------ .../data_import_legacy/log_details.html | 38 -- .../test_data_import_legacy.py | 8 - 9 files changed, 6 insertions(+), 1302 deletions(-) delete mode 100644 frappe/core/doctype/data_import_legacy/__init__.py delete mode 100644 frappe/core/doctype/data_import_legacy/data_import_legacy.js delete mode 100644 frappe/core/doctype/data_import_legacy/data_import_legacy.json delete mode 100644 frappe/core/doctype/data_import_legacy/data_import_legacy.py delete mode 100644 frappe/core/doctype/data_import_legacy/data_import_legacy_list.js delete mode 100644 frappe/core/doctype/data_import_legacy/importer.py delete mode 100644 frappe/core/doctype/data_import_legacy/log_details.html delete mode 100644 frappe/core/doctype/data_import_legacy/test_data_import_legacy.py diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index ca58e78870..506ec7816b 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -358,32 +358,12 @@ def import_doc(context, path, force=False): @click.option('--no-email', default=True, is_flag=True, help='Send email if applicable') @pass_context def import_csv(context, path, only_insert=False, submit_after_import=False, ignore_encoding_errors=False, no_email=True): - "Import CSV using data import" - from frappe.core.doctype.data_import_legacy import importer - from frappe.utils.csvutils import read_csv_content - site = get_site(context) - - if not os.path.exists(path): - path = os.path.join('..', path) - if not os.path.exists(path): - print('Invalid path {0}'.format(path)) - sys.exit(1) - - with open(path, 'r') as csvfile: - content = read_csv_content(csvfile.read()) - - frappe.init(site=site) - frappe.connect() - - try: - importer.upload(content, submit_after_import=submit_after_import, no_email=no_email, - ignore_encoding_errors=ignore_encoding_errors, overwrite=not only_insert, - via_console=True) - frappe.db.commit() - except Exception: - print(frappe.get_traceback()) - - frappe.destroy() + click.secho( + "The `import-csv` command used 'Data Import Legacy' which has been deprecated.\n" + "Use `data-import` command instead to import data via 'Data Import'.", + fg="yellow", + ) + sys.exit(1) @click.command('data-import') diff --git a/frappe/core/doctype/data_import_legacy/__init__.py b/frappe/core/doctype/data_import_legacy/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/frappe/core/doctype/data_import_legacy/data_import_legacy.js b/frappe/core/doctype/data_import_legacy/data_import_legacy.js deleted file mode 100644 index 8e4f397171..0000000000 --- a/frappe/core/doctype/data_import_legacy/data_import_legacy.js +++ /dev/null @@ -1,324 +0,0 @@ -// Copyright (c) 2017, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on('Data Import Legacy', { - onload: function(frm) { - if (frm.doc.__islocal) { - frm.set_value("action", ""); - } - - frappe.call({ - method: "frappe.core.doctype.data_import_legacy.data_import_legacy.get_importable_doctypes", - callback: function (r) { - let importable_doctypes = r.message; - frm.set_query("reference_doctype", function () { - return { - "filters": { - "issingle": 0, - "istable": 0, - "name": ['in', importable_doctypes] - } - }; - }); - } - }), - - // should never check public - frm.fields_dict["import_file"].df.is_private = 1; - - frappe.realtime.on("data_import_progress", function(data) { - if (data.data_import === frm.doc.name) { - if (data.reload && data.reload === true) { - frm.reload_doc(); - } - if (data.progress) { - let progress_bar = $(frm.dashboard.progress_area.body).find(".progress-bar"); - if (progress_bar) { - $(progress_bar).removeClass("progress-bar-danger").addClass("progress-bar-success progress-bar-striped"); - $(progress_bar).css("width", data.progress + "%"); - } - } - } - }); - }, - - reference_doctype: function(frm){ - if (frm.doc.reference_doctype) { - frappe.model.with_doctype(frm.doc.reference_doctype); - } - }, - - refresh: function(frm) { - frm.disable_save(); - frm.dashboard.clear_headline(); - if (frm.doc.reference_doctype && !frm.doc.import_file) { - frm.page.set_indicator(__('Attach file'), 'orange'); - } else { - if (frm.doc.import_status) { - const listview_settings = frappe.listview_settings['Data Import Legacy']; - const indicator = listview_settings.get_indicator(frm.doc); - - frm.page.set_indicator(indicator[0], indicator[1]); - - if (frm.doc.import_status === "In Progress") { - frm.dashboard.add_progress("Data Import Progress", "0"); - frm.set_read_only(); - frm.refresh_fields(); - } - } - } - - if (frm.doc.reference_doctype) { - frappe.model.with_doctype(frm.doc.reference_doctype); - } - - if(frm.doc.action == "Insert new records" || frm.doc.action == "Update records") { - frm.set_df_property("action", "read_only", 1); - } - - frm.add_custom_button(__("Help"), function() { - frappe.help.show_video("6wiriRKPhmg"); - }); - - if (frm.doc.reference_doctype && frm.doc.docstatus === 0) { - frm.add_custom_button(__("Download template"), function() { - frappe.data_import.download_dialog(frm).show(); - }); - } - - if (frm.doc.reference_doctype && frm.doc.import_file && frm.doc.total_rows && - frm.doc.docstatus === 0 && (!frm.doc.import_status || frm.doc.import_status == "Failed")) { - frm.page.set_primary_action(__("Start Import"), function() { - frappe.call({ - btn: frm.page.btn_primary, - method: "frappe.core.doctype.data_import_legacy.data_import_legacy.import_data", - args: { - data_import: frm.doc.name - } - }); - }).addClass('btn btn-primary'); - } - - if (frm.doc.log_details) { - frm.events.create_log_table(frm); - } else { - $(frm.fields_dict.import_log.wrapper).empty(); - } - }, - - action: function(frm) { - if(!frm.doc.action) return; - if(!frm.doc.reference_doctype) { - frappe.msgprint(__("Please select document type first.")); - frm.set_value("action", ""); - return; - } - - if(frm.doc.action == "Insert new records") { - frm.doc.insert_new = 1; - } else if (frm.doc.action == "Update records"){ - frm.doc.overwrite = 1; - } - frm.save(); - }, - - only_update: function(frm) { - frm.save(); - }, - - submit_after_import: function(frm) { - frm.save(); - }, - - skip_errors: function(frm) { - frm.save(); - }, - - ignore_encoding_errors: function(frm) { - frm.save(); - }, - - no_email: function(frm) { - frm.save(); - }, - - show_only_errors: function(frm) { - frm.events.create_log_table(frm); - }, - - create_log_table: function(frm) { - let msg = JSON.parse(frm.doc.log_details); - var $log_wrapper = $(frm.fields_dict.import_log.wrapper).empty(); - $(frappe.render_template("log_details", { - data: msg.messages, - import_status: frm.doc.import_status, - show_only_errors: frm.doc.show_only_errors, - })).appendTo($log_wrapper); - } -}); - -frappe.provide('frappe.data_import'); -frappe.data_import.download_dialog = function(frm) { - var dialog; - const filter_fields = df => frappe.model.is_value_type(df) && !df.hidden; - const get_fields = dt => frappe.meta.get_docfields(dt).filter(filter_fields); - - const get_doctype_checkbox_fields = () => { - return dialog.fields.filter(df => df.fieldname.endsWith('_fields')) - .map(df => dialog.fields_dict[df.fieldname]); - }; - - const doctype_fields = get_fields(frm.doc.reference_doctype) - .map(df => { - let reqd = (df.reqd || df.fieldname == 'naming_series') ? 1 : 0; - return { - label: df.label, - reqd: reqd, - danger: reqd, - value: df.fieldname, - checked: 1 - }; - }); - - let fields = [ - { - "label": __("Select Columns"), - "fieldname": "select_columns", - "fieldtype": "Select", - "options": "All\nMandatory\nManually", - "reqd": 1, - "onchange": function() { - const fields = get_doctype_checkbox_fields(); - fields.map(f => f.toggle(true)); - if(this.value == 'Mandatory' || this.value == 'Manually') { - checkbox_toggle(true); - fields.map(multicheck_field => { - multicheck_field.options.map(option => { - if(!option.reqd) return; - $(multicheck_field.$wrapper).find(`:checkbox[data-unit="${option.value}"]`) - .prop('checked', false) - .trigger('click'); - }); - }); - } else if(this.value == 'All'){ - $(dialog.body).find(`[data-fieldtype="MultiCheck"] :checkbox`) - .prop('disabled', true); - } - } - }, - { - "label": __("File Type"), - "fieldname": "file_type", - "fieldtype": "Select", - "options": "Excel\nCSV", - "default": "Excel" - }, - { - "label": __("Download with Data"), - "fieldname": "with_data", - "fieldtype": "Check", - "hidden": !frm.doc.overwrite, - "default": 1 - }, - { - "label": __("Select All"), - "fieldname": "select_all", - "fieldtype": "Button", - "depends_on": "eval:doc.select_columns=='Manually'", - click: function() { - checkbox_toggle(); - } - }, - { - "label": __("Unselect All"), - "fieldname": "unselect_all", - "fieldtype": "Button", - "depends_on": "eval:doc.select_columns=='Manually'", - click: function() { - checkbox_toggle(true); - } - }, - { - "label": frm.doc.reference_doctype, - "fieldname": "doctype_fields", - "fieldtype": "MultiCheck", - "options": doctype_fields, - "columns": 2, - "hidden": 1 - } - ]; - - const child_table_fields = frappe.meta.get_table_fields(frm.doc.reference_doctype) - .map(df => { - return { - "label": df.options, - "fieldname": df.fieldname + '_fields', - "fieldtype": "MultiCheck", - "options": frappe.meta.get_docfields(df.options) - .filter(filter_fields) - .map(df => ({ - label: df.label, - reqd: df.reqd ? 1 : 0, - value: df.fieldname, - checked: 1, - danger: df.reqd - })), - "columns": 2, - "hidden": 1 - }; - }); - - fields = fields.concat(child_table_fields); - - dialog = new frappe.ui.Dialog({ - title: __('Download Template'), - fields: fields, - primary_action: function(values) { - var data = values; - if (frm.doc.reference_doctype) { - var export_params = () => { - let columns = {}; - if(values.select_columns) { - columns = get_doctype_checkbox_fields().reduce((columns, field) => { - const options = field.get_checked_options(); - columns[field.df.label] = options; - return columns; - }, {}); - } - - return { - doctype: frm.doc.reference_doctype, - parent_doctype: frm.doc.reference_doctype, - select_columns: JSON.stringify(columns), - with_data: frm.doc.overwrite && data.with_data, - all_doctypes: true, - file_type: data.file_type, - template: true - }; - }; - let get_template_url = '/api/method/frappe.core.doctype.data_export.exporter.export_data'; - open_url_post(get_template_url, export_params()); - } else { - frappe.msgprint(__("Please select the Document Type.")); - } - dialog.hide(); - }, - primary_action_label: __('Download') - }); - - $(dialog.body).find('div[data-fieldname="select_all"], div[data-fieldname="unselect_all"]') - .wrapAll('
    '); - const button_container = $(dialog.body).find('.inline-buttons'); - button_container.addClass('flex'); - $(button_container).find('.frappe-control').map((index, button) => { - $(button).css({"margin-right": "1em"}); - }); - - function checkbox_toggle(checked=false) { - $(dialog.body).find('[data-fieldtype="MultiCheck"]').map((index, element) => { - $(element).find(`:checkbox`).prop("checked", checked).trigger('click'); - }); - } - - return dialog; -}; diff --git a/frappe/core/doctype/data_import_legacy/data_import_legacy.json b/frappe/core/doctype/data_import_legacy/data_import_legacy.json deleted file mode 100644 index 852ccba156..0000000000 --- a/frappe/core/doctype/data_import_legacy/data_import_legacy.json +++ /dev/null @@ -1,218 +0,0 @@ -{ - "actions": [], - "allow_copy": 1, - "creation": "2020-06-11 16:13:23.813709", - "doctype": "DocType", - "document_type": "Document", - "editable_grid": 1, - "engine": "InnoDB", - "field_order": [ - "reference_doctype", - "action", - "insert_new", - "overwrite", - "only_update", - "section_break_4", - "import_file", - "column_break_4", - "error_file", - "section_break_6", - "skip_errors", - "submit_after_import", - "ignore_encoding_errors", - "no_email", - "import_detail", - "import_status", - "show_only_errors", - "import_log", - "log_details", - "amended_from", - "total_rows", - "amended_from" - ], - "fields": [ - { - "fieldname": "reference_doctype", - "fieldtype": "Link", - "ignore_user_permissions": 1, - "in_list_view": 1, - "label": "Document Type", - "options": "DocType", - "reqd": 1 - }, - { - "fieldname": "action", - "fieldtype": "Select", - "label": "Action", - "options": "Insert new records\nUpdate records", - "reqd": 1 - }, - { - "default": "0", - "depends_on": "eval:!doc.overwrite", - "description": "New data will be inserted.", - "fieldname": "insert_new", - "fieldtype": "Check", - "hidden": 1, - "label": "Insert new records", - "set_only_once": 1 - }, - { - "default": "0", - "depends_on": "eval:!doc.insert_new", - "description": "If you are updating/overwriting already created records.", - "fieldname": "overwrite", - "fieldtype": "Check", - "hidden": 1, - "label": "Update records", - "set_only_once": 1 - }, - { - "default": "0", - "depends_on": "overwrite", - "description": "If you don't want to create any new records while updating the older records.", - "fieldname": "only_update", - "fieldtype": "Check", - "label": "Don't create new records" - }, - { - "depends_on": "eval:(!doc.__islocal)", - "fieldname": "section_break_4", - "fieldtype": "Section Break" - }, - { - "fieldname": "import_file", - "fieldtype": "Attach", - "label": "Attach file for Import" - }, - { - "fieldname": "column_break_4", - "fieldtype": "Column Break" - }, - { - "depends_on": "eval: doc.import_status == \"Partially Successful\"", - "description": "This is the template file generated with only the rows having some error. You should use this file for correction and import.", - "fieldname": "error_file", - "fieldtype": "Attach", - "label": "Generated File" - }, - { - "depends_on": "eval:(!doc.__islocal)", - "fieldname": "section_break_6", - "fieldtype": "Section Break" - }, - { - "default": "0", - "description": "If this is checked, rows with valid data will be imported and invalid rows will be dumped into a new file for you to import later.", - "fieldname": "skip_errors", - "fieldtype": "Check", - "label": "Skip rows with errors" - }, - { - "default": "0", - "fieldname": "submit_after_import", - "fieldtype": "Check", - "label": "Submit after importing" - }, - { - "default": "0", - "fieldname": "ignore_encoding_errors", - "fieldtype": "Check", - "label": "Ignore encoding errors" - }, - { - "default": "1", - "fieldname": "no_email", - "fieldtype": "Check", - "label": "Do not send Emails" - }, - { - "collapsible": 1, - "collapsible_depends_on": "eval: doc.import_status == \"Failed\"", - "depends_on": "import_status", - "fieldname": "import_detail", - "fieldtype": "Section Break", - "label": "Import Log" - }, - { - "fieldname": "import_status", - "fieldtype": "Select", - "label": "Import Status", - "options": "\nSuccessful\nFailed\nIn Progress\nPartially Successful", - "read_only": 1 - }, - { - "allow_on_submit": 1, - "default": "1", - "fieldname": "show_only_errors", - "fieldtype": "Check", - "label": "Show only errors", - "no_copy": 1, - "print_hide": 1 - }, - { - "allow_on_submit": 1, - "depends_on": "import_status", - "fieldname": "import_log", - "fieldtype": "HTML", - "label": "Import Log" - }, - { - "allow_on_submit": 1, - "fieldname": "log_details", - "fieldtype": "Code", - "hidden": 1, - "label": "Log Details", - "read_only": 1 - }, - { - "fieldname": "amended_from", - "fieldtype": "Link", - "label": "Amended From", - "no_copy": 1, - "options": "Data Import", - "print_hide": 1, - "read_only": 1 - }, - { - "fieldname": "total_rows", - "fieldtype": "Int", - "hidden": 1, - "label": "Total Rows", - "read_only": 1 - }, - { - "fieldname": "amended_from", - "fieldtype": "Link", - "label": "Amended From", - "no_copy": 1, - "options": "Data Import Legacy", - "print_hide": 1, - "read_only": 1 - } - ], - "is_submittable": 1, - "links": [], - "max_attachments": 1, - "modified": "2020-06-11 16:13:23.813709", - "modified_by": "Administrator", - "module": "Core", - "name": "Data Import Legacy", - "owner": "Administrator", - "permissions": [ - { - "create": 1, - "delete": 1, - "email": 1, - "read": 1, - "role": "System Manager", - "share": 1, - "submit": 1, - "write": 1 - } - ], - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 1 -} \ No newline at end of file diff --git a/frappe/core/doctype/data_import_legacy/data_import_legacy.py b/frappe/core/doctype/data_import_legacy/data_import_legacy.py deleted file mode 100644 index 63f806d75b..0000000000 --- a/frappe/core/doctype/data_import_legacy/data_import_legacy.py +++ /dev/null @@ -1,126 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2017, Frappe Technologies and contributors -# For license information, please see license.txt - -import os - -import frappe -import frappe.modules.import_file -from frappe import _ -from frappe.core.doctype.data_import_legacy.importer import upload -from frappe.model.document import Document -from frappe.modules.import_file import import_file_by_path as _import_file_by_path -from frappe.utils.background_jobs import enqueue -from frappe.utils.data import format_datetime - - -class DataImportLegacy(Document): - def autoname(self): - if not self.name: - self.name = "Import on " + format_datetime(self.creation) - - def validate(self): - if not self.import_file: - self.db_set("total_rows", 0) - if self.import_status == "In Progress": - frappe.throw(_("Can't save the form as data import is in progress.")) - - # validate the template just after the upload - # if there is total_rows in the doc, it means that the template is already validated and error free - if self.import_file and not self.total_rows: - upload(data_import_doc=self, from_data_import="Yes", validate_template=True) - - -@frappe.whitelist() -def get_importable_doctypes(): - return frappe.cache().hget("can_import", frappe.session.user) - - -@frappe.whitelist() -def import_data(data_import): - frappe.db.set_value("Data Import Legacy", data_import, "import_status", "In Progress", update_modified=False) - frappe.publish_realtime("data_import_progress", {"progress": "0", - "data_import": data_import, "reload": True}, user=frappe.session.user) - - from frappe.core.page.background_jobs.background_jobs import get_info - enqueued_jobs = [d.get("job_name") for d in get_info()] - - if data_import not in enqueued_jobs: - enqueue(upload, queue='default', timeout=6000, event='data_import', job_name=data_import, - data_import_doc=data_import, from_data_import="Yes", user=frappe.session.user) - - -def import_doc(path, overwrite=False, ignore_links=False, ignore_insert=False, - insert=False, submit=False, pre_process=None): - if os.path.isdir(path): - files = [os.path.join(path, f) for f in os.listdir(path)] - else: - files = [path] - - for f in files: - if f.endswith(".json"): - frappe.flags.mute_emails = True - _import_file_by_path(f, data_import=True, force=True, pre_process=pre_process, reset_permissions=True) - frappe.flags.mute_emails = False - frappe.db.commit() - elif f.endswith(".csv"): - import_file_by_path(f, ignore_links=ignore_links, overwrite=overwrite, submit=submit, pre_process=pre_process) - frappe.db.commit() - - -def import_file_by_path(path, ignore_links=False, overwrite=False, submit=False, pre_process=None, no_email=True): - from frappe.utils.csvutils import read_csv_content - print("Importing " + path) - with open(path, "r") as infile: - upload(rows=read_csv_content(infile.read()), ignore_links=ignore_links, no_email=no_email, overwrite=overwrite, - submit_after_import=submit, pre_process=pre_process) - - -def export_json(doctype, path, filters=None, or_filters=None, name=None, order_by="creation asc"): - def post_process(out): - del_keys = ('modified_by', 'creation', 'owner', 'idx') - for doc in out: - for key in del_keys: - if key in doc: - del doc[key] - for k, v in doc.items(): - if isinstance(v, list): - for child in v: - for key in del_keys + ('docstatus', 'doctype', 'modified', 'name'): - if key in child: - del child[key] - - out = [] - if name: - out.append(frappe.get_doc(doctype, name).as_dict()) - elif frappe.db.get_value("DocType", doctype, "issingle"): - out.append(frappe.get_doc(doctype).as_dict()) - else: - for doc in frappe.get_all(doctype, fields=["name"], filters=filters, or_filters=or_filters, limit_page_length=0, order_by=order_by): - out.append(frappe.get_doc(doctype, doc.name).as_dict()) - post_process(out) - - dirname = os.path.dirname(path) - if not os.path.exists(dirname): - path = os.path.join('..', path) - - with open(path, "w") as outfile: - outfile.write(frappe.as_json(out)) - - -def export_csv(doctype, path): - from frappe.core.doctype.data_export.exporter import export_data - with open(path, "wb") as csvfile: - export_data(doctype=doctype, all_doctypes=True, template=True, with_data=True) - csvfile.write(frappe.response.result.encode("utf-8")) - - -@frappe.whitelist() -def export_fixture(doctype, app): - if frappe.session.user != "Administrator": - raise frappe.PermissionError - - if not os.path.exists(frappe.get_app_path(app, "fixtures")): - os.mkdir(frappe.get_app_path(app, "fixtures")) - - export_json(doctype, frappe.get_app_path(app, "fixtures", frappe.scrub(doctype) + ".json"), order_by="name asc") diff --git a/frappe/core/doctype/data_import_legacy/data_import_legacy_list.js b/frappe/core/doctype/data_import_legacy/data_import_legacy_list.js deleted file mode 100644 index fcf2391313..0000000000 --- a/frappe/core/doctype/data_import_legacy/data_import_legacy_list.js +++ /dev/null @@ -1,24 +0,0 @@ -frappe.listview_settings['Data Import Legacy'] = { - add_fields: ["import_status"], - has_indicator_for_draft: 1, - get_indicator: function(doc) { - - let status = { - 'Successful': [__("Success"), "green", "import_status,=,Successful"], - 'Partially Successful': [__("Partial Success"), "blue", "import_status,=,Partially Successful"], - 'In Progress': [__("In Progress"), "orange", "import_status,=,In Progress"], - 'Failed': [__("Failed"), "red", "import_status,=,Failed"], - 'Pending': [__("Pending"), "orange", "import_status,=,"] - } - - if (doc.import_status) { - return status[doc.import_status]; - } - - if (doc.docstatus == 0) { - return status['Pending']; - } - - return status['Pending']; - } -}; diff --git a/frappe/core/doctype/data_import_legacy/importer.py b/frappe/core/doctype/data_import_legacy/importer.py deleted file mode 100644 index ceefff4410..0000000000 --- a/frappe/core/doctype/data_import_legacy/importer.py +++ /dev/null @@ -1,538 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -import requests -import frappe, json -import frappe.permissions - -from frappe import _ - -from frappe.utils.csvutils import getlink -from frappe.utils.dateutils import parse_date - -from frappe.utils import cint, cstr, flt, getdate, get_datetime, get_url, get_absolute_url, duration_to_seconds - - -@frappe.whitelist() -def get_data_keys(): - return frappe._dict({ - "data_separator": _('Start entering data below this line'), - "main_table": _("Table") + ":", - "parent_table": _("Parent Table") + ":", - "columns": _("Column Name") + ":", - "doctype": _("DocType") + ":" - }) - - - -@frappe.whitelist() -def upload(rows = None, submit_after_import=None, ignore_encoding_errors=False, no_email=True, overwrite=None, - update_only = None, ignore_links=False, pre_process=None, via_console=False, from_data_import="No", - skip_errors = True, data_import_doc=None, validate_template=False, user=None): - """upload data""" - - # for translations - if user: - frappe.cache().hdel("lang", user) - frappe.set_user_lang(user) - - if data_import_doc and isinstance(data_import_doc, str): - data_import_doc = frappe.get_doc("Data Import Legacy", data_import_doc) - if data_import_doc and from_data_import == "Yes": - no_email = data_import_doc.no_email - ignore_encoding_errors = data_import_doc.ignore_encoding_errors - update_only = data_import_doc.only_update - submit_after_import = data_import_doc.submit_after_import - overwrite = data_import_doc.overwrite - skip_errors = data_import_doc.skip_errors - else: - # extra input params - params = json.loads(frappe.form_dict.get("params") or '{}') - if params.get("submit_after_import"): - submit_after_import = True - if params.get("ignore_encoding_errors"): - ignore_encoding_errors = True - if not params.get("no_email"): - no_email = False - if params.get('update_only'): - update_only = True - if params.get('from_data_import'): - from_data_import = params.get('from_data_import') - if not params.get('skip_errors'): - skip_errors = params.get('skip_errors') - - frappe.flags.in_import = True - frappe.flags.mute_emails = no_email - - def get_data_keys_definition(): - return get_data_keys() - - def bad_template(): - frappe.throw(_("Please do not change the rows above {0}").format(get_data_keys_definition().data_separator)) - - def check_data_length(): - if not data: - frappe.throw(_("No data found in the file. Please reattach the new file with data.")) - - def get_start_row(): - for i, row in enumerate(rows): - if row and row[0]==get_data_keys_definition().data_separator: - return i+1 - bad_template() - - def get_header_row(key): - return get_header_row_and_idx(key)[0] - - def get_header_row_and_idx(key): - for i, row in enumerate(header): - if row and row[0]==key: - return row, i - return [], -1 - - def filter_empty_columns(columns): - empty_cols = list(filter(lambda x: x in ("", None), columns)) - - if empty_cols: - if columns[-1*len(empty_cols):] == empty_cols: - # filter empty columns if they exist at the end - columns = columns[:-1*len(empty_cols)] - else: - frappe.msgprint(_("Please make sure that there are no empty columns in the file."), - raise_exception=1) - - return columns - - def make_column_map(): - doctype_row, row_idx = get_header_row_and_idx(get_data_keys_definition().doctype) - if row_idx == -1: # old style - return - - dt = None - for i, d in enumerate(doctype_row[1:]): - if d not in ("~", "-"): - if d and doctype_row[i] in (None, '' ,'~', '-', _("DocType") + ":"): - dt, parentfield = d, None - # xls format truncates the row, so it may not have more columns - if len(doctype_row) > i+2: - parentfield = doctype_row[i+2] - doctypes.append((dt, parentfield)) - column_idx_to_fieldname[(dt, parentfield)] = {} - column_idx_to_fieldtype[(dt, parentfield)] = {} - if dt: - column_idx_to_fieldname[(dt, parentfield)][i+1] = rows[row_idx + 2][i+1] - column_idx_to_fieldtype[(dt, parentfield)][i+1] = rows[row_idx + 4][i+1] - - def get_doc(start_idx): - if doctypes: - doc = {} - attachments = [] - last_error_row_idx = None - for idx in range(start_idx, len(rows)): - last_error_row_idx = idx # pylint: disable=W0612 - if (not doc) or main_doc_empty(rows[idx]): - for dt, parentfield in doctypes: - d = {} - for column_idx in column_idx_to_fieldname[(dt, parentfield)]: - try: - fieldname = column_idx_to_fieldname[(dt, parentfield)][column_idx] - fieldtype = column_idx_to_fieldtype[(dt, parentfield)][column_idx] - - if not fieldname or not rows[idx][column_idx]: - continue - - d[fieldname] = rows[idx][column_idx] - if fieldtype in ("Int", "Check"): - d[fieldname] = cint(d[fieldname]) - elif fieldtype in ("Float", "Currency", "Percent"): - d[fieldname] = flt(d[fieldname]) - elif fieldtype == "Date": - if d[fieldname] and isinstance(d[fieldname], str): - d[fieldname] = getdate(parse_date(d[fieldname])) - elif fieldtype == "Datetime": - if d[fieldname]: - if " " in d[fieldname]: - _date, _time = d[fieldname].split() - else: - _date, _time = d[fieldname], '00:00:00' - _date = parse_date(d[fieldname]) - d[fieldname] = get_datetime(_date + " " + _time) - else: - d[fieldname] = None - elif fieldtype == "Duration": - d[fieldname] = duration_to_seconds(cstr(d[fieldname])) - elif fieldtype in ("Image", "Attach Image", "Attach"): - # added file to attachments list - attachments.append(d[fieldname]) - - elif fieldtype in ("Link", "Dynamic Link", "Data") and d[fieldname]: - # as fields can be saved in the number format(long type) in data import template - d[fieldname] = cstr(d[fieldname]) - - except IndexError: - pass - - # scrub quotes from name and modified - if d.get("name") and d["name"].startswith('"'): - d["name"] = d["name"][1:-1] - - if sum(0 if not val else 1 for val in d.values()): - d['doctype'] = dt - if dt == doctype: - doc.update(d) - else: - if not overwrite and doc.get("name"): - d['parent'] = doc["name"] - d['parenttype'] = doctype - d['parentfield'] = parentfield - doc.setdefault(d['parentfield'], []).append(d) - else: - break - - return doc, attachments, last_error_row_idx - else: - doc = frappe._dict(zip(columns, rows[start_idx][1:])) - doc['doctype'] = doctype - return doc, [], None - - # used in testing whether a row is empty or parent row or child row - # checked only 3 first columns since first two columns can be blank for example the case of - # importing the item variant where item code and item name will be blank. - def main_doc_empty(row): - if row: - for i in range(3,0,-1): - if len(row) > i and row[i]: - return False - return True - - def validate_naming(doc): - autoname = frappe.get_meta(doctype).autoname - if autoname: - if autoname[0:5] == 'field': - autoname = autoname[6:] - elif autoname == 'naming_series:': - autoname = 'naming_series' - else: - return True - - if (autoname not in doc) or (not doc[autoname]): - from frappe.model.base_document import get_controller - if not hasattr(get_controller(doctype), "autoname"): - frappe.throw(_("{0} is a mandatory field").format(autoname)) - return True - - users = frappe.db.sql_list("select name from tabUser") - def prepare_for_insert(doc): - # don't block data import if user is not set - # migrating from another system - if not doc.owner in users: - doc.owner = frappe.session.user - if not doc.modified_by in users: - doc.modified_by = frappe.session.user - - def is_valid_url(url): - is_valid = False - if url.startswith("/files") or url.startswith("/private/files"): - url = get_url(url) - - try: - r = requests.get(url) - is_valid = True if r.status_code == 200 else False - except Exception: - pass - - return is_valid - - def attach_file_to_doc(doctype, docname, file_url): - # check if attachment is already available - # check if the attachement link is relative or not - if not file_url: - return - if not is_valid_url(file_url): - return - - files = frappe.db.sql("""Select name from `tabFile` where attached_to_doctype='{doctype}' and - attached_to_name='{docname}' and (file_url='{file_url}' or thumbnail_url='{file_url}')""".format( - doctype=doctype, - docname=docname, - file_url=file_url - )) - - if files: - # file is already attached - return - - _file = frappe.get_doc({ - "doctype": "File", - "file_url": file_url, - "attached_to_name": docname, - "attached_to_doctype": doctype, - "attached_to_field": 0, - "folder": "Home/Attachments"}) - _file.save() - - - # header - filename, file_extension = ['',''] - if not rows: - _file = frappe.get_doc("File", {"file_url": data_import_doc.import_file}) - fcontent = _file.get_content() - filename, file_extension = _file.get_extension() - - if file_extension == '.xlsx' and from_data_import == 'Yes': - from frappe.utils.xlsxutils import read_xlsx_file_from_attached_file - rows = read_xlsx_file_from_attached_file(file_url=data_import_doc.import_file) - - elif file_extension == '.csv': - from frappe.utils.csvutils import read_csv_content - rows = read_csv_content(fcontent, ignore_encoding_errors) - - else: - frappe.throw(_("Unsupported File Format")) - - start_row = get_start_row() - header = rows[:start_row] - data = rows[start_row:] - try: - doctype = get_header_row(get_data_keys_definition().main_table)[1] - columns = filter_empty_columns(get_header_row(get_data_keys_definition().columns)[1:]) - except: - frappe.throw(_("Cannot change header content")) - doctypes = [] - column_idx_to_fieldname = {} - column_idx_to_fieldtype = {} - - if skip_errors: - data_rows_with_error = header - - if submit_after_import and not cint(frappe.db.get_value("DocType", - doctype, "is_submittable")): - submit_after_import = False - - parenttype = get_header_row(get_data_keys_definition().parent_table) - - if len(parenttype) > 1: - parenttype = parenttype[1] - - # check permissions - if not frappe.permissions.can_import(parenttype or doctype): - frappe.flags.mute_emails = False - return {"messages": [_("Not allowed to Import") + ": " + _(doctype)], "error": True} - - # Throw expception in case of the empty data file - check_data_length() - make_column_map() - total = len(data) - - if validate_template: - if total: - data_import_doc.total_rows = total - return True - - if overwrite==None: - overwrite = params.get('overwrite') - - # delete child rows (if parenttype) - parentfield = None - if parenttype: - parentfield = get_parent_field(doctype, parenttype) - - if overwrite: - delete_child_rows(data, doctype) - - import_log = [] - def log(**kwargs): - if via_console: - print((kwargs.get("title") + kwargs.get("message")).encode('utf-8')) - else: - import_log.append(kwargs) - - def as_link(doctype, name): - if via_console: - return "{0}: {1}".format(doctype, name) - else: - return getlink(doctype, name) - - # publish realtime task update - def publish_progress(achieved, reload=False): - if data_import_doc: - frappe.publish_realtime("data_import_progress", {"progress": str(int(100.0*achieved/total)), - "data_import": data_import_doc.name, "reload": reload}, user=frappe.session.user) - - - error_flag = rollback_flag = False - - batch_size = frappe.conf.data_import_batch_size or 1000 - - for batch_start in range(0, total, batch_size): - batch = data[batch_start:batch_start + batch_size] - - for i, row in enumerate(batch): - # bypass empty rows - if main_doc_empty(row): - continue - - row_idx = i + start_row - doc = None - - publish_progress(i) - - try: - doc, attachments, last_error_row_idx = get_doc(row_idx) - validate_naming(doc) - if pre_process: - pre_process(doc) - - original = None - if parentfield: - parent = frappe.get_doc(parenttype, doc["parent"]) - doc = parent.append(parentfield, doc) - parent.save() - else: - if overwrite and doc.get("name") and frappe.db.exists(doctype, doc["name"]): - original = frappe.get_doc(doctype, doc["name"]) - original_name = original.name - original.update(doc) - # preserve original name for case sensitivity - original.name = original_name - original.flags.ignore_links = ignore_links - original.save() - doc = original - else: - if not update_only: - doc = frappe.get_doc(doc) - prepare_for_insert(doc) - doc.flags.ignore_links = ignore_links - doc.insert() - if attachments: - # check file url and create a File document - for file_url in attachments: - attach_file_to_doc(doc.doctype, doc.name, file_url) - if submit_after_import: - doc.submit() - - # log errors - if parentfield: - log(**{"row": doc.idx, "title": 'Inserted row for "%s"' % (as_link(parenttype, doc.parent)), - "link": get_absolute_url(parenttype, doc.parent), "message": 'Document successfully saved', "indicator": "green"}) - elif submit_after_import: - log(**{"row": row_idx + 1, "title":'Submitted row for "%s"' % (as_link(doc.doctype, doc.name)), - "message": "Document successfully submitted", "link": get_absolute_url(doc.doctype, doc.name), "indicator": "blue"}) - elif original: - log(**{"row": row_idx + 1,"title":'Updated row for "%s"' % (as_link(doc.doctype, doc.name)), - "message": "Document successfully updated", "link": get_absolute_url(doc.doctype, doc.name), "indicator": "green"}) - elif not update_only: - log(**{"row": row_idx + 1, "title":'Inserted row for "%s"' % (as_link(doc.doctype, doc.name)), - "message": "Document successfully saved", "link": get_absolute_url(doc.doctype, doc.name), "indicator": "green"}) - else: - log(**{"row": row_idx + 1, "title":'Ignored row for %s' % (row[1]), "link": None, - "message": "Document updation ignored", "indicator": "orange"}) - - except Exception as e: - error_flag = True - - # build error message - if frappe.local.message_log: - err_msg = "\n".join(['

    {}

    '.format(json.loads(msg).get('message')) for msg in frappe.local.message_log]) - else: - err_msg = '

    {}

    '.format(cstr(e)) - - error_trace = frappe.get_traceback() - if error_trace: - error_log_doc = frappe.log_error(error_trace) - error_link = get_absolute_url("Error Log", error_log_doc.name) - else: - error_link = None - - log(**{ - "row": row_idx + 1, - "title": 'Error for row %s' % (len(row)>1 and frappe.safe_decode(row[1]) or ""), - "message": err_msg, - "indicator": "red", - "link":error_link - }) - - # data with error to create a new file - # include the errored data in the last row as last_error_row_idx will not be updated for the last row - if skip_errors: - if last_error_row_idx == len(rows)-1: - last_error_row_idx = len(rows) - data_rows_with_error += rows[row_idx:last_error_row_idx] - else: - rollback_flag = True - finally: - frappe.local.message_log = [] - - start_row += batch_size - if rollback_flag: - frappe.db.rollback() - else: - frappe.db.commit() - - frappe.flags.mute_emails = False - frappe.flags.in_import = False - - log_message = {"messages": import_log, "error": error_flag} - if data_import_doc: - data_import_doc.log_details = json.dumps(log_message) - - import_status = None - if error_flag and data_import_doc.skip_errors and len(data) != len(data_rows_with_error): - import_status = "Partially Successful" - # write the file with the faulty row - file_name = 'error_' + filename + file_extension - if file_extension == '.xlsx': - from frappe.utils.xlsxutils import make_xlsx - xlsx_file = make_xlsx(data_rows_with_error, "Data Import Template") - file_data = xlsx_file.getvalue() - else: - from frappe.utils.csvutils import to_csv - file_data = to_csv(data_rows_with_error) - _file = frappe.get_doc({ - "doctype": "File", - "file_name": file_name, - "attached_to_doctype": "Data Import Legacy", - "attached_to_name": data_import_doc.name, - "folder": "Home/Attachments", - "content": file_data}) - _file.save() - data_import_doc.error_file = _file.file_url - - elif error_flag: - import_status = "Failed" - else: - import_status = "Successful" - - data_import_doc.import_status = import_status - data_import_doc.save() - if data_import_doc.import_status in ["Successful", "Partially Successful"]: - data_import_doc.submit() - publish_progress(100, True) - else: - publish_progress(0, True) - frappe.db.commit() - else: - return log_message - -def get_parent_field(doctype, parenttype): - parentfield = None - - # get parentfield - if parenttype: - for d in frappe.get_meta(parenttype).get_table_fields(): - if d.options==doctype: - parentfield = d.fieldname - break - - if not parentfield: - frappe.msgprint(_("Did not find {0} for {0} ({1})").format("parentfield", parenttype, doctype)) - raise Exception - - return parentfield - -def delete_child_rows(rows, doctype): - """delete child rows for all parents""" - for p in list(set(r[1] for r in rows)): - if p: - frappe.db.sql("""delete from `tab{0}` where parent=%s""".format(doctype), p) diff --git a/frappe/core/doctype/data_import_legacy/log_details.html b/frappe/core/doctype/data_import_legacy/log_details.html deleted file mode 100644 index aa160a742b..0000000000 --- a/frappe/core/doctype/data_import_legacy/log_details.html +++ /dev/null @@ -1,38 +0,0 @@ -
    -
    - - - - - - - - {% for row in data %} - {% if (!show_only_errors) || (show_only_errors && row.indicator == "red") %} - - - - - - {% endif %} - {% endfor %} -
    {{ __("Row No") }} {{ __("Row Status") }} {{ __("Message") }}
    - {{ row.row }} - - {{ row.title }} - - {% if (import_status != "Failed" || (row.indicator == "red")) { %} -
    {{ row.message }}
    - {% if row.link %} - - - - - - {% endif %} - {% } else { %} - {{ __("Document can't saved.") }} - {% } %} -
    -
    -
    \ No newline at end of file diff --git a/frappe/core/doctype/data_import_legacy/test_data_import_legacy.py b/frappe/core/doctype/data_import_legacy/test_data_import_legacy.py deleted file mode 100644 index 6f9964e8f5..0000000000 --- a/frappe/core/doctype/data_import_legacy/test_data_import_legacy.py +++ /dev/null @@ -1,8 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2020, Frappe Technologies and Contributors -# See license.txt -# import frappe -import unittest - -class TestDataImportLegacy(unittest.TestCase): - pass From 0d0e527416c268b5a74284dbd849d79be010ebfe Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 23 Jun 2021 13:22:11 +0530 Subject: [PATCH 0370/1519] chore: Show deprecation warning in command help --- frappe/commands/utils.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 506ec7816b..2fe5ca5929 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - import json import os import subprocess @@ -14,6 +12,13 @@ from frappe.exceptions import SiteNotSpecifiedError from frappe.utils import get_bench_path, update_progress_bar, cint +DATA_IMPORT_DEPRECATION = click.style( + "[DEPRECATED] The `import-csv` command used 'Data Import Legacy' which has been deprecated.\n" + "Use `data-import` command instead to import data via 'Data Import'.", + fg="yellow" +) + + @click.command('build') @click.option('--app', help='Build assets for app') @click.option('--apps', help='Build assets for specific apps') @@ -350,7 +355,8 @@ def import_doc(context, path, force=False): if not context.sites: raise SiteNotSpecifiedError -@click.command('import-csv') + +@click.command('import-csv', help=DATA_IMPORT_DEPRECATION) @click.argument('path') @click.option('--only-insert', default=False, is_flag=True, help='Do not overwrite existing records') @click.option('--submit-after-import', default=False, is_flag=True, help='Submit document after importing it') @@ -358,11 +364,7 @@ def import_doc(context, path, force=False): @click.option('--no-email', default=True, is_flag=True, help='Send email if applicable') @pass_context def import_csv(context, path, only_insert=False, submit_after_import=False, ignore_encoding_errors=False, no_email=True): - click.secho( - "The `import-csv` command used 'Data Import Legacy' which has been deprecated.\n" - "Use `data-import` command instead to import data via 'Data Import'.", - fg="yellow", - ) + click.secho(DATA_IMPORT_DEPRECATION) sys.exit(1) From baea532c3d19fd9d55dd2b10cd676e7547b378bb Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 11:27:01 +0530 Subject: [PATCH 0371/1519] fix: Move depr module module utils in exporter --- frappe/core/doctype/data_export/exporter.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/data_export/exporter.py b/frappe/core/doctype/data_export/exporter.py index 389948449e..ffd828bfdb 100644 --- a/frappe/core/doctype/data_export/exporter.py +++ b/frappe/core/doctype/data_export/exporter.py @@ -7,7 +7,6 @@ import frappe.permissions import re, csv, os from frappe.utils.csvutils import UnicodeWriter from frappe.utils import cstr, formatdate, format_datetime, parse_json, cint, format_duration -from frappe.core.doctype.data_import_legacy.importer import get_data_keys from frappe.core.doctype.access_log.access_log import make_access_log reflags = { @@ -20,6 +19,15 @@ reflags = { "D": re.DEBUG } +def get_data_keys(): + return frappe._dict({ + "data_separator": _('Start entering data below this line'), + "main_table": _("Table") + ":", + "parent_table": _("Parent Table") + ":", + "columns": _("Column Name") + ":", + "doctype": _("DocType") + ":" + }) + @frappe.whitelist() def export_data(doctype=None, parent_doctype=None, all_doctypes=True, with_data=False, select_columns=None, file_type='CSV', template=False, filters=None): From 2aa2586a0cb1391fe07e40811b7d2c7cf09abc8d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 12:04:18 +0530 Subject: [PATCH 0372/1519] fix: Drop deprecated validate_csv_import_file def --- frappe/core/doctype/data_import/data_import.py | 18 ++---------------- frappe/utils/fixtures.py | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/frappe/core/doctype/data_import/data_import.py b/frappe/core/doctype/data_import/data_import.py index 7e8374a0a2..50469eeb4d 100644 --- a/frappe/core/doctype/data_import/data_import.py +++ b/frappe/core/doctype/data_import/data_import.py @@ -171,9 +171,6 @@ def import_file( i.import_data() -############## - - def import_doc(path, pre_process=None): if os.path.isdir(path): files = [os.path.join(path, f) for f in os.listdir(path)] @@ -192,19 +189,8 @@ def import_doc(path, pre_process=None): ) frappe.flags.mute_emails = False frappe.db.commit() - elif f.endswith(".csv"): - validate_csv_import_file(f) - frappe.db.commit() - - -def validate_csv_import_file(path): - if path.endswith(".csv"): - print() - print("This method is deprecated.") - print('Import CSV files using the command "bench --site sitename data-import"') - print("Or use the method frappe.core.doctype.data_import.data_import.import_file") - print() - raise Exception("Method deprecated") + else: + raise NotImplementedError("Only .json files can be imported") def export_json( diff --git a/frappe/utils/fixtures.py b/frappe/utils/fixtures.py index 1f33c36b13..895a3c8373 100644 --- a/frappe/utils/fixtures.py +++ b/frappe/utils/fixtures.py @@ -20,7 +20,7 @@ def sync_fixtures(app=None): if os.path.exists(frappe.get_app_path(app, "fixtures")): fixture_files = sorted(os.listdir(frappe.get_app_path(app, "fixtures"))) for fname in fixture_files: - if fname.endswith(".json") or fname.endswith(".csv"): + if fname.endswith(".json"): import_doc(frappe.get_app_path(app, "fixtures", fname)) import_custom_scripts(app) From 8dcb7a1eaac14f4e68e4644b4481ceb06cae8ca5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 12:04:50 +0530 Subject: [PATCH 0373/1519] style: Remove redundant comments --- frappe/core/doctype/access_log/access_log.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frappe/core/doctype/access_log/access_log.py b/frappe/core/doctype/access_log/access_log.py index d2fbee108b..2ea014f981 100644 --- a/frappe/core/doctype/access_log/access_log.py +++ b/frappe/core/doctype/access_log/access_log.py @@ -1,9 +1,5 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2019, Frappe Technologies and contributors # For license information, please see license.txt - -# imports - standard imports -# imports - module imports import frappe from frappe.model.document import Document From 58cb8e5dd1516432ef319802e856472f419d3135 Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Tue, 13 Jul 2021 12:46:01 +0530 Subject: [PATCH 0374/1519] style: Fix minor formatting issues - Also, updated error title --- frappe/desk/doctype/notification_log/notification_log.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/doctype/notification_log/notification_log.py b/frappe/desk/doctype/notification_log/notification_log.py index af09d65015..d7d7f68b74 100644 --- a/frappe/desk/doctype/notification_log/notification_log.py +++ b/frappe/desk/doctype/notification_log/notification_log.py @@ -15,7 +15,7 @@ class NotificationLog(Document): try: send_notification_email(self) except frappe.OutgoingEmailError: - frappe.log_error(message = frappe.get_traceback(), title=_("Error Sending Notification Email.")) + frappe.log_error(message=frappe.get_traceback(), title=_("Failed to send notification email")) def get_permission_query_conditions(for_user): From e826866503287ed67696113b5b789ced053744ae Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 13 Jul 2021 14:24:12 +0530 Subject: [PATCH 0375/1519] fix: Tag count query --- frappe/desk/reportview.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index 55515856f1..b9382bc830 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -445,17 +445,24 @@ def get_stats(stats, doctype, filters=[]): for tag in tags: if not tag in columns: continue try: - tagcount = frappe.get_list(doctype, fields=[tag, "count(*)"], - #filters=["ifnull(`%s`,'')!=''" % tag], group_by=tag, as_list=True) - filters = filters + ["ifnull(`%s`,'')!=''" % tag], group_by = tag, as_list = True) + tag_count = frappe.get_list(doctype, + fields=[tag, "count(*)"], + filters=filters + [[tag, '!=', '']], + group_by=tag, + as_list=True, + ) - if tag=='_user_tags': - stats[tag] = scrub_user_tags(tagcount) - stats[tag].append([_("No Tags"), frappe.get_list(doctype, + if tag == '_user_tags': + stats[tag] = scrub_user_tags(tag_count) + no_tag_count = frappe.get_list(doctype, fields=[tag, "count(*)"], - filters=filters +["({0} = ',' or {0} = '' or {0} is null)".format(tag)], as_list=True)[0][1]]) + filters=filters + [[tag, "in", ('', ',')]], + as_list=True, + )[0][1] + + stats[tag].append([_("No Tags"), no_tag_count]) else: - stats[tag] = tagcount + stats[tag] = tag_count except frappe.db.SQLError: # does not work for child tables From 0fa9abde4c5a92e09e5ee7c50e93ce83338f8c7f Mon Sep 17 00:00:00 2001 From: Saqib Ansari Date: Tue, 13 Jul 2021 14:35:16 +0530 Subject: [PATCH 0376/1519] feat: add put request to integration utils --- frappe/integrations/utils.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/frappe/integrations/utils.py b/frappe/integrations/utils.py index 09c20568b5..565bbbad4a 100644 --- a/frappe/integrations/utils.py +++ b/frappe/integrations/utils.py @@ -47,6 +47,27 @@ def make_post_request(url, auth=None, headers=None, data=None): frappe.log_error() raise exc +def make_put_request(url, auth=None, headers=None, data=None): + if not auth: + auth = '' + if not data: + data = {} + if not headers: + headers = {} + + try: + s = get_request_session() + frappe.flags.integration_request = s.put(url, data=data, auth=auth, headers=headers) + frappe.flags.integration_request.raise_for_status() + + if frappe.flags.integration_request.headers.get("content-type") == "text/plain; charset=utf-8": + return parse_qs(frappe.flags.integration_request.text) + + return frappe.flags.integration_request.json() + except Exception as exc: + frappe.log_error() + raise exc + def create_request_log(data, integration_type, service_name, name=None, error=None): if isinstance(data, str): data = json.loads(data) From ae70502f910c85f6a4528b487eea3b535cec6c39 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 13 Jul 2021 15:34:36 +0530 Subject: [PATCH 0377/1519] test: Add test case to validate tag count query --- frappe/desk/doctype/tag/test_tag.py | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/frappe/desk/doctype/tag/test_tag.py b/frappe/desk/doctype/tag/test_tag.py index 442a891fd8..6eb7219c26 100644 --- a/frappe/desk/doctype/tag/test_tag.py +++ b/frappe/desk/doctype/tag/test_tag.py @@ -1,8 +1,26 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2019, Frappe Technologies and Contributors -# See license.txt -# import frappe import unittest +import frappe + +from frappe.desk.reportview import get_stats +from frappe.desk.doctype.tag.tag import add_tag class TestTag(unittest.TestCase): - pass + def setUp(self) -> None: + frappe.db.sql("DELETE from `tabTag`") + frappe.db.sql("UPDATE `tabDocType` set _user_tags=''") + + def test_tag_count_query(self): + self.assertDictEqual(get_stats('["_user_tags"]', 'DocType'), + {'_user_tags': [['No Tags', frappe.db.count('DocType')]]}) + add_tag('Standard', 'DocType', 'User') + add_tag('Standard', 'DocType', 'ToDo') + + # count with no filter + self.assertDictEqual(get_stats('["_user_tags"]', 'DocType'), + {'_user_tags': [['Standard', 2], ['No Tags', frappe.db.count('DocType') - 2]]}) + + # count with child table field filter + self.assertDictEqual(get_stats('["_user_tags"]', + 'DocType', + filters='[["DocField", "fieldname", "like", "%last_name%"], ["DocType", "name", "like", "%use%"]]'), + {'_user_tags': [['Standard', 1], ['No Tags', 0]]}) \ No newline at end of file From 68930a022aafd97cf95d7fdce312ff82bf963ee8 Mon Sep 17 00:00:00 2001 From: Bhavesh Maheshwari <34086262+bhavesh95863@users.noreply.github.com> Date: Tue, 13 Jul 2021 15:55:24 +0530 Subject: [PATCH 0378/1519] fix: Duplicate if condition remove --- frappe/utils/global_search.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index efe92232d9..8fa2ea474f 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -231,9 +231,6 @@ def update_global_search(doc): if frappe.local.conf.get('disable_global_search'): return - if frappe.local.conf.get('disable_global_search'): - return - if doc.docstatus > 1 or (doc.meta.has_field("enabled") and not doc.get("enabled")) \ or doc.get("disabled"): return From 8bc498c18cc4b6932768bb618ee8d27fce93fa21 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 13 Jul 2021 10:42:00 +0000 Subject: [PATCH 0379/1519] chore(deps): [security] bump minimist from 1.2.0 to 1.2.5 Bumps [minimist](https://github.com/substack/minimist) from 1.2.0 to 1.2.5. **This update includes security fixes.** - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.0...1.2.5) Signed-off-by: dependabot-preview[bot] --- yarn.lock | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index ddb5623e5e..da7f89872f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4148,16 +4148,11 @@ minimatch@^3.0.4, minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.3, minimist@^1.2.5: +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - minipass@^3.0.0: version "3.1.3" resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz#7d42ff1f39635482e15f9cdb53184deebd5815fd" From 04094110f5ddb5b2d4c514be43328d9f0e893654 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:11:15 +0200 Subject: [PATCH 0380/1519] fix: handle detached head Workaround for https://github.com/gitpython-developers/GitPython/issues/633 --- frappe/commands/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 5c6274d348..542f41725b 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -774,6 +774,7 @@ def get_version(output): """Show the versions of all the installed apps.""" from git import Repo from frappe.utils.commands import render_table + from frappe.utils.change_log import get_app_branch frappe.init("") data = [] @@ -785,8 +786,8 @@ def get_version(output): app_info = frappe._dict() app_info.app = app - app_info.branch = repo.head.ref.name - app_info.commit = repo.head.ref.commit.hexsha[:7] + app_info.branch = get_app_branch(app) + app_info.commit = repo.head.object.hexsha[:7] app_info.version = getattr(app_hooks, f"{app_info.branch}_version", None) or module.__version__ data.append(app_info) From fc2c887635168cd18bf18b6eae74fedc58cb9a22 Mon Sep 17 00:00:00 2001 From: barredterra <14891507+barredterra@users.noreply.github.com> Date: Tue, 13 Jul 2021 13:23:25 +0200 Subject: [PATCH 0381/1519] test: fix return code --- frappe/tests/test_commands.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_commands.py b/frappe/tests/test_commands.py index 8f9bbb1afb..54103f0151 100644 --- a/frappe/tests/test_commands.py +++ b/frappe/tests/test_commands.py @@ -435,4 +435,4 @@ class TestCommands(BaseTestCommands): self.assertEqual(self.returncode, 0) self.execute("bench version -f invalid") - self.assertEqual(self.returncode, 1) + self.assertEqual(self.returncode, 2) From cf67dbce5abd96687ab3c8a05a74cecf3bf7792b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 13 Jul 2021 16:56:49 +0530 Subject: [PATCH 0382/1519] fix: Add missing fieldtypes in for custom fields --- frappe/custom/doctype/custom_field/custom_field.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.json b/frappe/custom/doctype/custom_field/custom_field.json index 2f0819ab68..19462e79de 100644 --- a/frappe/custom/doctype/custom_field/custom_field.json +++ b/frappe/custom/doctype/custom_field/custom_field.json @@ -120,7 +120,7 @@ "label": "Field Type", "oldfieldname": "fieldtype", "oldfieldtype": "Select", - "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nGeolocation\nHTML\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRating\nRead Only\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", + "options": "Attach\nAttach Image\nBarcode\nButton\nCheck\nCode\nColor\nColumn Break\nCurrency\nData\nDate\nDatetime\nDuration\nDynamic Link\nFloat\nFold\nGeolocation\nHeading\nHTML\nHTML Editor\nImage\nInt\nLink\nLong Text\nMarkdown Editor\nPassword\nPercent\nRead Only\nRating\nSection Break\nSelect\nSmall Text\nTable\nTable MultiSelect\nText\nText Editor\nTime\nSignature", "reqd": 1 }, { @@ -417,7 +417,7 @@ "idx": 1, "index_web_pages_for_search": 1, "links": [], - "modified": "2020-10-29 06:14:43.073329", + "modified": "2021-07-12 04:54:12.042319", "modified_by": "Administrator", "module": "Custom", "name": "Custom Field", From b23dd711162ff03922c7469fd478623bad45dff1 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Tue, 13 Jul 2021 17:56:47 +0530 Subject: [PATCH 0383/1519] fix: escape quotes before declaring variables when making a new app --- frappe/utils/boilerplate.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/frappe/utils/boilerplate.py b/frappe/utils/boilerplate.py index 8dab9b748f..d88eaa5745 100755 --- a/frappe/utils/boilerplate.py +++ b/frappe/utils/boilerplate.py @@ -66,9 +66,6 @@ def make_boilerplate(dest, app_name): with open(os.path.join(dest, hooks.app_name, ".gitignore"), "w") as f: f.write(frappe.as_unicode(gitignore_template.format(app_name = hooks.app_name))) - with open(os.path.join(dest, hooks.app_name, "setup.py"), "w") as f: - f.write(frappe.as_unicode(setup_template.format(**hooks))) - with open(os.path.join(dest, hooks.app_name, "requirements.txt"), "w") as f: f.write("# frappe -- https://github.com/frappe/frappe is installed via 'bench init'") @@ -82,6 +79,14 @@ def make_boilerplate(dest, app_name): with open(os.path.join(dest, hooks.app_name, hooks.app_name, "modules.txt"), "w") as f: f.write(frappe.as_unicode(hooks.app_title)) + # These values could contain quotes and can break string declarations + # So escaping them before setting variables in setup.py and hooks.py + for key in ("app_publisher", "app_description", "app_license"): + hooks[key] = hooks[key].replace("\\", "\\\\").replace("'", "\\'").replace("\"", "\\\"") + + with open(os.path.join(dest, hooks.app_name, "setup.py"), "w") as f: + f.write(frappe.as_unicode(setup_template.format(**hooks))) + with open(os.path.join(dest, hooks.app_name, hooks.app_name, "hooks.py"), "w") as f: f.write(frappe.as_unicode(hooks_template.format(**hooks))) @@ -328,18 +333,18 @@ def get_data(): setup_template = """from setuptools import setup, find_packages -with open('requirements.txt') as f: - install_requires = f.read().strip().split('\\n') +with open("requirements.txt") as f: + install_requires = f.read().strip().split("\\n") # get version from __version__ variable in {app_name}/__init__.py from {app_name} import __version__ as version setup( - name='{app_name}', + name="{app_name}", version=version, - description='{app_description}', - author='{app_publisher}', - author_email='{app_email}', + description="{app_description}", + author="{app_publisher}", + author_email="{app_email}", packages=find_packages(), zip_safe=False, include_package_data=True, From 79124873c3357086580edd53c56b0756b4c68e1b Mon Sep 17 00:00:00 2001 From: codescientist703 Date: Tue, 13 Jul 2021 18:43:34 +0530 Subject: [PATCH 0384/1519] fix: fixed sider recommendation --- frappe/desk/search.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/desk/search.py b/frappe/desk/search.py index 3cce80a1a0..f9b65fc98e 100644 --- a/frappe/desk/search.py +++ b/frappe/desk/search.py @@ -222,7 +222,7 @@ def scrub_custom_query(query, key, txt): def relevance_sorter(key, query, as_dict): value = _(key.name if as_dict else key[0]) return ( - value.lower().startswith(query.lower()) == False, + value.lower().startswith(query.lower()) is not True, value ) From bed64ef0adcecacd98958aae940d43a11e264177 Mon Sep 17 00:00:00 2001 From: Pruthvi Patel Date: Tue, 13 Jul 2021 18:49:26 +0530 Subject: [PATCH 0385/1519] test: change app description to test if quotes are being escaped --- frappe/tests/test_boilerplate.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/tests/test_boilerplate.py b/frappe/tests/test_boilerplate.py index 4ae78c94de..259d5a9194 100644 --- a/frappe/tests/test_boilerplate.py +++ b/frappe/tests/test_boilerplate.py @@ -20,7 +20,7 @@ class TestBoilerPlate(unittest.TestCase): def test_create_app(self): title = "Test App" - description = "Test app for unit testing" + description = "This app's description contains 'single quotes' and \"double quotes\"." publisher = "Test Publisher" email = "example@example.org" icon = "" # empty -> default From cf164fffba6742886d67b71c443b48e15ca8506c Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Tue, 13 Jul 2021 19:11:07 +0530 Subject: [PATCH 0386/1519] fix: Error on updating docs via API --- frappe/api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/api.py b/frappe/api.py index 36d51e894c..636c6b2888 100644 --- a/frappe/api.py +++ b/frappe/api.py @@ -82,7 +82,7 @@ def handle(): if frappe.local.request.method=="PUT": data = get_request_form_data() - doc = frappe.get_doc(doctype, name) + doc = frappe.get_doc(doctype, name, for_update=True) if "flags" in data: del data["flags"] From b619c3d33044a0f1b4951a98924ace3fdeb7069f Mon Sep 17 00:00:00 2001 From: codescientist703 Date: Tue, 13 Jul 2021 20:24:24 +0530 Subject: [PATCH 0387/1519] test: added test for order of link --- frappe/tests/test_search.py | 56 ++++++++++++++++++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py index 9ad02f49a6..fb99db2dc7 100644 --- a/frappe/tests/test_search.py +++ b/frappe/tests/test_search.py @@ -7,6 +7,48 @@ from frappe.desk.search import search_link from frappe.desk.search import search_widget class TestSearch(unittest.TestCase): + def setUp(self): + self.tree_doctype_name = 'Test Tree Order' + + # Create Tree doctype + self.tree_doc = frappe.get_doc({ + 'doctype': 'DocType', + 'name': self.tree_doctype_name, + 'module': 'Custom', + 'custom': 1, + 'is_tree': 1, + 'autoname': 'field:random', + 'fields': [{ + 'fieldname': 'random', + 'label': 'Random', + 'fieldtype': 'Data' + }] + }).insert() + self.tree_doc.search_fields = 'parent_test_tree_order' + self.tree_doc.save() + + # Create root for the tree doctype + self.parent_doctype_name = 'All Territories' + frappe.get_doc(doctype=self.tree_doctype_name, random=self.parent_doctype_name, + is_group=1).insert() + + # Create children for the root + self.child_doctypes_names = ['USA', 'India', 'Russia', 'China'] + self.child_doctype_list = [] + for child_name in self.child_doctypes_names: + temp = frappe.get_doc(doctype=self.tree_doctype_name, random=child_name, + parent_test_tree_order=self.parent_doctype_name) + temp.insert() + self.child_doctype_list.append(temp) + + def tearDown(self): + # Deleting all the created doctype + for child_doctype in self.child_doctype_list: + child_doctype.delete() + frappe.delete_doc(self.tree_doctype_name, self.parent_doctype_name, + force=1, ignore_permissions=True, for_reload=True) + self.tree_doc.delete() + def test_search_field_sanitizer(self): # pass search_link('DocType', 'User', query=None, filters=None, page_length=20, searchfield='name') @@ -38,6 +80,18 @@ class TestSearch(unittest.TestCase): search_link, 'DocType', 'Customer', query=None, filters=None, page_length=20, searchfield=';') + def test_link_field_order(self): + # Making a request to the search_link with the tree doctype + search_link(doctype=self.tree_doctype_name, txt='all', query=None, + filters=None, page_length=20, searchfield=None) + result = frappe.response['results'] + + # Check whether the result is sorted or not + self.assertEquals(self.parent_doctype_name, result[0]['value']) + + # Check whether searching for parent also list out children + self.assertEquals(len(result), len(self.child_doctypes_names) + 1) + #Search for the word "pay", part of the word "pays" (country) in french. def test_link_search_in_foreign_language(self): try: @@ -80,4 +134,4 @@ class TestSearch(unittest.TestCase): @frappe.validate_and_sanitize_search_inputs def get_data(doctype, txt, searchfield, start, page_len, filters): - return [doctype, txt, searchfield, start, page_len, filters] \ No newline at end of file + return [doctype, txt, searchfield, start, page_len, filters] From 75cb917a7beee86d1d22a100f083a77b6f7ba925 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 21:31:03 +0530 Subject: [PATCH 0388/1519] test: UI test for datetime field form validation --- .../datetime_field_form_validation.js | 18 ++++++++++++++++++ frappe/tests/ui_test_helpers.py | 12 ++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 cypress/integration/datetime_field_form_validation.js diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js new file mode 100644 index 0000000000..6a6ea4c7af --- /dev/null +++ b/cypress/integration/datetime_field_form_validation.js @@ -0,0 +1,18 @@ +context('Datetime Validation', () => { + before(() => { + cy.login(); + cy.visit('/app/communication'); + cy.window().its('frappe').then(frappe => { + frappe.call("frappe.tests.ui_test_helpers.create_communication_records"); + }); + }); + + it('datetime field form validation', () => { + cy.visit('/app/communication'); + cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') + .then((name) => { + cy.visit(`/app/communication/${name}`); + cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); + }) + }); +}); \ No newline at end of file diff --git a/frappe/tests/ui_test_helpers.py b/frappe/tests/ui_test_helpers.py index f56311b2e3..f4a6f474ce 100644 --- a/frappe/tests/ui_test_helpers.py +++ b/frappe/tests/ui_test_helpers.py @@ -60,6 +60,18 @@ def create_todo_records(): "description": "this is fourth todo" }).insert() +@frappe.whitelist() +def create_communication_records(): + if frappe.db.get_all('Communication', {'subject': 'Test Form Communication 1'}): + return + + frappe.get_doc({ + "doctype": "Communication", + "recipients": "test@gmail.com", + "subject": "Test Form Communication 1", + "communication_date": frappe.utils.now_datetime(), + }).insert() + @frappe.whitelist() def setup_workflow(): from frappe.workflow.doctype.workflow.test_workflow import create_todo_workflow From 98f33b59811f2cdcf9b66f1736e5bedfb77735cc Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 13 Jul 2021 21:56:57 +0530 Subject: [PATCH 0389/1519] fix: sider fix --- cypress/integration/datetime_field_form_validation.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js index 6a6ea4c7af..dff1f0562c 100644 --- a/cypress/integration/datetime_field_form_validation.js +++ b/cypress/integration/datetime_field_form_validation.js @@ -10,9 +10,9 @@ context('Datetime Validation', () => { it('datetime field form validation', () => { cy.visit('/app/communication'); cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') - .then((name) => { - cy.visit(`/app/communication/${name}`); - cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); - }) + .then((name) => { + cy.visit(`/app/communication/${name}`); + cy.get('.indicator-pill').should('contain', 'Open').should('have.class', 'red'); + }); }); }); \ No newline at end of file From f2267bec25e9edb1b947b9ac21c652a6daaec78c Mon Sep 17 00:00:00 2001 From: leela Date: Wed, 14 Jul 2021 10:28:10 +0530 Subject: [PATCH 0390/1519] fix: sending document as an attachment through mail Currently sending document as an attachment is failing and the fix is to make it work by fixing the bug introduced in latest refactoring. --- frappe/core/doctype/communication/mixins.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/communication/mixins.py b/frappe/core/doctype/communication/mixins.py index 160018c4a2..09a8a0ac22 100644 --- a/frappe/core/doctype/communication/mixins.py +++ b/frappe/core/doctype/communication/mixins.py @@ -176,8 +176,8 @@ class CommunicationEmailMixin: def mail_attachments(self, print_format=None, print_html=None): final_attachments = [] - if print_format and print_html: - d = {'print_format': print_format, 'print_html': print_html, 'print_format_attachment': 1, + if print_format or print_html: + d = {'print_format': print_format, 'html': print_html, 'print_format_attachment': 1, 'doctype': self.reference_doctype, 'name': self.reference_name} final_attachments.append(d) From 6f17e3d45fa90b9aec60b6b0c5403c57e707f9df Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 12:02:33 +0530 Subject: [PATCH 0391/1519] perf(test_search): Setup and teardown tests only if needed --- frappe/tests/test_search.py | 99 ++++++++++++++++++++++--------------- 1 file changed, 60 insertions(+), 39 deletions(-) diff --git a/frappe/tests/test_search.py b/frappe/tests/test_search.py index fb99db2dc7..afb584ea15 100644 --- a/frappe/tests/test_search.py +++ b/frappe/tests/test_search.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt import unittest @@ -6,48 +6,15 @@ import frappe from frappe.desk.search import search_link from frappe.desk.search import search_widget + class TestSearch(unittest.TestCase): def setUp(self): - self.tree_doctype_name = 'Test Tree Order' - - # Create Tree doctype - self.tree_doc = frappe.get_doc({ - 'doctype': 'DocType', - 'name': self.tree_doctype_name, - 'module': 'Custom', - 'custom': 1, - 'is_tree': 1, - 'autoname': 'field:random', - 'fields': [{ - 'fieldname': 'random', - 'label': 'Random', - 'fieldtype': 'Data' - }] - }).insert() - self.tree_doc.search_fields = 'parent_test_tree_order' - self.tree_doc.save() - - # Create root for the tree doctype - self.parent_doctype_name = 'All Territories' - frappe.get_doc(doctype=self.tree_doctype_name, random=self.parent_doctype_name, - is_group=1).insert() - - # Create children for the root - self.child_doctypes_names = ['USA', 'India', 'Russia', 'China'] - self.child_doctype_list = [] - for child_name in self.child_doctypes_names: - temp = frappe.get_doc(doctype=self.tree_doctype_name, random=child_name, - parent_test_tree_order=self.parent_doctype_name) - temp.insert() - self.child_doctype_list.append(temp) + if self._testMethodName == "test_link_field_order": + setup_test_link_field_order(self) def tearDown(self): - # Deleting all the created doctype - for child_doctype in self.child_doctype_list: - child_doctype.delete() - frappe.delete_doc(self.tree_doctype_name, self.parent_doctype_name, - force=1, ignore_permissions=True, for_reload=True) - self.tree_doc.delete() + if self._testMethodName == "test_link_field_order": + teardown_test_link_field_order(self) def test_search_field_sanitizer(self): # pass @@ -135,3 +102,57 @@ class TestSearch(unittest.TestCase): @frappe.validate_and_sanitize_search_inputs def get_data(doctype, txt, searchfield, start, page_len, filters): return [doctype, txt, searchfield, start, page_len, filters] + +def setup_test_link_field_order(TestCase): + TestCase.tree_doctype_name = 'Test Tree Order' + TestCase.child_doctype_list = [] + TestCase.child_doctypes_names = ['USA', 'India', 'Russia', 'China'] + TestCase.parent_doctype_name = 'All Territories' + + # Create Tree doctype + TestCase.tree_doc = frappe.get_doc({ + 'doctype': 'DocType', + 'name': TestCase.tree_doctype_name, + 'module': 'Custom', + 'custom': 1, + 'is_tree': 1, + 'autoname': 'field:random', + 'fields': [{ + 'fieldname': 'random', + 'label': 'Random', + 'fieldtype': 'Data' + }] + }).insert() + TestCase.tree_doc.search_fields = 'parent_test_tree_order' + TestCase.tree_doc.save() + + # Create root for the tree doctype + frappe.get_doc({ + "doctype": TestCase.tree_doctype_name, + "random": TestCase.parent_doctype_name, + "is_group": 1 + }).insert() + + # Create children for the root + for child_name in TestCase.child_doctypes_names: + temp = frappe.get_doc({ + "doctype": TestCase.tree_doctype_name, + "random": child_name, + "parent_test_tree_order": TestCase.parent_doctype_name + }).insert() + TestCase.child_doctype_list.append(temp) + +def teardown_test_link_field_order(TestCase): + # Deleting all the created doctype + for child_doctype in TestCase.child_doctype_list: + child_doctype.delete() + + frappe.delete_doc( + TestCase.tree_doctype_name, + TestCase.parent_doctype_name, + ignore_permissions=True, + force=True, + for_reload=True, + ) + + TestCase.tree_doc.delete() From 0eafadf002e45c7a851149783829dc1060a55011 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 14 Jul 2021 12:10:11 +0530 Subject: [PATCH 0392/1519] fix: Code Editor scrollbar glitch --- frappe/public/scss/common/controls.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/public/scss/common/controls.scss b/frappe/public/scss/common/controls.scss index c939c6de39..a7a8d49510 100644 --- a/frappe/public/scss/common/controls.scss +++ b/frappe/public/scss/common/controls.scss @@ -166,6 +166,9 @@ select.form-control { .ace_print-margin { background-color: var(--dark-border-color); } + .ace_scrollbar { + z-index: 3; + } } .frappe-control[data-fieldtype="Attach"], From 9d9d76efe626f63a06150ec9519bd8c7becd1d01 Mon Sep 17 00:00:00 2001 From: Fahim Ali Zain Date: Fri, 4 Jun 2021 11:23:02 +0530 Subject: [PATCH 0393/1519] fix: frappe.local.lang resolution --- frappe/auth.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index ef79d96ddb..7c513aed63 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -35,9 +35,6 @@ class HTTPRequest: else: frappe.local.request_ip = '127.0.0.1' - # language - self.set_lang() - # load cookies frappe.local.cookie_manager = CookieManager() @@ -47,6 +44,9 @@ class HTTPRequest: # login frappe.local.login_manager = LoginManager() + # language + self.set_lang() + if frappe.form_dict._lang: lang = get_lang_code(frappe.form_dict._lang) if lang: From f96ebb1f664e009ed2bf61505067ddacf4b21e78 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 10 Jun 2021 12:47:23 +0530 Subject: [PATCH 0394/1519] perf: Skip guess_language if _lang is provided --- frappe/auth.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index 7c513aed63..479ec6bda4 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -10,7 +10,7 @@ import frappe.utils.user from frappe import conf from frappe.sessions import Session, clear_sessions, delete_session from frappe.modules.patch_handler import check_session_stopped -from frappe.translate import get_lang_code +from frappe.translate import get_lang_code, guess_language from frappe.utils.password import check_password, delete_login_failed_cache from frappe.core.doctype.activity_log.activity_log import add_authentication_log from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, @@ -47,11 +47,6 @@ class HTTPRequest: # language self.set_lang() - if frappe.form_dict._lang: - lang = get_lang_code(frappe.form_dict._lang) - if lang: - frappe.local.lang = lang - self.validate_csrf_token() # write out latest cookies @@ -79,8 +74,12 @@ class HTTPRequest: frappe.throw(_("Invalid Request"), frappe.CSRFTokenError) def set_lang(self): - from frappe.translate import guess_language - frappe.local.lang = guess_language() + if frappe.form_dict._lang: + lang = get_lang_code(frappe.form_dict._lang) + if lang: + frappe.local.lang = lang + else: + frappe.local.lang = guess_language() def get_db_name(self): """get database name from conf""" From f5bd21cf46357d5e8bb98f30db7d68610a667b98 Mon Sep 17 00:00:00 2001 From: Fahim Ali Zain Date: Sat, 10 Jul 2021 10:52:43 +0530 Subject: [PATCH 0395/1519] fix: preferred_language cookie support for all users --- frappe/translate.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/frappe/translate.py b/frappe/translate.py index 4ff50d3fd0..8344436d94 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -22,12 +22,12 @@ from frappe.utils import is_html, strip, strip_html_tags def guess_language(lang_list=None): """Set `frappe.local.lang` from HTTP headers at beginning of request""" - user_preferred_language = frappe.request.cookies.get('preferred_language') - is_guest_user = not frappe.session.user or frappe.session.user == 'Guest' - if is_guest_user and user_preferred_language: - return user_preferred_language + preferred_language_cookie = frappe.request.cookies.get('preferred_language') + lang_codes = list(frappe.request.accept_languages.values()) + + if preferred_language_cookie: + lang_codes.append(preferred_language_cookie) - lang_codes = frappe.request.accept_languages.values() if not lang_codes: return frappe.local.lang From caafd9e2b519204b94b2203444dd1ea73086ac4d Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 13:29:22 +0530 Subject: [PATCH 0396/1519] refactor: Simplify HTTPRequest class * For the sake of Readability and ease of understanding * Style updates --- frappe/auth.py | 74 ++++++++++++++++++++++++++++++++------------------ 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index 479ec6bda4..a95c41906d 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -21,11 +21,40 @@ from urllib.parse import quote class HTTPRequest: def __init__(self): - # Get Environment variables - self.domain = frappe.request.host - if self.domain and self.domain.startswith('www.'): - self.domain = self.domain[4:] + # set frappe.local.request_ip + self.set_request_ip() + # load cookies + self.set_cookies() + + # set frappe.local.db + self.connect() + + # login and start/resume user session + self.set_session() + + # set request language + self.set_lang() + + # match csrf token from current session + self.validate_csrf_token() + + # write out latest cookies + frappe.local.cookie_manager.init_cookies() + + # check session status + check_session_stopped() + + @property + def domain(self): + if not getattr(self, "_domain", None): + self._domain = frappe.request.host + if self._domain and self._domain.startswith('www.'): + self._domain = self._domain[4:] + + return self._domain + + def set_request_ip(self): if frappe.get_request_header('X-Forwarded-For'): frappe.local.request_ip = (frappe.get_request_header('X-Forwarded-For').split(",")[0]).strip() @@ -35,32 +64,21 @@ class HTTPRequest: else: frappe.local.request_ip = '127.0.0.1' - # load cookies + def set_cookies(self): frappe.local.cookie_manager = CookieManager() - # set db - self.connect() - - # login + def set_session(self): frappe.local.login_manager = LoginManager() - # language - self.set_lang() - - self.validate_csrf_token() - - # write out latest cookies - frappe.local.cookie_manager.init_cookies() - - # check status - check_session_stopped() - def validate_csrf_token(self): if frappe.local.request and frappe.local.request.method in ("POST", "PUT", "DELETE"): - if not frappe.local.session: return - if not frappe.local.session.data.csrf_token \ - or frappe.local.session.data.device=="mobile" \ - or frappe.conf.get('ignore_csrf', None): + if not frappe.local.session: + return + if ( + not frappe.local.session.data.csrf_token + or frappe.local.session.data.device == "mobile" + or frappe.conf.get('ignore_csrf', None) + ): # not via boot return @@ -85,10 +103,12 @@ class HTTPRequest: """get database name from conf""" return conf.db_name - def connect(self, ac_name = None): + def connect(self): """connect to db, from ac_name or db_name""" - frappe.local.db = frappe.database.get_db(user = self.get_db_name(), \ - password = getattr(conf, 'db_password', '')) + frappe.local.db = frappe.database.get_db( + user=self.get_db_name(), + password=getattr(conf, 'db_password', '') + ) class LoginManager: def __init__(self): From c47cbfd2efb2f72133494b7b68940fe14410ccf8 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 17:03:30 +0530 Subject: [PATCH 0397/1519] refactor: Set Language in HTTPHeader Order of priority for setting language: 1. Form Dict => _lang 2. Cookie => preferred_language 3. Request Header => Accept-Language 4. User document => language 5. System Settings => language Cookie is placed at #2 since the language picker in the navbar depends on it. And the Accept-Language header sends values based on the client's locales. --- Form Dict _lang now accepts language codes too. Previously, language names were used...for whatever reason. --- frappe/auth.py | 13 +++----- frappe/translate.py | 78 ++++++++++++++++++++++++++++++++------------- 2 files changed, 59 insertions(+), 32 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index a95c41906d..9135b139ae 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -5,13 +5,13 @@ from frappe import _ import frappe import frappe.database import frappe.utils -from frappe.utils import cint, flt, get_datetime, datetime, date_diff, today +from frappe.utils import cint, get_datetime, datetime, date_diff, today import frappe.utils.user from frappe import conf from frappe.sessions import Session, clear_sessions, delete_session from frappe.modules.patch_handler import check_session_stopped -from frappe.translate import get_lang_code, guess_language -from frappe.utils.password import check_password, delete_login_failed_cache +from frappe.translate import guess_language +from frappe.utils.password import check_password from frappe.core.doctype.activity_log.activity_log import add_authentication_log from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, confirm_otp_token, get_cached_user_pass) @@ -92,12 +92,7 @@ class HTTPRequest: frappe.throw(_("Invalid Request"), frappe.CSRFTokenError) def set_lang(self): - if frappe.form_dict._lang: - lang = get_lang_code(frappe.form_dict._lang) - if lang: - frappe.local.lang = lang - else: - frappe.local.lang = guess_language() + frappe.local.lang = guess_language() def get_db_name(self): """get database name from conf""" diff --git a/frappe/translate.py b/frappe/translate.py index 8344436d94..c567d0615c 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -11,6 +11,7 @@ import io import itertools import json import operator +import functools import os import re from csv import reader @@ -21,36 +22,64 @@ from frappe.utils import is_html, strip, strip_html_tags def guess_language(lang_list=None): - """Set `frappe.local.lang` from HTTP headers at beginning of request""" + """Set `frappe.local.lang` from HTTP headers at beginning of request + + Order of priority for setting language: + 1. Form Dict => _lang + 2. Cookie => preferred_language + 3. Request Header => Accept-Language + 4. User document => language + 5. System Settings => language + """ + + # fetch language from form_dict + if frappe.form_dict._lang: + language = get_lang_code( + frappe.form_dict._lang or get_parent_language(frappe.form_dict._lang) + ) + if language: + return language + + lang_set = set(lang_list or get_all_languages() or []) + + # fetch language from cookie preferred_language_cookie = frappe.request.cookies.get('preferred_language') - lang_codes = list(frappe.request.accept_languages.values()) if preferred_language_cookie: - lang_codes.append(preferred_language_cookie) + if preferred_language_cookie in lang_set: + return preferred_language_cookie - if not lang_codes: - return frappe.local.lang + parent_language = get_parent_language(language) + if parent_language in lang_set: + return parent_language - guess = None - if not lang_list: - lang_list = get_all_languages() or [] + # fetch language from request headers + accept_language = list(frappe.request.accept_languages.values()) - for l in lang_codes: - code = l.strip() - if not isinstance(code, str): - code = str(code, 'utf-8') - if code in lang_list or code == "en": - guess = code - break + for language in accept_language: + if language in lang_set: + return language - # check if parent language (pt) is setup, if variant (pt-BR) - if "-" in code: - code = code.split("-")[0] - if code in lang_list: - guess = code - break + parent_language = get_parent_language(language) + if parent_language in lang_set: + return parent_language + + # fallback to language set in User or System Settings + return frappe.local.lang + + +@functools.lru_cache(maxsize=None) +def get_parent_language(lang: str) -> str: + """If the passed language is a variant, return its parent + + Eg: + 1. zh-TW -> zh + 2. sr-BA -> sr + """ + is_language_variant = "-" in lang + if is_language_variant: + return lang[:lang.index("-")] - return guess or frappe.local.lang def get_user_lang(user=None): """Set frappe.local.lang from user preferences on session beginning or resumption""" @@ -75,7 +104,10 @@ def get_user_lang(user=None): return lang def get_lang_code(lang): - return frappe.db.get_value('Language', {'language_name': lang}) or lang + return ( + frappe.db.get_value("Language", {"name": lang}) + or frappe.db.get_value("Language", {"language_name": lang}) + ) def set_default_language(lang): """Set Global default language""" From 76ec9e44e4e9a7ade9509bc1f080c057aa5dbb3c Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 17:09:03 +0530 Subject: [PATCH 0398/1519] refactor: Rename guess_language as get_language Guess suggests there's some AI involvement. The get_language function has a defined priority. It is deterministic, hence teh name change. --- frappe/auth.py | 4 ++-- frappe/translate.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index 9135b139ae..7c8c119414 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -10,7 +10,7 @@ import frappe.utils.user from frappe import conf from frappe.sessions import Session, clear_sessions, delete_session from frappe.modules.patch_handler import check_session_stopped -from frappe.translate import guess_language +from frappe.translate import get_language from frappe.utils.password import check_password from frappe.core.doctype.activity_log.activity_log import add_authentication_log from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, @@ -92,7 +92,7 @@ class HTTPRequest: frappe.throw(_("Invalid Request"), frappe.CSRFTokenError) def set_lang(self): - frappe.local.lang = guess_language() + frappe.local.lang = get_language() def get_db_name(self): """get database name from conf""" diff --git a/frappe/translate.py b/frappe/translate.py index c567d0615c..50da6e7297 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -21,7 +21,7 @@ from frappe.model.utils import InvalidIncludePath, render_include from frappe.utils import is_html, strip, strip_html_tags -def guess_language(lang_list=None): +def get_language(lang_list=None): """Set `frappe.local.lang` from HTTP headers at beginning of request Order of priority for setting language: From 736c6c9b8a388c5c9f87509432dd3d53a65de4d9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 18:18:40 +0530 Subject: [PATCH 0399/1519] fix: Don't redefine datetime * Sort imports * Update file header --- frappe/auth.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index 7c8c119414..2e92e9fbbb 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -1,22 +1,20 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt -import datetime -from frappe import _ +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See LICENSE +from urllib.parse import quote + import frappe import frappe.database import frappe.utils -from frappe.utils import cint, get_datetime, datetime, date_diff, today import frappe.utils.user -from frappe import conf -from frappe.sessions import Session, clear_sessions, delete_session -from frappe.modules.patch_handler import check_session_stopped -from frappe.translate import get_language -from frappe.utils.password import check_password +from frappe import _, conf from frappe.core.doctype.activity_log.activity_log import add_authentication_log -from frappe.twofactor import (should_run_2fa, authenticate_for_2factor, - confirm_otp_token, get_cached_user_pass) +from frappe.modules.patch_handler import check_session_stopped +from frappe.sessions import Session, clear_sessions, delete_session +from frappe.translate import get_language +from frappe.twofactor import authenticate_for_2factor, confirm_otp_token, get_cached_user_pass, should_run_2fa +from frappe.utils import cint, date_diff, datetime, get_datetime, today +from frappe.utils.password import check_password from frappe.website.utils import get_home_page -from urllib.parse import quote class HTTPRequest: From 0598ddf70ef83cf1bada858ffd7c7b6d8017a098 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 13 Jul 2021 18:19:38 +0530 Subject: [PATCH 0400/1519] fix: Clear preferred_language cookie post login If preferred_language was set in cookie pre login, clear it after a successful login so that User or Site specific settings can be applied --- frappe/auth.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/frappe/auth.py b/frappe/auth.py index 2e92e9fbbb..fc1cb09e1a 100644 --- a/frappe/auth.py +++ b/frappe/auth.py @@ -154,8 +154,9 @@ class LoginManager: self.make_session() self.setup_boot_cache() self.set_user_info() + self.clear_preferred_language() - def get_user_info(self, resume=False): + def get_user_info(self): self.info = frappe.db.get_value("User", self.user, ["user_type", "first_name", "last_name", "user_image"], as_dict=1) @@ -193,11 +194,13 @@ class LoginManager: frappe.local.response["redirect_to"] = redirect_to frappe.cache().hdel('redirect_after_login', self.user) - frappe.local.cookie_manager.set_cookie("full_name", self.full_name) frappe.local.cookie_manager.set_cookie("user_id", self.user) frappe.local.cookie_manager.set_cookie("user_image", self.info.user_image or "") + def clear_preferred_language(self): + frappe.local.cookie_manager.delete_cookie("preferred_language") + def make_session(self, resume=False): # start session frappe.local.session_obj = Session(user=self.user, resume=resume, From b4ea6c8890c50364a62d2151618f982597138761 Mon Sep 17 00:00:00 2001 From: Sagar Vora Date: Wed, 14 Jul 2021 12:21:28 +0530 Subject: [PATCH 0401/1519] fix: dont refresh form dashboard in `layout.refresh_sections` (#13650) --- frappe/public/js/frappe/form/layout.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frappe/public/js/frappe/form/layout.js b/frappe/public/js/frappe/form/layout.js index 045e5dc1b3..528f485354 100644 --- a/frappe/public/js/frappe/form/layout.js +++ b/frappe/public/js/frappe/form/layout.js @@ -263,9 +263,6 @@ frappe.ui.form.Layout = class Layout { section.addClass("empty-section"); } }); - - this.frm && this.frm.dashboard.refresh(); - } refresh_fields (fields) { From e3a1f6f1d09c4973a20c6a562697cb850cb3bc03 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Wed, 14 Jul 2021 13:25:17 +0530 Subject: [PATCH 0402/1519] chore: Added comment --- cypress/integration/datetime_field_form_validation.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cypress/integration/datetime_field_form_validation.js b/cypress/integration/datetime_field_form_validation.js index dff1f0562c..66fdde6863 100644 --- a/cypress/integration/datetime_field_form_validation.js +++ b/cypress/integration/datetime_field_form_validation.js @@ -1,4 +1,4 @@ -context('Datetime Validation', () => { +context('Datetime Field Validation', () => { before(() => { cy.login(); cy.visit('/app/communication'); @@ -7,6 +7,7 @@ context('Datetime Validation', () => { }); }); + // validating datetime field value when value is set from backend and get validated on form load. it('datetime field form validation', () => { cy.visit('/app/communication'); cy.get('a[title="Test Form Communication 1"]').invoke('attr', 'data-name') From bd854bb368023c43a90d1cb044a5282a082e9371 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 14 Jul 2021 18:16:50 +0530 Subject: [PATCH 0403/1519] fix: Do not create energy points for disabled users --- frappe/core/doctype/user/user.py | 13 +++++++++++++ .../doctype/energy_point_rule/energy_point_rule.py | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 5b605504e8..53d1c9ffe5 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -53,6 +53,7 @@ class User(Document): def after_insert(self): create_notification_settings(self.name) frappe.cache().delete_key('users_for_mentions') + frappe.cache().delete_key('enabled_users') def validate(self): self.check_demo() @@ -129,6 +130,9 @@ class User(Document): if self.has_value_changed('allow_in_mentions') or self.has_value_changed('user_type'): frappe.cache().delete_key('users_for_mentions') + if self.has_value_changed('enabled'): + frappe.cache().delete_key('enabled_users') + def has_website_permission(self, ptype, user, verbose=False): """Returns true if current user is the session user""" return self.name == frappe.session.user @@ -392,6 +396,8 @@ class User(Document): if self.get('allow_in_mentions'): frappe.cache().delete_key('users_for_mentions') + frappe.cache().delete_key('enabled_users') + def before_rename(self, old_name, new_name, merge=False): self.check_demo() @@ -1230,3 +1236,10 @@ def generate_keys(user): def switch_theme(theme): if theme in ["Dark", "Light"]: frappe.db.set_value("User", frappe.session.user, "desk_theme", theme) + +def get_enabled_users(): + def _get_enabled_users(): + enabled_users = frappe.get_all("User", filters={"enabled": "1"}, pluck="name") + return enabled_users + + return frappe.cache().get_value("enabled_users", _get_enabled_users) \ No newline at end of file diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.py b/frappe/social/doctype/energy_point_rule/energy_point_rule.py index 1c736528de..b673e8e199 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.py +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.py @@ -5,6 +5,7 @@ import frappe from frappe import _ import frappe.cache_manager +from frappe.core.doctype.user.user import get_enabled_users from frappe.model import log_types from frappe.model.document import Document from frappe.social.doctype.energy_point_settings.energy_point_settings import is_energy_point_enabled @@ -44,7 +45,7 @@ class EnergyPointRule(Document): try: for user in users: - if not user or user == 'Administrator': continue + if not is_eligible_user(user): continue create_energy_points_log(reference_doctype, reference_name, { 'points': points, 'user': user, @@ -119,3 +120,8 @@ def get_energy_point_doctypes(): d.reference_doctype for d in frappe.get_all('Energy Point Rule', ['reference_doctype'], {'enabled': 1}) ] + +def is_eligible_user(user): + '''Checks if user is eligible to get energy points''' + enabled_users = get_enabled_users() + return user and user in enabled_users and user != 'Administrator' From e00aaf8cc492332ba18fc05c67013eee51f572a7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 19:30:01 +0530 Subject: [PATCH 0404/1519] BREAKING CHANGE: Drop frappe.lang in favour of frappe.local.lang --- frappe/__init__.py | 2 -- frappe/boot.py | 2 +- frappe/core/doctype/page/page.py | 2 +- frappe/desk/desk_page.py | 2 +- frappe/desk/query_report.py | 2 +- frappe/sessions.py | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 1c978945c7..4015ea8090 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -130,8 +130,6 @@ error_log = local("error_log") debug_log = local("debug_log") message_log = local("message_log") -lang = local("lang") - # This if block is never executed when running the code. It is only used for # telling static code analyzer where to find dynamically defined attributes. if typing.TYPE_CHECKING: diff --git a/frappe/boot.py b/frappe/boot.py index 0589e32ac8..6636cb4329 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -208,7 +208,7 @@ def get_column(doctype): def load_translations(bootinfo): messages = frappe.get_lang_dict("boot") - bootinfo["lang"] = frappe.lang + bootinfo["lang"] = frappe.local.lang # load translated report names for name in bootinfo.user.all_reports: diff --git a/frappe/core/doctype/page/page.py b/frappe/core/doctype/page/page.py index 0ba0e309dd..3a6baef9c4 100644 --- a/frappe/core/doctype/page/page.py +++ b/frappe/core/doctype/page/page.py @@ -141,7 +141,7 @@ class Page(Document): # flag for not caching this page self._dynamic_page = True - if frappe.lang != 'en': + if frappe.local.lang != 'en': from frappe.translate import get_lang_js self.script += get_lang_js("page", self.name) diff --git a/frappe/desk/desk_page.py b/frappe/desk/desk_page.py index d373dbda0e..45e266b957 100644 --- a/frappe/desk/desk_page.py +++ b/frappe/desk/desk_page.py @@ -31,7 +31,7 @@ def getpage(): doc = get(page) # load translations - if frappe.lang != "en": + if frappe.local.lang != "en": send_translations(frappe.get_lang_dict("page", page)) frappe.response.docs.append(doc) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index 3c0ebf11c1..a127594af1 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -187,7 +187,7 @@ def get_script(report_name): script = "frappe.query_reports['%s']={}" % report_name # load translations - if frappe.lang != "en": + if frappe.local.lang != "en": send_translations(frappe.get_lang_dict("report", report_name)) return { diff --git a/frappe/sessions.py b/frappe/sessions.py index 4d922d6769..85a13523ff 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -335,7 +335,7 @@ class Session: now = frappe.utils.now() self.data['data']['last_updated'] = now - self.data['data']['lang'] = str(frappe.lang) + self.data['data']['lang'] = str(frappe.local.lang) # update session in db last_updated = frappe.cache().hget("last_db_session_update", self.sid) From e8d50b9d3c6c0a39ed3602ffc7627214f0c7ed72 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 19:32:30 +0530 Subject: [PATCH 0405/1519] chore: Add types for frappe.translate module *only for recently modified functions --- frappe/translate.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frappe/translate.py b/frappe/translate.py index 50da6e7297..c3c88f9b0a 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -15,13 +15,14 @@ import functools import os import re from csv import reader +from typing import List, Union import frappe from frappe.model.utils import InvalidIncludePath, render_include from frappe.utils import is_html, strip, strip_html_tags -def get_language(lang_list=None): +def get_language(lang_list: List = None) -> str: """Set `frappe.local.lang` from HTTP headers at beginning of request Order of priority for setting language: @@ -81,7 +82,7 @@ def get_parent_language(lang: str) -> str: return lang[:lang.index("-")] -def get_user_lang(user=None): +def get_user_lang(user: str = None) -> str: """Set frappe.local.lang from user preferences on session beginning or resumption""" if not user: user = frappe.session.user @@ -103,7 +104,7 @@ def get_user_lang(user=None): return lang -def get_lang_code(lang): +def get_lang_code(lang: str) -> Union[str, None]: return ( frappe.db.get_value("Language", {"name": lang}) or frappe.db.get_value("Language", {"language_name": lang}) From 8faf2fd759095b3a54dd3ed0ff16e9ab949e1473 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 19:33:48 +0530 Subject: [PATCH 0406/1519] refactor(minor): frappe.translate module * Remove unset limit for lru cache in get_parent_language * Simplify get_user_lang and add relevant comment --- frappe/translate.py | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/frappe/translate.py b/frappe/translate.py index c3c88f9b0a..15d771ecdd 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt """ frappe.translate @@ -69,7 +69,7 @@ def get_language(lang_list: List = None) -> str: return frappe.local.lang -@functools.lru_cache(maxsize=None) +@functools.lru_cache() def get_parent_language(lang: str) -> str: """If the passed language is a variant, return its parent @@ -84,21 +84,17 @@ def get_parent_language(lang: str) -> str: def get_user_lang(user: str = None) -> str: """Set frappe.local.lang from user preferences on session beginning or resumption""" - if not user: - user = frappe.session.user - - # via cache + user = user or frappe.session.user lang = frappe.cache().hget("lang", user) if not lang: - - # if defined in user profile - lang = frappe.db.get_value("User", user, "language") - if not lang: - lang = frappe.db.get_default("lang") - - if not lang: - lang = frappe.local.lang or 'en' + # User.language => Session Defaults => frappe.local.lang => 'en' + lang = ( + frappe.db.get_value("User", user, "language") + or frappe.db.get_default("lang") + or frappe.local.lang + or "en" + ) frappe.cache().hset("lang", user, lang) From 2ac1c45c664af135bdaefc934ea258a01d76661f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 20:12:10 +0530 Subject: [PATCH 0407/1519] refactor: Maintain common list for Frappe Coverage settings * Maintain common settings for coverage settings of parallel and base test suites * Expand FRAPPE_EXCLUSIONS list based on coveralls.io report --- frappe/commands/utils.py | 24 ++++------------------- frappe/coverage.py | 35 ++++++++++++++++++++++++++++++++++ frappe/parallel_test_runner.py | 25 ++++-------------------- 3 files changed, 43 insertions(+), 41 deletions(-) create mode 100644 frappe/coverage.py diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 212642e01b..874ec90d47 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -551,32 +551,16 @@ def run_tests(context, app=None, module=None, doctype=None, test=(), profile=Fal if coverage: from coverage import Coverage + from frappe.coverage import STANDARD_INCLUSIONS, STANDARD_EXCLUSIONS, FRAPPE_EXCLUSIONS # Generate coverage report only for app that is being tested source_path = os.path.join(get_bench_path(), 'apps', app or 'frappe') - incl = [ - '*.py', - ] - omit = [ - '*.js', - '*.xml', - '*.pyc', - '*.css', - '*.less', - '*.scss', - '*.vue', - '*.html', - '*/test_*', - '*/node_modules/*', - '*/doctype/*/*_dashboard.py', - '*/patches/*', - ] + omit = STANDARD_EXCLUSIONS[:] if not app or app == 'frappe': - omit.append('*/tests/*') - omit.append('*/commands/*') + omit.extend(FRAPPE_EXCLUSIONS) - cov = Coverage(source=[source_path], omit=omit, include=incl) + cov = Coverage(source=[source_path], omit=omit, include=STANDARD_INCLUSIONS) cov.start() ret = frappe.test_runner.main(app, module, doctype, context.verbose, tests=tests, diff --git a/frappe/coverage.py b/frappe/coverage.py new file mode 100644 index 0000000000..a59c24a714 --- /dev/null +++ b/frappe/coverage.py @@ -0,0 +1,35 @@ +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors +# MIT License. See LICENSE +""" + frappe.coverage + ~~~~~~~~~~~~~~~~ + + Coverage settings for frappe +""" + +STANDARD_INCLUSIONS = ["*.py"] + +STANDARD_EXCLUSIONS = [ + '*.js', + '*.xml', + '*.pyc', + '*.css', + '*.less', + '*.scss', + '*.vue', + '*.html', + '*/test_*', + '*/node_modules/*', + '*/doctype/*/*_dashboard.py', + '*/patches/*', +] + +FRAPPE_EXCLUSIONS = [ + "*/tests/*", + "*/commands/*", + "*/frappe/change_log/*", + "*/frappe/exceptions*", + "*frappe/setup.py", + "*/doctype/*/*_dashboard.py", + "*/patches/*", +] diff --git a/frappe/parallel_test_runner.py b/frappe/parallel_test_runner.py index 2f83b88572..6265498c96 100644 --- a/frappe/parallel_test_runner.py +++ b/frappe/parallel_test_runner.py @@ -111,33 +111,16 @@ class ParallelTestRunner(): if self.with_coverage: from coverage import Coverage from frappe.utils import get_bench_path + from frappe.coverage import STANDARD_INCLUSIONS, STANDARD_EXCLUSIONS, FRAPPE_EXCLUSIONS # Generate coverage report only for app that is being tested source_path = os.path.join(get_bench_path(), 'apps', self.app) - incl = [ - '*.py', - ] - omit = [ - '*.js', - '*.xml', - '*.pyc', - '*.css', - '*.less', - '*.scss', - '*.vue', - '*.pyc', - '*.html', - '*/test_*', - '*/node_modules/*', - '*/doctype/*/*_dashboard.py', - '*/patches/*', - ] + omit = STANDARD_EXCLUSIONS[:] if self.app == 'frappe': - omit.append('*/tests/*') - omit.append('*/commands/*') + omit.extend(FRAPPE_EXCLUSIONS) - self.coverage = Coverage(source=[source_path], omit=omit, include=incl) + self.coverage = Coverage(source=[source_path], omit=omit, include=STANDARD_INCLUSIONS) self.coverage.start() def save_coverage(self): From e71eef0ecc1b7601d5df83e007488db0fde236e9 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 20:14:03 +0530 Subject: [PATCH 0408/1519] chore: Drop dead code (pythonrc file) --- frappe/pythonrc.py | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 frappe/pythonrc.py diff --git a/frappe/pythonrc.py b/frappe/pythonrc.py deleted file mode 100755 index 6761ead05b..0000000000 --- a/frappe/pythonrc.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python2.7 - -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors -# MIT License. See license.txt - -import os -import frappe -frappe.connect(site=os.environ.get("site")) \ No newline at end of file From 4959dd02f1c8d7cac0ed677eed43ed0bc454a2a5 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Wed, 14 Jul 2021 20:14:37 +0530 Subject: [PATCH 0409/1519] refactor(minor): frappe.translate.get_messages_from_file * Don't re-define frappe util - get_bench_path * Add Python types * Style changes --- frappe/commands/utils.py | 2 +- frappe/translate.py | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/frappe/commands/utils.py b/frappe/commands/utils.py index 874ec90d47..8fc6877d4f 100644 --- a/frappe/commands/utils.py +++ b/frappe/commands/utils.py @@ -770,7 +770,7 @@ def get_version(output): "table": lambda: render_table( [["App", "Version", "Branch", "Commit"]] + [ - [app_info.app, app_info.version, app_info.branch, app_info.commit] + [app_info.app, app_info.version, app_info.branch, app_info.commit] for app_info in data ] ), diff --git a/frappe/translate.py b/frappe/translate.py index 15d771ecdd..ce4c3abf3d 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -15,11 +15,11 @@ import functools import os import re from csv import reader -from typing import List, Union +from typing import List, Union, Tuple import frappe from frappe.model.utils import InvalidIncludePath, render_include -from frappe.utils import is_html, strip, strip_html_tags +from frappe.utils import get_bench_path, is_html, strip, strip_html_tags def get_language(lang_list: List = None) -> str: @@ -558,7 +558,7 @@ def get_all_messages_from_js_files(app_name=None): return messages -def get_messages_from_file(path): +def get_messages_from_file(path: str) -> List[Tuple[str, str, str, str]]: """Returns a list of transatable strings from a code file :param path: path of the code file @@ -571,7 +571,7 @@ def get_messages_from_file(path): frappe.flags.scanned_files.append(path) - apps_path = get_bench_dir() + bench_path = get_bench_path() if os.path.exists(path): with open(path, 'r') as sourcefile: try: @@ -579,11 +579,12 @@ def get_messages_from_file(path): except Exception: print("Could not scan file for translation: {0}".format(path)) return [] - data = [(os.path.relpath(path, apps_path), message, context, line) \ - for line, message, context in extract_messages_from_code(file_contents)] - return data + + return [ + (os.path.relpath(path, bench_path), message, context, line) + for (line, message, context) in extract_messages_from_code(file_contents) + ] else: - # print "Translate: {0} missing".format(os.path.abspath(path)) return [] def extract_messages_from_code(code): @@ -797,9 +798,6 @@ def deduplicate_messages(messages): ret.append(next(g)) return ret -def get_bench_dir(): - return os.path.join(frappe.__file__, '..', '..', '..', '..') - def rename_language(old_name, new_name): if not frappe.db.exists('Language', new_name): return From bd91a33bb91ee57a3b6b73ea7cda1c285e81a0e4 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 14 Jul 2021 21:35:04 +0530 Subject: [PATCH 0410/1519] test: Add test case to validate EP for disabled user --- .../energy_point_log/test_energy_point_log.py | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/frappe/social/doctype/energy_point_log/test_energy_point_log.py b/frappe/social/doctype/energy_point_log/test_energy_point_log.py index 8c4dba5d6b..4a6e86463e 100644 --- a/frappe/social/doctype/energy_point_log/test_energy_point_log.py +++ b/frappe/social/doctype/energy_point_log/test_energy_point_log.py @@ -273,6 +273,31 @@ class TestEnergyPointLog(unittest.TestCase): self.assertEqual(points_after_reverting_todo, points_after_closing_todo - rule_points) self.assertEqual(points_after_saving_todo_again, points_after_reverting_todo + rule_points) + def test_energy_points_disabled_user(self): + frappe.set_user('test@example.com') + user = frappe.get_doc('User', 'test@example.com') + user.enabled = 0 + user.save() + todo_point_rule = create_energy_point_rule_for_todo() + energy_point_of_user = get_points('test@example.com') + + created_todo = create_a_todo() + + created_todo.status = 'Closed' + created_todo.save() + points_after_closing_todo = get_points('test@example.com') + + # do not update energy points for disabled user + self.assertEqual(points_after_closing_todo, energy_point_of_user) + + user.enabled = 1 + user.save() + + created_todo.save() + points_after_re_saving_todo = get_points('test@example.com') + self.assertEqual(points_after_re_saving_todo, energy_point_of_user + todo_point_rule.points) + + def create_energy_point_rule_for_todo(multiplier_field=None, for_doc_event='Custom', max_points=None, for_assigned_users=0, field_to_check=None, apply_once=False, user_field='owner'): name = 'ToDo Closed' From 421220a872e07da153b33392005c74a87f08b1ea Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 01:04:04 +0530 Subject: [PATCH 0411/1519] test: Added tests for frappe.translate.get_language --- frappe/tests/test_translate.py | 54 ++++++++++++++++++++++++++++++++-- frappe/translate.py | 5 +++- 2 files changed, 56 insertions(+), 3 deletions(-) diff --git a/frappe/tests/test_translate.py b/frappe/tests/test_translate.py index f51f31d509..717b18ced8 100644 --- a/frappe/tests/test_translate.py +++ b/frappe/tests/test_translate.py @@ -1,13 +1,27 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt -import frappe, unittest, os +import os +import unittest +from random import choices +from unittest.mock import patch + +import frappe import frappe.translate from frappe import _ +from frappe.auth import HTTPRequest +from frappe.translate import get_parent_language +from frappe.utils import set_request dirname = os.path.dirname(__file__) translation_string_file = os.path.join(dirname, 'translation_test_file.txt') +first_lang, second_lang, third_lang, fourth_lang, fifth_lang = choices( + frappe.get_all("Language", pluck="name"), k=5 +) class TestTranslate(unittest.TestCase): + def tearDown(self): + frappe.form_dict.pop("_lang", None) + def test_extract_message_from_file(self): data = frappe.translate.get_messages_from_file(translation_string_file) self.assertListEqual(data, expected_output) @@ -20,6 +34,42 @@ class TestTranslate(unittest.TestCase): finally: frappe.local.lang = 'en' + def test_request_language_resolution_with_form_dict(self): + """Test for frappe.translate.get_language + + Case 1: frappe.form_dict._lang is set + """ + + frappe.form_dict._lang = first_lang + + with patch.object(frappe.translate, "get_preferred_language_cookie", return_value=second_lang): + set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) + HTTPRequest() + + self.assertIn(frappe.local.lang, [first_lang, get_parent_language(first_lang)]) + + def test_request_language_resolution_with_cookie(self): + """Test for frappe.translate.get_language + + Case 2: frappe.form_dict._lang is not set, but preferred_language cookie is + """ + + with patch.object(frappe.translate, "get_preferred_language_cookie", return_value=second_lang): + set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) + HTTPRequest() + + self.assertIn(frappe.local.lang, [second_lang, get_parent_language(second_lang)]) + + def test_request_language_resolution_with_request_header(self): + """Test for frappe.translate.get_language + + Case 3: frappe.form_dict._lang & preferred_language cookie is not set, but Accept-Language header is + """ + set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) + HTTPRequest() + self.assertIn(frappe.local.lang, [third_lang, get_parent_language(third_lang)]) + + expected_output = [ ('apps/frappe/frappe/tests/translation_test_file.txt', 'Warning: Unable to find {0} in any table related to {1}', 'This is some context', 2), ('apps/frappe/frappe/tests/translation_test_file.txt', 'Warning: Unable to find {0} in any table related to {1}', None, 4), diff --git a/frappe/translate.py b/frappe/translate.py index ce4c3abf3d..d5916f1761 100644 --- a/frappe/translate.py +++ b/frappe/translate.py @@ -44,7 +44,7 @@ def get_language(lang_list: List = None) -> str: lang_set = set(lang_list or get_all_languages() or []) # fetch language from cookie - preferred_language_cookie = frappe.request.cookies.get('preferred_language') + preferred_language_cookie = get_preferred_language_cookie() if preferred_language_cookie: if preferred_language_cookie in lang_set: @@ -906,3 +906,6 @@ def get_all_languages(with_language_name=False): @frappe.whitelist(allow_guest=True) def set_preferred_language_cookie(preferred_language): frappe.local.cookie_manager.set_cookie("preferred_language", preferred_language) + +def get_preferred_language_cookie(): + return frappe.request.cookies.get("preferred_language") From 2ccfb547b50a43e39ce4cbe8d53b81d525689fe6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 01:11:10 +0530 Subject: [PATCH 0412/1519] test: Added test to check sanity of HTTPRequest.set_lang --- frappe/tests/test_auth.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/frappe/tests/test_auth.py b/frappe/tests/test_auth.py index bc23cb591c..8447150006 100644 --- a/frappe/tests/test_auth.py +++ b/frappe/tests/test_auth.py @@ -4,8 +4,9 @@ import time import unittest import frappe -from frappe.auth import LoginAttemptTracker +from frappe.auth import HTTPRequest, LoginAttemptTracker from frappe.frappeclient import FrappeClient, AuthError +from frappe.utils import set_request class TestAuth(unittest.TestCase): def __init__(self, *args, **kwargs): @@ -124,3 +125,20 @@ class TestLoginAttemptTracker(unittest.TestCase): tracker.add_failure_attempt() self.assertTrue(tracker.is_user_allowed()) + +class TestFrappeHTTPRequest(unittest.TestCase): + # test frappe.auth.HTTPRequest + def test_set_language(self): + """Check if language is set on object initialization + + This is a test to ensure that language has changed. To test correctness + of frappe.local.lang, check out the tests of frappe.translate.get_language + """ + lang_before_request = frappe.local.lang + random_lang = frappe.get_all("Language", limit=1, pluck="name")[0] + set_request(method='POST', path='/') + frappe.form_dict._lang = random_lang + HTTPRequest() + self.assertTrue(hasattr(frappe.local, "lang")) + self.assertIsInstance(frappe.local.lang, str) + self.assertNotEqual(lang_before_request, frappe.local.lang) From f54894b1e75f30a60e5f611c097f123967901078 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 01:12:13 +0530 Subject: [PATCH 0413/1519] chore: Update copyright year info in file header --- frappe/sessions.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frappe/sessions.py b/frappe/sessions.py index 85a13523ff..8e30d0660c 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -1,4 +1,4 @@ -# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2021, Frappe Technologies Pvt. Ltd. and Contributors # MIT License. See license.txt """ Boot session from cache or build @@ -249,7 +249,6 @@ class Session: data = self.get_session_record() if data: - # set language self.data.update({'data': data, 'user':data.user, 'sid': self.sid}) self.user = data.user validate_ip_address(self.user) From ffb020ce0ea9a0fb2c2ec7c0f8d03d986bc1cd1e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 15 Jul 2021 08:37:47 +0530 Subject: [PATCH 0414/1519] fix: Make query postgres compatible --- frappe/desk/reportview.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py index b9382bc830..1dbc52eb5b 100644 --- a/frappe/desk/reportview.py +++ b/frappe/desk/reportview.py @@ -450,6 +450,7 @@ def get_stats(stats, doctype, filters=[]): filters=filters + [[tag, '!=', '']], group_by=tag, as_list=True, + distinct=1, ) if tag == '_user_tags': @@ -458,18 +459,22 @@ def get_stats(stats, doctype, filters=[]): fields=[tag, "count(*)"], filters=filters + [[tag, "in", ('', ',')]], as_list=True, - )[0][1] + group_by=tag, + order_by=tag, + ) + + no_tag_count = no_tag_count[0][1] if no_tag_count else 0 stats[tag].append([_("No Tags"), no_tag_count]) else: stats[tag] = tag_count except frappe.db.SQLError: - # does not work for child tables pass - except frappe.db.InternalError: + except frappe.db.InternalError as e: # raised when _user_tags column is added on the fly pass + return stats @frappe.whitelist() From 187c777539353b9b9ebfb1cd6089e776a114e5d7 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 14:18:31 +0530 Subject: [PATCH 0415/1519] chore: Trigger GHA From a6537ce987b208eacc7f1e3b19a2b25de3dae127 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 15:38:36 +0530 Subject: [PATCH 0416/1519] test: Invoke get_language directly instead of via HTTPRequest --- frappe/tests/test_translate.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/frappe/tests/test_translate.py b/frappe/tests/test_translate.py index 717b18ced8..edab3a82c3 100644 --- a/frappe/tests/test_translate.py +++ b/frappe/tests/test_translate.py @@ -8,8 +8,7 @@ from unittest.mock import patch import frappe import frappe.translate from frappe import _ -from frappe.auth import HTTPRequest -from frappe.translate import get_parent_language +from frappe.translate import get_language, get_parent_language from frappe.utils import set_request dirname = os.path.dirname(__file__) @@ -43,10 +42,9 @@ class TestTranslate(unittest.TestCase): frappe.form_dict._lang = first_lang with patch.object(frappe.translate, "get_preferred_language_cookie", return_value=second_lang): - set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) - HTTPRequest() + return_val = get_language() - self.assertIn(frappe.local.lang, [first_lang, get_parent_language(first_lang)]) + self.assertIn(return_val, [first_lang, get_parent_language(first_lang)]) def test_request_language_resolution_with_cookie(self): """Test for frappe.translate.get_language @@ -56,9 +54,9 @@ class TestTranslate(unittest.TestCase): with patch.object(frappe.translate, "get_preferred_language_cookie", return_value=second_lang): set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) - HTTPRequest() + return_val = get_language() - self.assertIn(frappe.local.lang, [second_lang, get_parent_language(second_lang)]) + self.assertIn(return_val, [second_lang, get_parent_language(second_lang)]) def test_request_language_resolution_with_request_header(self): """Test for frappe.translate.get_language @@ -66,8 +64,8 @@ class TestTranslate(unittest.TestCase): Case 3: frappe.form_dict._lang & preferred_language cookie is not set, but Accept-Language header is """ set_request(method="POST", path="/", headers=[("Accept-Language", third_lang)]) - HTTPRequest() - self.assertIn(frappe.local.lang, [third_lang, get_parent_language(third_lang)]) + return_val = get_language() + self.assertIn(return_val, [third_lang, get_parent_language(third_lang)]) expected_output = [ From 275a4335c291a56784000139e9e5f32f7afb2eb1 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 15:53:21 +0530 Subject: [PATCH 0417/1519] ci: Override acceptable semantic commit name types * Add "BREAKING CHANGE" --- .github/semantic.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/.github/semantic.yml b/.github/semantic.yml index e1e53bc1a4..fa15046b4a 100644 --- a/.github/semantic.yml +++ b/.github/semantic.yml @@ -11,3 +11,20 @@ allowRevertCommits: true # For allowed PR types: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json # Tool Reference: https://github.com/zeke/semantic-pull-requests + +# By default types specified in commitizen/conventional-commit-types is used. +# See: https://github.com/commitizen/conventional-commit-types/blob/v3.0.0/index.json +# You can override the valid types +types: + - BREAKING CHANGE + - feat + - fix + - docs + - style + - refactor + - perf + - test + - build + - ci + - chore + - revert From 42b3c178002e65c7b025561ce3f86e73274b50f3 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 15 Jul 2021 16:02:44 +0530 Subject: [PATCH 0418/1519] Revert "BREAKING CHANGE: Drop frappe.lang in favour of frappe.local.lang" This reverts commit e00aaf8cc492332ba18fc05c67013eee51f572a7. --- This was pretty much a pointless change since frappe.lang just proxies to frappe.local.lang --- frappe/__init__.py | 2 ++ frappe/boot.py | 2 +- frappe/core/doctype/page/page.py | 2 +- frappe/desk/desk_page.py | 2 +- frappe/desk/query_report.py | 2 +- frappe/sessions.py | 2 +- 6 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 4015ea8090..1c978945c7 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -130,6 +130,8 @@ error_log = local("error_log") debug_log = local("debug_log") message_log = local("message_log") +lang = local("lang") + # This if block is never executed when running the code. It is only used for # telling static code analyzer where to find dynamically defined attributes. if typing.TYPE_CHECKING: diff --git a/frappe/boot.py b/frappe/boot.py index 6636cb4329..0589e32ac8 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -208,7 +208,7 @@ def get_column(doctype): def load_translations(bootinfo): messages = frappe.get_lang_dict("boot") - bootinfo["lang"] = frappe.local.lang + bootinfo["lang"] = frappe.lang # load translated report names for name in bootinfo.user.all_reports: diff --git a/frappe/core/doctype/page/page.py b/frappe/core/doctype/page/page.py index 3a6baef9c4..0ba0e309dd 100644 --- a/frappe/core/doctype/page/page.py +++ b/frappe/core/doctype/page/page.py @@ -141,7 +141,7 @@ class Page(Document): # flag for not caching this page self._dynamic_page = True - if frappe.local.lang != 'en': + if frappe.lang != 'en': from frappe.translate import get_lang_js self.script += get_lang_js("page", self.name) diff --git a/frappe/desk/desk_page.py b/frappe/desk/desk_page.py index 45e266b957..d373dbda0e 100644 --- a/frappe/desk/desk_page.py +++ b/frappe/desk/desk_page.py @@ -31,7 +31,7 @@ def getpage(): doc = get(page) # load translations - if frappe.local.lang != "en": + if frappe.lang != "en": send_translations(frappe.get_lang_dict("page", page)) frappe.response.docs.append(doc) diff --git a/frappe/desk/query_report.py b/frappe/desk/query_report.py index a127594af1..3c0ebf11c1 100644 --- a/frappe/desk/query_report.py +++ b/frappe/desk/query_report.py @@ -187,7 +187,7 @@ def get_script(report_name): script = "frappe.query_reports['%s']={}" % report_name # load translations - if frappe.local.lang != "en": + if frappe.lang != "en": send_translations(frappe.get_lang_dict("report", report_name)) return { diff --git a/frappe/sessions.py b/frappe/sessions.py index 8e30d0660c..0b469616b8 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -334,7 +334,7 @@ class Session: now = frappe.utils.now() self.data['data']['last_updated'] = now - self.data['data']['lang'] = str(frappe.local.lang) + self.data['data']['lang'] = str(frappe.lang) # update session in db last_updated = frappe.cache().hget("last_db_session_update", self.sid) From 144880bfb10e2f11c23ff3e83b8e0a50d05631a3 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Thu, 15 Jul 2021 19:34:49 +0530 Subject: [PATCH 0419/1519] ci: make semgrep check diff-aware --- .../semgrep_rules/frappe_correctness.yml | 2 -- .github/helper/semgrep_rules/security.yml | 4 --- .github/workflows/semgrep.yml | 36 ++++++------------- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.github/helper/semgrep_rules/frappe_correctness.yml b/.github/helper/semgrep_rules/frappe_correctness.yml index faab3344a6..d9603e89aa 100644 --- a/.github/helper/semgrep_rules/frappe_correctness.yml +++ b/.github/helper/semgrep_rules/frappe_correctness.yml @@ -98,8 +98,6 @@ rules: languages: [python] severity: WARNING paths: - exclude: - - test_*.py include: - "*/**/doctype/*" diff --git a/.github/helper/semgrep_rules/security.yml b/.github/helper/semgrep_rules/security.yml index b2cc4b16fc..5a5098bf50 100644 --- a/.github/helper/semgrep_rules/security.yml +++ b/.github/helper/semgrep_rules/security.yml @@ -8,10 +8,6 @@ rules: dynamic content. Avoid it or use safe_eval(). languages: [python] severity: ERROR - paths: - exclude: - - frappe/__init__.py - - frappe/commands/utils.py - id: frappe-sqli-format-strings patterns: diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml index 389524e968..e27b406df0 100644 --- a/.github/workflows/semgrep.yml +++ b/.github/workflows/semgrep.yml @@ -1,34 +1,18 @@ name: Semgrep on: - pull_request: - branches: - - develop - - version-13-hotfix - - version-13-pre-release + pull_request: { } + jobs: semgrep: name: Frappe Linter runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Setup python3 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - - name: Setup semgrep - run: | - python -m pip install -q semgrep - git fetch origin $GITHUB_BASE_REF:$GITHUB_BASE_REF -q - - - name: Semgrep errors - run: | - files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF) - [[ -d .github/helper/semgrep_rules ]] && semgrep --severity ERROR --config=.github/helper/semgrep_rules --quiet --error $files - semgrep --config="r/python.lang.correctness" --quiet --error $files - - - name: Semgrep warnings - run: | - files=$(git diff --name-only --diff-filter=d $GITHUB_BASE_REF) - [[ -d .github/helper/semgrep_rules ]] && semgrep --severity WARNING --severity INFO --config=.github/helper/semgrep_rules --quiet $files + - uses: actions/checkout@v2 + - uses: returntocorp/semgrep-action@v1 + env: + SEMGREP_TIMEOUT: 120 + with: + config: >- + r/python.lang.correctness + .github/helper/semgrep_rules From c85ff679ef7a4c88dc4c625f69faed76ef195111 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 16 Jul 2021 12:02:13 +0530 Subject: [PATCH 0420/1519] fix(NotFoundPage): Set default value for http_status_code --- frappe/website/page_renderers/not_found_page.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/website/page_renderers/not_found_page.py b/frappe/website/page_renderers/not_found_page.py index af510fecfc..de631f5dfe 100644 --- a/frappe/website/page_renderers/not_found_page.py +++ b/frappe/website/page_renderers/not_found_page.py @@ -8,11 +8,11 @@ from frappe.website.utils import can_cache HOMEPAGE_PATHS = ('/', '/index', 'index') class NotFoundPage(TemplatePage): - def __init__(self, path, http_status_code): + def __init__(self, path, http_status_code=None): self.request_path = path self.request_url = frappe.local.request.url if hasattr(frappe.local, 'request') else '' path = '404' - http_status_code = 404 + http_status_code = http_status_code or 404 super().__init__(path=path, http_status_code=http_status_code) def can_render(self): From 39d5820e05fe7f7a1f4212174e273324352ad3b6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 16 Jul 2021 13:15:20 +0530 Subject: [PATCH 0421/1519] fix: Allow navigation to the document with # in the docname --- frappe/public/js/frappe/router.js | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 2bfa7c7be6..f5967c0826 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -14,11 +14,10 @@ frappe.view_factories = []; frappe.route_options = null; frappe.route_hooks = {}; -$(window).on('hashchange', function() { +$(window).on('hashchange', function(e) { // v1 style routing, route is in hash - if (window.location.hash) { + if (window.location.hash && !frappe.router.is_app_route(e.currentTarget.pathname)) { let sub_path = frappe.router.get_sub_path(window.location.hash); - window.location.hash = ''; frappe.router.push_state(sub_path); return false; } @@ -52,14 +51,16 @@ $('body').on('click', 'a', function(e) { return override('/app'); } - // target has "#" ,this is a v1 style route, so remake it. - if (e.currentTarget.hash) { - return override(e.currentTarget.hash); - } - - // target has "/app, this is a v2 style route. - if (e.currentTarget.pathname && frappe.router.is_app_route(e.currentTarget.pathname)) { - return override(e.currentTarget.pathname); + if (frappe.router.is_app_route(e.currentTarget.pathname)) { + // target has "/app, this is a v2 style route. + if (e.currentTarget.pathname) { + return override(e.currentTarget.pathname + e.currentTarget.hash); + } + } else { + // target has "#" ,this is a v1 style route, so remake it. + if (e.currentTarget.hash) { + return override(e.currentTarget.hash); + } } }); @@ -349,8 +350,6 @@ frappe.router = { push_state(url) { // change the URL and call the router if (window.location.pathname !== url) { - // cleanup any remenants of v1 routing - window.location.hash = ''; // push state so the browser looks fine history.pushState(null, null, url); @@ -364,7 +363,11 @@ frappe.router = { // return clean sub_path from hash or url // supports both v1 and v2 routing if (!route) { - route = window.location.hash || (window.location.pathname + window.location.search); + route = window.location.pathname + window.location.hash + window.location.search; + if (route.includes('app#')) { + // to supports v1 + route = window.location.hash; + } } return this.strip_prefix(route); From d974fd8d4dac5b6ff397d9dc0f7a3f99f9b63cc3 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 16 Jul 2021 13:19:41 +0530 Subject: [PATCH 0422/1519] fix: Typo --- frappe/public/js/frappe/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index f5967c0826..8f8704713e 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -365,7 +365,7 @@ frappe.router = { if (!route) { route = window.location.pathname + window.location.hash + window.location.search; if (route.includes('app#')) { - // to supports v1 + // to support v1 route = window.location.hash; } } From b690374afeb17fda8230151370766b5488de054a Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Fri, 16 Jul 2021 21:58:20 +0530 Subject: [PATCH 0423/1519] fix: Trigger worklow action on update_after_submit event --- frappe/hooks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frappe/hooks.py b/frappe/hooks.py index ac42a03461..f3d25d6bf4 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -171,6 +171,9 @@ doc_events = { "frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions", "frappe.event_streaming.doctype.event_update_log.event_update_log.notify_consumers" ], + "on_update_after_submit": [ + "frappe.workflow.doctype.workflow_action.workflow_action.process_workflow_actions" + ], "on_change": [ "frappe.social.doctype.energy_point_rule.energy_point_rule.process_energy_points", "frappe.automation.doctype.milestone_tracker.milestone_tracker.evaluate_milestone" From 151678d71973d16916574f7e39d1fbb0fc815d79 Mon Sep 17 00:00:00 2001 From: GangaManoj Date: Sat, 17 Jul 2021 05:38:08 +0530 Subject: [PATCH 0424/1519] fix: Add test for checking workspaces with cards specific to a country --- .../desk/doctype/workspace/test_workspace.py | 92 ++++++++++++++++++- 1 file changed, 89 insertions(+), 3 deletions(-) diff --git a/frappe/desk/doctype/workspace/test_workspace.py b/frappe/desk/doctype/workspace/test_workspace.py index 619b3608eb..8aa3d57adf 100644 --- a/frappe/desk/doctype/workspace/test_workspace.py +++ b/frappe/desk/doctype/workspace/test_workspace.py @@ -1,8 +1,94 @@ # -*- coding: utf-8 -*- # Copyright (c) 2020, Frappe Technologies and Contributors # See license.txt -# import frappe +import frappe import unittest - class TestWorkspace(unittest.TestCase): - pass + def setUp(self): + create_module("Test Module") + + def tearDown(self): + frappe.db.delete("Workspace", {"module": "Test Module"}) + frappe.db.delete("DocType", {"module": "Test Module"}) + frappe.delete_doc("Module Def", "Test Module") + + def test_workspace_with_cards_specific_to_a_country(self): + workspace = create_workspace() + insert_card(workspace, "Card Label 1", "DocType 1", "DocType 2", "France") + insert_card(workspace, "Card Label 2", "DocType A", "DocType B") + + workspace.insert(ignore_if_duplicate = True) + + cards = workspace.get_link_groups() + + if frappe.get_system_settings('country') == "France": + self.assertEqual(len(cards), 2) + else: + self.assertEqual(len(cards), 1) + +def create_module(module_name): + module = frappe.get_doc({ + "doctype": "Module Def", + "module_name": module_name, + "app_name": "frappe" + }) + module.insert(ignore_if_duplicate = True) + + return module + +def create_workspace(**args): + workspace = frappe.new_doc("Workspace") + args = frappe._dict(args) + + workspace.name = args.name or "Test Workspace" + workspace.label = args.label or "Test Workspace" + workspace.category = args.category or "Modules" + workspace.is_standard = args.is_standard or 1 + workspace.module = "Test Module" + + return workspace + +def insert_card(workspace, card_label, doctype1, doctype2, country=None): + workspace.append("links", { + "type": "Card Break", + "label": card_label, + "only_for": country + }) + + create_doctype(doctype1, "Test Module") + workspace.append("links", { + "type": "Link", + "label": doctype1, + "only_for": country, + "link_type": "DocType", + "link_to": doctype1 + }) + + create_doctype(doctype2, "Test Module") + workspace.append("links", { + "type": "Link", + "label": doctype2, + "only_for": country, + "link_type": "DocType", + "link_to": doctype2 + }) + +def create_doctype(doctype_name, module): + frappe.get_doc({ + 'doctype': 'DocType', + 'name': doctype_name, + 'module': module, + 'custom': 1, + 'autoname': 'field:title', + 'fields': [ + {'label': 'Title', 'fieldname': 'title', 'reqd': 1, 'fieldtype': 'Data'}, + {'label': 'Description', 'fieldname': 'description', 'fieldtype': 'Small Text'}, + {'label': 'Date', 'fieldname': 'date', 'fieldtype': 'Date'}, + {'label': 'Duration', 'fieldname': 'duration', 'fieldtype': 'Duration'}, + {'label': 'Number', 'fieldname': 'number', 'fieldtype': 'Int'}, + {'label': 'Number', 'fieldname': 'another_number', 'fieldtype': 'Int'} + ], + 'permissions': [ + {'role': 'System Manager'} + ] + }).insert(ignore_if_duplicate = True) \ No newline at end of file From 33f8bfcaf29fc2d920ff5110a7b616e902afbcea Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Sun, 18 Jul 2021 17:46:16 +0530 Subject: [PATCH 0425/1519] fix: Add for update in nest set model updates --- frappe/utils/nestedset.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py index 3c024c40e4..b0657b1108 100644 --- a/frappe/utils/nestedset.py +++ b/frappe/utils/nestedset.py @@ -57,13 +57,14 @@ def update_add_node(doc, parent, parent_field): # get the last sibling of the parent if parent: - left, right = frappe.db.sql("select lft, rgt from `tab{0}` where name=%s" + left, right = frappe.db.sql("select lft, rgt from `tab{0}` where name=%s for update" .format(doctype), parent)[0] validate_loop(doc.doctype, doc.name, left, right) else: # root right = frappe.db.sql(""" SELECT COALESCE(MAX(rgt), 0) + 1 FROM `tab{0}` WHERE COALESCE(`{1}`, '') = '' + FOR UPDATE """.format(doctype, parent_field))[0][0] right = right or 1 @@ -89,7 +90,7 @@ def update_move_node(doc, parent_field): if parent: new_parent = frappe.db.sql("""select lft, rgt from `tab{0}` - where name = %s""".format(doc.doctype), parent, as_dict=1)[0] + where name = %s for update""".format(doc.doctype), parent, as_dict=1)[0] validate_loop(doc.doctype, doc.name, new_parent.lft, new_parent.rgt) @@ -108,7 +109,7 @@ def update_move_node(doc, parent_field): if parent: new_parent = frappe.db.sql("""select lft, rgt from `tab%s` - where name = %s""" % (doc.doctype, '%s'), parent, as_dict=1)[0] + where name = %s for update""" % (doc.doctype, '%s'), parent, as_dict=1)[0] # set parent lft, rgt @@ -128,7 +129,7 @@ def update_move_node(doc, parent_field): new_diff = new_parent.rgt - doc.lft else: # new root - max_rgt = frappe.db.sql("""select max(rgt) from `tab{0}`""".format(doc.doctype))[0][0] + max_rgt = frappe.db.sql("""select max(rgt) from `tab{0}` for update""".format(doc.doctype))[0][0] new_diff = max_rgt + 1 - doc.lft # bring back from dark side From 0c3e923e0fd1dbcab3a6493cea8fb8083bfc46b0 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 19 Jul 2021 10:49:44 +0530 Subject: [PATCH 0426/1519] fix: Remove for update flag from aggregate functions --- frappe/utils/nestedset.py | 1 - 1 file changed, 1 deletion(-) diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py index b0657b1108..75c1b0c2ae 100644 --- a/frappe/utils/nestedset.py +++ b/frappe/utils/nestedset.py @@ -64,7 +64,6 @@ def update_add_node(doc, parent, parent_field): right = frappe.db.sql(""" SELECT COALESCE(MAX(rgt), 0) + 1 FROM `tab{0}` WHERE COALESCE(`{1}`, '') = '' - FOR UPDATE """.format(doctype, parent_field))[0][0] right = right or 1 From f1f8678ee0c631b791e479de87909fdf2853c714 Mon Sep 17 00:00:00 2001 From: Deepesh Garg Date: Mon, 19 Jul 2021 10:54:22 +0530 Subject: [PATCH 0427/1519] fix: Remove for update flag from aggregate functions --- frappe/utils/nestedset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/utils/nestedset.py b/frappe/utils/nestedset.py index 75c1b0c2ae..4a65140449 100644 --- a/frappe/utils/nestedset.py +++ b/frappe/utils/nestedset.py @@ -128,7 +128,7 @@ def update_move_node(doc, parent_field): new_diff = new_parent.rgt - doc.lft else: # new root - max_rgt = frappe.db.sql("""select max(rgt) from `tab{0}` for update""".format(doc.doctype))[0][0] + max_rgt = frappe.db.sql("""select max(rgt) from `tab{0}`""".format(doc.doctype))[0][0] new_diff = max_rgt + 1 - doc.lft # bring back from dark side From 4a05697cfe061362f9c6d61047d6bfbda758f89f Mon Sep 17 00:00:00 2001 From: shariquerik Date: Mon, 19 Jul 2021 11:04:12 +0530 Subject: [PATCH 0428/1519] fix: Role based access to workspace --- frappe/boot.py | 4 +- frappe/desk/desktop.py | 81 ++++++++++--------- frappe/desk/doctype/workspace/workspace.json | 13 ++- frappe/desk/doctype/workspace/workspace.py | 44 ++++------ frappe/patches/v13_0/update_workspace2.py | 3 +- .../js/frappe/views/workspace/workspace.js | 50 ++++++++---- 6 files changed, 108 insertions(+), 87 deletions(-) diff --git a/frappe/boot.py b/frappe/boot.py index 1bcdca6a65..c46709d3d7 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -105,8 +105,8 @@ def load_conf_settings(bootinfo): if key in conf: bootinfo[key] = conf.get(key) def load_desktop_data(bootinfo): - from frappe.desk.doctype.workspace.workspace import get_pages - bootinfo.allowed_workspaces = get_pages().get('pages') + from frappe.desk.desktop import get_wspace_sidebar_items + bootinfo.allowed_workspaces = get_wspace_sidebar_items().get('pages') bootinfo.module_page_map = get_controller("Workspace").get_module_page_map() bootinfo.dashboards = frappe.get_all("Dashboard") diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index ac0db1b2d3..14b735db10 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -3,10 +3,10 @@ # Author - Shivam Mishra import frappe -import json from json import loads, dumps from frappe import _, DoesNotExistError, ValidationError, _dict from frappe.boot import get_allowed_pages, get_allowed_reports +from frappe.core.doctype.custom_role.custom_role import get_custom_allowed_roles from functools import wraps from frappe.cache_manager import ( build_domain_restriced_doctype_cache, @@ -35,13 +35,14 @@ class Workspace: self.extended_links = [] self.extended_charts = [] self.extended_shortcuts = [] + self.workspace_manager = "Workspace Manager" in frappe.get_roles() self.user = frappe.get_user() self.allowed_modules = self.get_cached('user_allowed_modules', self.get_allowed_modules) - self.doc = self.get_page_for_user() + self.doc = frappe.get_cached_doc("Workspace", self.page_name) - if self.doc.module and self.doc.module not in self.allowed_modules: + if self.doc and self.doc.module and self.doc.module not in self.allowed_modules and not self.workspace_manager: raise frappe.PermissionError self.can_read = self.get_cached('user_perm_can_read', self.get_can_read_items) @@ -58,8 +59,8 @@ class Workspace: self.restricted_pages = frappe.cache().get_value("domain_restricted_pages") or build_domain_restriced_page_cache() def is_page_allowed(self): - cards = self.doc.get_link_groups() + get_custom_reports_and_doctypes(self.doc.module) + self.extended_links - shortcuts = self.doc.shortcuts + self.extended_shortcuts + cards = self.doc.get_link_groups() + get_custom_reports_and_doctypes(self.doc.module) + shortcuts = self.doc.shortcuts for section in cards: links = loads(section.get('links')) if isinstance(section.get('links'), str) else section.get('links') @@ -77,8 +78,28 @@ class Workspace: if self.is_item_allowed(item.link_to, item.type) and _in_active_domains(item): return True + if not shortcuts and not self.doc.links: + return True + return False + def is_permitted(self): + """Returns true if Has Role is not set or the user is allowed.""" + from frappe.utils import has_common + + allowed = [d.role for d in frappe.get_all("Has Role", fields=["role"], filters={"parent": self.doc.name})] + + custom_roles = get_custom_allowed_roles('page', self.doc.name) + allowed.extend(custom_roles) + + if not allowed: + return True + + roles = frappe.get_roles() + + if has_common(roles, allowed): + return True + def get_cached(self, cache_key, fallback_fn): _cache = frappe.cache() @@ -104,24 +125,6 @@ class Workspace: return self.user.allow_modules - def get_page_for_user(self): - if self.public_page: - filters = { - 'label': self.page_name, - 'public': 1 - } - public_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if public_pages: - return frappe.get_cached_doc("Workspace", public_pages[0]) - - filters = { - 'label': self.page_title + "-" + frappe.session.user, - 'for_user': frappe.session.user - } - user_pages = frappe.get_all("Workspace", filters=filters, limit=1) - if user_pages: - return frappe.get_cached_doc("Workspace", user_pages[0]) - def get_onboarding_doc(self): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): @@ -372,39 +375,45 @@ def get_desktop_page(page): return {} @frappe.whitelist() -def get_desk_sidebar_items(): +def get_wspace_sidebar_items(): """Get list of sidebar items for desk""" + has_access = "Workspace Manager" in frappe.get_roles() # don't get domain restricted pages blocked_modules = frappe.get_doc('User', frappe.session.user).get_blocked_modules() + blocked_modules.append('Dummy Module') filters = { 'restrict_to_domain': ['in', frappe.get_active_domains()], - 'extends_another_page': 0, - 'for_user': '', 'module': ['not in', blocked_modules] } - if not frappe.local.conf.developer_mode: - filters['developer_mode_only'] = '0' + if has_access: + filters = [] - # pages sorted based on pinned to top and then by name - order_by = "pin_to_top desc, pin_to_bottom asc, name asc" - all_pages = frappe.get_all("Workspace", fields=["name", "title", "public", "module", "icon"], - filters=filters, order_by=order_by, ignore_permissions=True) + # pages sorted based on sequence id + order_by = "sequence_id asc" + fields = ["name", "title", "for_user", "parent_page", "content", "public", "module", "icon"] + all_pages = frappe.get_all("Workspace", fields=fields, filters=filters, order_by=order_by, ignore_permissions=True) pages = [] + private_pages = [] # Filter Page based on Permission for page in all_pages: try: wspace = Workspace(page) - if wspace.is_page_allowed(): - pages.append(page) + if wspace.is_permitted() and wspace.is_page_allowed() or has_access: + if page.public: + pages.append(page) + elif page.for_user == frappe.session.user: + private_pages.append(page) page['label'] = _(page.get('name')) except frappe.PermissionError: pass + if private_pages: + pages.extend(private_pages) - return pages + return {'pages': pages, 'has_access': has_access} def get_table_with_counts(): counts = frappe.cache().get_value("information_schema:counts") @@ -575,7 +584,7 @@ def clean_up(original_page, blocks): for wid in ['shortcut', 'card', 'chart']: # get list of widget's name from blocks - page_widgets[wid] = [x['data'][wid + '_name'] for x in json.loads(blocks) if x['type'] == wid] + page_widgets[wid] = [x['data'][wid + '_name'] for x in loads(blocks) if x['type'] == wid] # shortcut & chart cleanup for wid in ['shortcut', 'chart']: diff --git a/frappe/desk/doctype/workspace/workspace.json b/frappe/desk/doctype/workspace/workspace.json index b531274884..8d95c9987f 100644 --- a/frappe/desk/doctype/workspace/workspace.json +++ b/frappe/desk/doctype/workspace/workspace.json @@ -38,7 +38,8 @@ "shortcuts", "section_break_18", "cards_label", - "links" + "links", + "roles" ], "fields": [ { @@ -252,10 +253,16 @@ "fieldname": "sequence_id", "fieldtype": "Int", "label": "Sequence Id" + }, + { + "fieldname": "roles", + "fieldtype": "Table", + "label": "Roles", + "options": "Has Role" } ], "links": [], - "modified": "2021-07-05 17:41:36.272294", + "modified": "2021-07-15 14:20:37.623926", "modified_by": "Administrator", "module": "Desk", "name": "Workspace", @@ -269,7 +276,7 @@ "print": 1, "read": 1, "report": 1, - "role": "System Manager", + "role": "Workspace Manager", "share": 1, "write": 1 }, diff --git a/frappe/desk/doctype/workspace/workspace.py b/frappe/desk/doctype/workspace/workspace.py index 93a7b13d17..2305155592 100644 --- a/frappe/desk/doctype/workspace/workspace.py +++ b/frappe/desk/doctype/workspace/workspace.py @@ -3,7 +3,6 @@ # For license information, please see license.txt import frappe -import json from frappe import _ from frappe.modules.export_file import export_to_files from frappe.model.document import Document @@ -26,8 +25,8 @@ class Workspace(Document): frappe.throw(_("You can only have one default page that extends a particular standard page.")) def on_update(self): - # if disable_saving_as_standard(): - # return + if disable_saving_as_standard(): + return if frappe.conf.developer_mode and self.module and self.public: export_to_files(record_list=[['Workspace', self.name]], record_module=self.module) @@ -159,20 +158,7 @@ def get_report_type(report): @frappe.whitelist() -def get_pages(): - has_access = "System Manager" in frappe.get_roles() - fields = ['name', 'title', 'icon', 'public', 'parent_page', 'content'] - - pages = get_page_list(fields, {'public': 1}) - private_pages = get_page_list(fields, {'for_user': frappe.session.user}) - - if private_pages: - pages.extend(private_pages) - - return {'pages': pages, 'has_access': has_access} - -@frappe.whitelist() -def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, blocks, save): +def save_page(title, parent, public, sb_public_items, sb_private_items, deleted_pages, new_widgets, blocks, save): save = frappe.parse_json(save) public = frappe.parse_json(public) if save: @@ -206,20 +192,20 @@ def save_page(title, parent, public, sb_items, deleted_pages, new_widgets, block doc.content = blocks doc.save(ignore_permissions=True) - if json.loads(new_widgets): + if loads(new_widgets): save_new_widget(doc, title, blocks, new_widgets) - if json.loads(sb_items): - sort_pages(json.loads(sb_items)) + if loads(sb_public_items) or loads(sb_private_items): + sort_pages(loads(sb_public_items), loads(sb_private_items)) - if json.loads(deleted_pages): - return delete_pages(json.loads(deleted_pages)) + if loads(deleted_pages): + return delete_pages(loads(deleted_pages)) return {"name": title, "public": public} def delete_pages(deleted_pages): for page in deleted_pages: - if page.get("public") and "System Manager" not in frappe.get_roles(): + if page.get("public") and "Workspace Manager" not in frappe.get_roles(): return {"name": page.get("title"), "public": 1} if frappe.db.exists("Workspace", page.get("name")): @@ -227,17 +213,15 @@ def delete_pages(deleted_pages): return {"name": "Home", "public": 1} -def sort_pages(sb_items): - public_pages = [page for page in sb_items if page.get('public')=='1'] - private_pages = [page for page in sb_items if page.get('public')=='0'] - +def sort_pages(sb_public_items, sb_private_items): wspace_public_pages = get_page_list(['name', 'title'], {'public': 1}) wspace_private_pages = get_page_list(['name', 'title'], {'for_user': frappe.session.user}) - sort_page(wspace_private_pages, private_pages) + if sb_private_items: + sort_page(wspace_private_pages, sb_private_items) - if "System Manager" in frappe.get_roles(): - sort_page(wspace_public_pages, public_pages) + if sb_public_items and "Workspace Manager" in frappe.get_roles(): + sort_page(wspace_public_pages, sb_public_items) def sort_page(wspace_pages, pages): for seq, d in enumerate(pages): diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 3561a8ff3e..53abe2994b 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -24,7 +24,8 @@ def create_content(doc): del doc.charts[doc.charts.index(l)] if doc.shortcuts: invalid_links = [] - content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) + if doc.charts: + content.append({"type":"spacer","data":{"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) content.append({"type":"header","data":{"text":doc.shortcuts_label or _("Your Shortcuts"),"level":4,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) for s in doc.shortcuts: if s.get_invalid_links()[0]: diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index c65c8aa232..512a56c1d1 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -22,7 +22,8 @@ frappe.views.Workspace = class Workspace { this.page = wrapper.page; this.isReadOnly = true; this.new_page = null; - this.sorted_sidebar_items = []; + this.sorted_public_items = []; + this.sorted_private_items = []; this.deleted_sidebar_items = []; this.current_page = {}; this.sidebar_items = { @@ -30,8 +31,8 @@ frappe.views.Workspace = class Workspace { 'private': {} }; this.sidebar_categories = [ - "Public", - frappe.user.first_name() + 'Public', + frappe.user.first_name() || 'Private' ]; this.tools = { header: { @@ -113,7 +114,7 @@ frappe.views.Workspace = class Workspace { } get_pages() { - return frappe.xcall("frappe.desk.doctype.workspace.workspace.get_pages"); + return frappe.xcall("frappe.desk.desktop.get_wspace_sidebar_items"); } sidebar_item_container(item) { @@ -124,7 +125,7 @@ frappe.views.Workspace = class Workspace { href="/app/${item.public ? frappe.router.slug(item.title) : 'private/'+frappe.router.slug(item.title) }" class="item-anchor ${item.is_editable ? "" : "block-click" }" title="${item.title}" > - ${frappe.utils.icon(item.icon || "folder-normal", "md")} + ${frappe.utils.icon(item.icon || "folder-normal", "md")} ${item.title}
    @@ -146,7 +147,9 @@ frappe.views.Workspace = class Workspace { this.build_sidebar_section(category, root_pages); }); - this.sidebar.find('.selected')[0].scrollIntoView(); + // Scroll sidebar to selected page if it is not in viewport. + !frappe.dom.is_element_in_viewport(this.sidebar.find('.selected')) + && this.sidebar.find('.selected')[0].scrollIntoView(); } build_sidebar_section(title, root_pages) { @@ -448,26 +451,36 @@ frappe.views.Workspace = class Workspace { animation: 150, fallbackOnBody: true, swapThreshold: 0.65, - onEnd: function () { - me.prepare_sorted_sidebar(); + onEnd: function (evt) { + let is_public = $(evt.item).attr('item-public') == '1'; + me.prepare_sorted_sidebar(is_public); } }); }); } - prepare_sorted_sidebar() { - this.sorted_sidebar_items = []; - for (let page of $('.standard-sidebar-section').find('.sidebar-item-container')) { + prepare_sorted_sidebar(is_public) { + if (is_public) { + this.sorted_public_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').first()); + } else { + this.sorted_private_items = this.sort_sidebar(this.sidebar.find('.standard-sidebar-section').last()); + } + } + + sort_sidebar($sidebar_section) { + let sorted_items = []; + for (let page of $sidebar_section.find('.sidebar-item-container')) { let parent_page = ""; if (page.closest('.nested-container').classList.contains('sidebar-child-item')) { parent_page = page.parentElement.parentElement.attributes["item-name"].value; } - this.sorted_sidebar_items.push({ + sorted_items.push({ title: page.attributes['item-name'].value, parent_page: parent_page, public: page.attributes['item-public'].value }); } + return sorted_items; } make_blocks_sortable() { @@ -542,11 +555,16 @@ frappe.views.Workspace = class Workspace { this.show_sidebar_actions(); this.make_sidebar_sortable(); this.make_blocks_sortable(); - this.prepare_sorted_sidebar(); + this.prepare_sorted_sidebar(values.is_public); }); } }); d.show(); + + // to enable focusing on input field when modal is open. + d.$wrapper.on('shown.bs.modal', function() { + $(document).off('focusin.modal'); + }); } validate_page(values) { @@ -652,7 +670,8 @@ frappe.views.Workspace = class Workspace { title: me.title, parent: me.parent || '', public: me.public || 0, - sb_items: me.sorted_sidebar_items, + sb_public_items: me.sorted_public_items, + sb_private_items: me.sorted_private_items, deleted_pages: me.deleted_sidebar_items, new_widgets: new_widgets, blocks: JSON.stringify(outputData.blocks), @@ -666,7 +685,8 @@ frappe.views.Workspace = class Workspace { me.title = ''; me.parent = ''; me.public = false; - me.sorted_sidebar_items = []; + me.sorted_public_items = []; + me.sorted_private_items = []; me.deleted_sidebar_items = []; me.reload(); } From 9b437f8c90b3a7ca955f5f0c168bf8001d8e2975 Mon Sep 17 00:00:00 2001 From: leela Date: Mon, 19 Jul 2021 12:18:25 +0530 Subject: [PATCH 0429/1519] feat: Add rq users --- frappe/commands/__init__.py | 4 +- frappe/commands/redis.py | 48 ++++++++++++++++++++ frappe/utils/__init__.py | 6 +++ frappe/utils/rq.py | 87 +++++++++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 frappe/commands/redis.py create mode 100644 frappe/utils/rq.py diff --git a/frappe/commands/__init__.py b/frappe/commands/__init__.py index be9d107025..9ed333d034 100644 --- a/frappe/commands/__init__.py +++ b/frappe/commands/__init__.py @@ -102,7 +102,9 @@ def get_commands(): from .site import commands as site_commands from .translate import commands as translate_commands from .utils import commands as utils_commands + from .redis import commands as redis_commands - return list(set(scheduler_commands + site_commands + translate_commands + utils_commands)) + all_commands = scheduler_commands + site_commands + translate_commands + utils_commands + redis_commands + return list(set(all_commands)) commands = get_commands() diff --git a/frappe/commands/redis.py b/frappe/commands/redis.py new file mode 100644 index 0000000000..c608296cac --- /dev/null +++ b/frappe/commands/redis.py @@ -0,0 +1,48 @@ +import os + +import click +import redis + +import frappe +from frappe.utils.rq import RedisQueue +from frappe.installer import update_site_config + +@click.command('create-rq-users') +@click.option('--set-admin-password', is_flag=True, default=False, help='Set new Redis admin(default user) password') +@click.option('--reset-passwords', is_flag=True, default=False, help='Remove all existing passwords') +def create_rq_users(set_admin_password=False, reset_passwords=False): + """Create Redis Queue users and add to acl and app configs. + + acl config file will be used by redis server while starting the server + and app config is used by app while connecting to redis server. + """ + acl_file_path = os.path.abspath('../config/redis_queue.acl') + acl_list, user_credentials = RedisQueue.gen_acl_list( + reset_passwords=reset_passwords, set_admin_password=set_admin_password) + + with open(acl_file_path, 'w') as f: + f.writelines([acl+'\n' for acl in acl_list]) + + sites_path = os.getcwd() + common_site_config_path = os.path.join(sites_path, 'common_site_config.json') + update_site_config("rq_username", user_credentials['bench'][0], validate=False, + site_config_path=common_site_config_path) + update_site_config("rq_password", user_credentials['bench'][1], validate=False, + site_config_path=common_site_config_path) + + if set_admin_password: + env_key = 'RQ_ADMIN_PASWORD' + click.secho('Redis admin password is successfully set up. ' + 'Include below line in .bashrc file for system to use', + fg='green' + ) + click.secho(f"`export {env_key}={user_credentials['default'][1]}`") + click.secho('NOTE: Please save the admin password as you ' + 'can not access redis server without the password', + fg='yellow' + ) + + +commands = [ + create_rq_users +] diff --git a/frappe/utils/__init__.py b/frappe/utils/__init__.py index af9d5de1ee..bf139173d6 100644 --- a/frappe/utils/__init__.py +++ b/frappe/utils/__init__.py @@ -383,6 +383,12 @@ def get_files_path(*path, **kwargs): def get_bench_path(): return os.path.realpath(os.path.join(os.path.dirname(frappe.__file__), '..', '..', '..')) +def get_bench_id(): + return frappe.local.conf.get('bench_id', 'DefaultBench') + +def get_site_id(site=None): + return f"{site or frappe.local.site}@{get_bench_id()}" + def get_backups_path(): return get_site_path("private", "backups") diff --git a/frappe/utils/rq.py b/frappe/utils/rq.py new file mode 100644 index 0000000000..5e9b9dcd5d --- /dev/null +++ b/frappe/utils/rq.py @@ -0,0 +1,87 @@ +import redis + +import frappe +from frappe.utils import get_site_id, get_bench_id, random_string + + +class RedisQueue: + def __init__(self, conn): + self.conn = conn + + def add_user(self, username, password=None): + """Create or update the user. + """ + password = password or self.conn.acl_genpass() + user_settings = self.get_new_user_settings(username, password) + is_created = self.conn.acl_setuser(**user_settings) + return frappe._dict(user_settings) if is_created else {} + + @classmethod + def get_connection(cls, username='default', password=None): + domain = frappe.local.conf.redis_queue.split("redis://", 1)[-1] + url = f"redis://{username}:{password or ''}@{domain}" + conn = redis.from_url(url) + conn.ping() + return conn + + @classmethod + def new(cls, username='default', password=None): + return cls(cls.get_connection(username, password)) + + @classmethod + def set_admin_password(cls, cur_password=None, new_password=None, reset_passwords=False): + username = 'default' + conn = cls.get_connection(username, cur_password) + password = '+'+(new_password or conn.acl_genpass()) + conn.acl_setuser( + username=username, enabled=True, reset_passwords=reset_passwords, passwords=password + ) + return password[1:] + + @classmethod + def get_new_user_settings(cls, username, password): + d = {} + d['username'] = username + d['passwords'] = '+'+password + d['reset_keys'] = True + d['enabled'] = True + d['keys'] = cls.get_acl_key_rules() + d['commands'] = cls.get_acl_command_rules() + return d + + @classmethod + def get_acl_key_rules(cls, include_key_prefix=False): + """FIXME: Find better way + """ + rules = ['rq:[^q]*', 'rq:queues', f'rq:queue:{get_bench_id()}:*'] + if include_key_prefix: + return ['~'+pattern for pattern in rules] + return rules + + @classmethod + def get_acl_command_rules(cls): + return ['+@all', '-@admin'] + + @classmethod + def gen_acl_list(cls, reset_passwords=False, set_admin_password=False): + """Generate list of ACL users needed for this branch. + + This list contains default ACL user and the bench ACL user(used by all sites incase of ACL is enabled). + """ + with frappe.init_site(): + bench_username = get_bench_id() + bench_user_rules = cls.get_acl_key_rules(include_key_prefix=True) + cls.get_acl_command_rules() + + bench_user_rule_str = ' '.join(bench_user_rules).strip() + bench_user_password = random_string(20) + bench_user_resetpass = (reset_passwords and 'resetpass') or '' + + default_username = 'default' + _default_user_password = random_string(20) if set_admin_password else '' + default_user_password = '>'+_default_user_password if _default_user_password else 'nopass' + default_user_resetpass = (reset_passwords and set_admin_password and 'resetpass') or '' + + return [ + f'user {default_username} on {default_user_password} {default_user_resetpass} ~* &* +@all', + f'user {bench_username} on >{bench_user_password} {bench_user_resetpass} {bench_user_rule_str}' + ], {'bench': (bench_username, bench_user_password), 'default': (default_username, _default_user_password)} From cd499af6b28ef18dbe664ba757240ddfcf46d244 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 20 Jul 2021 08:43:42 +0530 Subject: [PATCH 0430/1519] fix: Move layout colors to common css_variables.scss - Layout colors are used by website as well --- frappe/public/scss/common/css_variables.scss | 11 +++++++++++ frappe/public/scss/desk/css_variables.scss | 15 +-------------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/frappe/public/scss/common/css_variables.scss b/frappe/public/scss/common/css_variables.scss index 48a8a48f5f..112238bfe5 100644 --- a/frappe/public/scss/common/css_variables.scss +++ b/frappe/public/scss/common/css_variables.scss @@ -179,9 +179,20 @@ --text-on-pink: var(--pink-500); --text-on-cyan: var(--cyan-600); + // Layout Colors + --bg-color: var(--gray-50); + --fg-color: white; + --navbar-bg: white; + --fg-hover-color: var(--gray-100); + --card-bg: var(--fg-color); + --disabled-text-color: var(--gray-700); --disabled-control-bg: var(--gray-50); --control-bg: var(--gray-100); --control-bg-on-gray: var(--gray-200); + --awesomebar-focus-bg: var(--fg-color); + --modal-bg: white; + --toast-bg: var(--modal-bg); + --popover-bg: white; --awesomplete-hover-bg: var(--control-bg); diff --git a/frappe/public/scss/desk/css_variables.scss b/frappe/public/scss/desk/css_variables.scss index 5bb2614dcc..282e21433b 100644 --- a/frappe/public/scss/desk/css_variables.scss +++ b/frappe/public/scss/desk/css_variables.scss @@ -25,20 +25,7 @@ $input-height: 28px !default; --navbar-height: 60px; - // Layout Colors - --bg-color: var(--gray-50); - --fg-color: white; - --navbar-bg: white; - --fg-hover-color: var(--gray-100); - --card-bg: var(--fg-color); - --disabled-text-color: var(--gray-700); - --disabled-control-bg: var(--gray-50); - --control-bg: var(--gray-100); - --control-bg-on-gray: var(--gray-200); - --awesomebar-focus-bg: var(--fg-color); - --modal-bg: white; - --toast-bg: var(--modal-bg); - --popover-bg: white; + --appreciation-color: var(--dark-green-600); --appreciation-bg: var(--dark-green-100); From 2a9b9875f904804df6663e78416d4eee7890bd03 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 20 Jul 2021 10:11:45 +0530 Subject: [PATCH 0431/1519] fix: Make pad only after dom is ready - Signature control used to break on first form load --- frappe/public/js/frappe/form/controls/signature.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/form/controls/signature.js b/frappe/public/js/frappe/form/controls/signature.js index bcbdfa0d27..445f5b7b3b 100644 --- a/frappe/public/js/frappe/form/controls/signature.js +++ b/frappe/public/js/frappe/form/controls/signature.js @@ -53,13 +53,15 @@ frappe.ui.form.ControlSignature = class ControlSignature extends frappe.ui.form. this.img = $("") .appendTo(this.img_wrapper).toggle(false); } - refresh_input(e) { + refresh_input() { + // signature dom is not ready + if (!this.body) return; // prevent to load the second time this.make_pad(); this.$wrapper.find(".control-input").toggle(false); this.set_editable(this.get_status()=="Write"); this.load_pad(); - if(this.get_status()=="Read") { + if (this.get_status() == "Read") { $(this.disp_area).toggle(false); } } From 1e1f9115402f99e7ec25b7f07f867b7aebf6327b Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 20 Jul 2021 15:00:07 +0530 Subject: [PATCH 0432/1519] fix: Use 1em margin for p outside container Revert https://github.com/frappe/frappe/commit/397848f9f7f692c3b8ac43efbc85b231ac32cb08#diff-cad6d40df66d9378e252342fe4148d3f8114a3c361dffd048fc3b09d5d9024b3R39 --- frappe/public/scss/email.bundle.scss | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/public/scss/email.bundle.scss b/frappe/public/scss/email.bundle.scss index b1a8d6c485..9b58c130a2 100644 --- a/frappe/public/scss/email.bundle.scss +++ b/frappe/public/scss/email.bundle.scss @@ -36,7 +36,13 @@ a { } p { - margin: 5px 0 !important; + margin: 1em 0 !important; +} + +.with-container { + p { + margin: 5px 0 !important; + } } .ql-editor { From e1c78bb9b357ba6b3c601dc595a8e6836e5571c6 Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Tue, 20 Jul 2021 15:21:22 +0530 Subject: [PATCH 0433/1519] test: Update test --- frappe/email/test_email_body.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/email/test_email_body.py b/frappe/email/test_email_body.py index 8e637273ed..2c7d119fce 100644 --- a/frappe/email/test_email_body.py +++ b/frappe/email/test_email_body.py @@ -127,7 +127,7 @@ w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ''' transformed_html = '''

    Hi John

    -

    This is a test email

    +

    This is a test email

    ''' self.assertTrue(transformed_html in inline_style_in_html(html)) From 8739b5e3add42abb47893d013f4700ef4dbc82b2 Mon Sep 17 00:00:00 2001 From: shariquerik Date: Tue, 20 Jul 2021 16:33:13 +0530 Subject: [PATCH 0434/1519] fix: Added Onboarding Block --- frappe/desk/desktop.py | 47 ++++--- .../onboarding_step/onboarding_step.py | 18 ++- frappe/patches/v13_0/update_workspace2.py | 3 +- .../js/frappe/views/workspace/blocks/index.js | 2 + .../views/workspace/blocks/onboarding.js | 128 ++++++++++++++++++ .../js/frappe/views/workspace/workspace.js | 7 + .../public/js/frappe/widgets/base_widget.js | 6 +- .../js/frappe/widgets/onboarding_widget.js | 49 ++++++- .../public/js/frappe/widgets/widget_dialog.js | 19 +++ 9 files changed, 254 insertions(+), 25 deletions(-) create mode 100644 frappe/public/js/frappe/views/workspace/blocks/onboarding.js diff --git a/frappe/desk/desktop.py b/frappe/desk/desktop.py index 14b735db10..e2bc851aad 100644 --- a/frappe/desk/desktop.py +++ b/frappe/desk/desktop.py @@ -51,8 +51,9 @@ class Workspace: self.allowed_reports = get_allowed_reports(cache=True) if not minimal: - self.onboarding_doc = self.get_onboarding_doc() - self.onboarding = None + if self.doc.content: + self.onboarding_list = [x['data']['onboarding_name'] for x in loads(self.doc.content) if x['type'] == 'onboarding'] + self.onboardings = [] self.table_counts = get_table_with_counts() self.restricted_doctypes = frappe.cache().get_value("domain_restricted_doctypes") or build_domain_restriced_doctype_cache() @@ -125,18 +126,18 @@ class Workspace: return self.user.allow_modules - def get_onboarding_doc(self): + def get_onboarding_doc(self, onboarding): # Check if onboarding is enabled if not frappe.get_system_settings("enable_onboarding"): return None - if not self.doc.onboarding: + if not self.onboarding_list: return None - if frappe.db.get_value("Module Onboarding", self.doc.onboarding, "is_complete"): + if frappe.db.get_value("Module Onboarding", onboarding, "is_complete"): return None - doc = frappe.get_doc("Module Onboarding", self.doc.onboarding) + doc = frappe.get_doc("Module Onboarding", onboarding) # Check if user is allowed allowed_roles = set(doc.get_allowed_roles()) @@ -200,14 +201,9 @@ class Workspace: 'items': self.get_shortcuts() } - if self.onboarding_doc: - self.onboarding = { - 'label': _(self.onboarding_doc.title), - 'subtitle': _(self.onboarding_doc.subtitle), - 'success': _(self.onboarding_doc.success_message), - 'docs_url': self.onboarding_doc.documentation_url, - 'items': self.get_onboarding_steps() - } + self.onboardings = { + 'items': self.get_onboardings() + } def _doctype_contains_a_record(self, name): exists = self.table_counts.get(name, False) @@ -336,9 +332,26 @@ class Workspace: return items @handle_not_exist - def get_onboarding_steps(self): + def get_onboardings(self): + if self.onboarding_list: + for onboarding in self.onboarding_list: + onboarding_doc = self.get_onboarding_doc(onboarding) + if onboarding_doc: + item = { + 'label': _(onboarding), + 'title': _(onboarding_doc.title), + 'subtitle': _(onboarding_doc.subtitle), + 'success': _(onboarding_doc.success_message), + 'docs_url': onboarding_doc.documentation_url, + 'items': self.get_onboarding_steps(onboarding_doc) + } + self.onboardings.append(item) + return self.onboardings + + @handle_not_exist + def get_onboarding_steps(self, onboarding_doc): steps = [] - for doc in self.onboarding_doc.get_steps(): + for doc in onboarding_doc.get_steps(): step = doc.as_dict().copy() step.label = _(doc.title) if step.action == "Create Entry": @@ -367,7 +380,7 @@ def get_desktop_page(page): 'charts': wspace.charts, 'shortcuts': wspace.shortcuts, 'cards': wspace.cards, - 'onboarding': wspace.onboarding, + 'onboardings': wspace.onboardings, 'allow_customization': not wspace.doc.disable_user_customization } except DoesNotExistError: diff --git a/frappe/desk/doctype/onboarding_step/onboarding_step.py b/frappe/desk/doctype/onboarding_step/onboarding_step.py index 10bd8926ce..2336ff52f8 100644 --- a/frappe/desk/doctype/onboarding_step/onboarding_step.py +++ b/frappe/desk/doctype/onboarding_step/onboarding_step.py @@ -2,10 +2,26 @@ # Copyright (c) 2020, Frappe Technologies and contributors # For license information, please see license.txt -# import frappe +import frappe +from frappe import _ +import json from frappe.model.document import Document class OnboardingStep(Document): def before_export(self, doc): doc.is_complete = 0 doc.is_skipped = 0 + + +@frappe.whitelist() +def get_onboarding_steps(ob_steps): + steps = [] + for s in json.loads(ob_steps): + doc = frappe.get_doc('Onboarding Step', s.get('step')) + step = doc.as_dict().copy() + step.label = _(doc.title) + if step.action == "Create Entry": + step.is_submittable = frappe.db.get_value("DocType", step.reference_document, 'is_submittable', cache=True) + steps.append(step) + + return steps diff --git a/frappe/patches/v13_0/update_workspace2.py b/frappe/patches/v13_0/update_workspace2.py index 53abe2994b..f5f54fc7ee 100644 --- a/frappe/patches/v13_0/update_workspace2.py +++ b/frappe/patches/v13_0/update_workspace2.py @@ -13,6 +13,8 @@ def execute(): def create_content(doc): content = [] + if doc.onboarding: + content.append({"type":"onboarding","data":{"onboarding_name":doc.onboarding,"col":12,"pt":0,"pr":0,"pb":0,"pl":0}}) if doc.charts: invalid_links = [] for c in doc.charts: @@ -55,7 +57,6 @@ def update_wspace(doc, seq, content): doc.title = doc.extends doc.extends = '' doc.category = '' - doc.restrict_to_domain = '' doc.onboarding = '' doc.extends_another_page = 0 doc.is_default = 0 diff --git a/frappe/public/js/frappe/views/workspace/blocks/index.js b/frappe/public/js/frappe/views/workspace/blocks/index.js index d8b303133f..00a9b8c83a 100644 --- a/frappe/public/js/frappe/views/workspace/blocks/index.js +++ b/frappe/public/js/frappe/views/workspace/blocks/index.js @@ -5,6 +5,7 @@ import Card from "./card"; import Chart from "./chart"; import Shortcut from "./shortcut"; import Spacer from "./spacer"; +import Onboarding from "./onboarding"; // import tunes import SpacingTune from "./spacing_tune"; @@ -18,6 +19,7 @@ frappe.wspace_block.blocks = { chart: Chart, shortcut: Shortcut, spacer: Spacer, + onboarding: Onboarding, }; frappe.wspace_block.tunes = { diff --git a/frappe/public/js/frappe/views/workspace/blocks/onboarding.js b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js new file mode 100644 index 0000000000..8c8892c903 --- /dev/null +++ b/frappe/public/js/frappe/views/workspace/blocks/onboarding.js @@ -0,0 +1,128 @@ +import get_dialog_constructor from "../../../widgets/widget_dialog.js"; +import Block from "./block.js"; +export default class Onboarding extends Block { + static get toolbox() { + return { + title: 'Onboarding', + icon: '' + }; + } + + static get isReadOnlySupported() { + return true; + } + + constructor({ data, api, config, readOnly, block }) { + super({ data, api, config, readOnly, block }); + this.col = this.data.col ? this.data.col : "12"; + this.pt = this.data.pt ? this.data.pt : "0"; + this.pr = this.data.pr ? this.data.pr : "0"; + this.pb = this.data.pb ? this.data.pb : "0"; + this.pl = this.data.pl ? this.data.pl : "0"; + this.allow_customization = !this.readOnly; + this.options = { + allow_sorting: this.allow_customization, + allow_create: this.allow_customization, + allow_delete: this.allow_customization, + allow_hiding: false, + allow_edit: true + }; + } + + new(block, widget_type = block) { + const dialog_class = get_dialog_constructor(widget_type); + let block_name = block+'_name'; + this.dialog = new dialog_class({ + label: this.label, + type: widget_type, + primary_action: (widget) => { + widget.in_customize_mode = 1; + this.block_widget = frappe.widget.make_widget({ + ...widget, + widget_type: widget_type, + container: this.wrapper, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + }, + new: true + }); + this.block_widget.customize(this.options); + this.wrapper.setAttribute(block_name, this.block_widget.label || this.block_widget.onboarding_name); + this.new_block_widget = this.block_widget.get_config(); + this.add_tune_button(); + }, + }); + + if (!this.readOnly && this.data && !this.data[block_name]) { + this.dialog.make(); + } + } + + make(block, block_name) { + let block_data = this.config.page_data['onboardings'].items.find(obj => { + return obj.label == block_name; + }); + if (!block_data) return false; + this.wrapper.innerHTML = ''; + block_data.in_customize_mode = !this.readOnly; + this.block_widget = frappe.widget.make_widget({ + container: this.wrapper, + widget_type: 'onboarding', + in_customize_mode: block_data.in_customize_mode, + options: { + ...this.options, + on_delete: () => this.api.blocks.delete(), + on_edit: () => this.on_edit(this.block_widget) + }, + label: block_data.label, + title: block_data.title || __("Let's Get Started"), + subtitle: block_data.subtitle, + steps: block_data.items, + success: block_data.success, + docs_url: block_data.docs_url, + user_can_dismiss: block_data.user_can_dismiss, + }); + this.wrapper.setAttribute(block+'_name', block_name); + if (!this.readOnly) { + this.block_widget.customize(this.options); + } + return true; + } + + render() { + this.wrapper = document.createElement('div'); + this.new('onboarding'); + + if (this.data && this.data.onboarding_name) { + let has_data = this.make('onboarding', this.data.onboarding_name); + if (!has_data) return; + } + + if (!this.readOnly) { + this.add_tune_button(); + } + return this.wrapper; + } + + validate(savedData) { + if (!savedData.onboarding_name) { + return false; + } + + return true; + } + + save(blockContent) { + return { + onboarding_name: blockContent.getAttribute('onboarding_name'), + col: this.get_col(), + pt: this.get_padding("t"), + pr: this.get_padding("r"), + pb: this.get_padding("b"), + pl: this.get_padding("l"), + new: this.new_block_widget + }; + } +} \ No newline at end of file diff --git a/frappe/public/js/frappe/views/workspace/workspace.js b/frappe/public/js/frappe/views/workspace/workspace.js index 512a56c1d1..14540e5111 100644 --- a/frappe/public/js/frappe/views/workspace/workspace.js +++ b/frappe/public/js/frappe/views/workspace/workspace.js @@ -61,6 +61,12 @@ frappe.views.Workspace = class Workspace { page_data: this.page_data || [] } }, + onboarding: { + class: frappe.wspace_block.blocks['onboarding'], + config: { + page_data: this.page_data || [] + } + }, spacer: frappe.wspace_block.blocks['spacer'], spacingTune: frappe.wspace_block.tunes['spacing_tune'], }; @@ -323,6 +329,7 @@ frappe.views.Workspace = class Workspace { this.editor.configuration.tools.chart.config.page_data = this.page_data; this.editor.configuration.tools.shortcut.config.page_data = this.page_data; this.editor.configuration.tools.card.config.page_data = this.page_data; + this.editor.configuration.tools.onboarding.config.page_data = this.page_data; this.editor.render({ blocks: this.content || [] }); }); } else { diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index 90a2c1e641..bfb0371bd3 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -127,7 +127,7 @@ export default class Widget { } set_title(max_chars) { - let base = this.label || this.name; + let base = this.title || this.label || this.name; let title = max_chars ? frappe.ellipsis(base, max_chars) : base; if (this.icon) { @@ -136,7 +136,7 @@ export default class Widget { } else { this.title_field[0].innerHTML = title; if (max_chars) { - this.title_field[0].setAttribute('title', this.label); + this.title_field[0].setAttribute('title', this.title || this.label); } } this.subtitle && this.subtitle_field.html(this.subtitle); @@ -169,7 +169,7 @@ export default class Widget { primary_action: (data) => { Object.assign(this, data); data.name = this.name; - + this.new = true; this.refresh(); this.options.on_edit && this.options.on_edit(data); }, diff --git a/frappe/public/js/frappe/widgets/onboarding_widget.js b/frappe/public/js/frappe/widgets/onboarding_widget.js index b487c0134f..259bf9bc69 100644 --- a/frappe/public/js/frappe/widgets/onboarding_widget.js +++ b/frappe/public/js/frappe/widgets/onboarding_widget.js @@ -3,7 +3,23 @@ import Widget from "./base_widget.js"; frappe.provide("frappe.utils"); export default class OnboardingWidget extends Widget { + + async refresh() { + this.new && await this.get_onboarding_data(); + this.set_title(); + this.set_actions(); + this.set_body(); + this.setup_events(); + } + + get_config() { + return { + label: this.onboarding_name + }; + } + make_body() { + this.body.empty(); this.steps_wrapper = $(`
    `).appendTo(this.body); this.step_preview = $(`
    @@ -477,11 +493,13 @@ export default class OnboardingWidget extends Widget { } is_dismissed() { + if (this.in_customize_mode) return false; + let dismissed = JSON.parse( localStorage.getItem("dismissed-onboarding") || "{}" ); - if (Object.keys(dismissed).includes(this.label)) { - let last_hidden = new Date(dismissed[this.label]); + if (Object.keys(dismissed).includes(this.title)) { + let last_hidden = new Date(dismissed[this.title]); let today = new Date(); let diff = frappe.datetime.get_hour_diff(today, last_hidden); return diff < 24; @@ -490,6 +508,8 @@ export default class OnboardingWidget extends Widget { } set_actions() { + if (this.in_customize_mode) return; + this.action_area.empty(); const dismiss = $( `
    ${__('Dismiss', null, 'Stop showing the onboarding widget.')}
    ` @@ -498,7 +518,7 @@ export default class OnboardingWidget extends Widget { let dismissed = JSON.parse( localStorage.getItem("dismissed-onboarding") || "{}" ); - dismissed[this.label] = frappe.datetime.now_datetime(); + dismissed[this.title] = frappe.datetime.now_datetime(); localStorage.setItem( "dismissed-onboarding", @@ -508,4 +528,27 @@ export default class OnboardingWidget extends Widget { }); dismiss.appendTo(this.action_area); } + + get_onboarding_data() { + return frappe.model + .with_doc("Module Onboarding", this.onboarding_name) + .then(onboarding_doc => { + if (onboarding_doc) { + this.onboarding_doc = onboarding_doc; + this.label = onboarding_doc.label; + this.title = onboarding_doc.title || __("Let's Get Started"); + this.subtitle = onboarding_doc.subtitle; + this.success = onboarding_doc.success; + this.docs_url = onboarding_doc.docs_url; + this.user_can_dismiss = onboarding_doc.user_can_dismiss; + const method = + "frappe.desk.doctype.onboarding_step.onboarding_step.get_onboarding_steps"; + return frappe + .xcall(method, { ob_steps: onboarding_doc.steps }) + .then(steps => { + this.steps = steps; + }); + } + }); + } } diff --git a/frappe/public/js/frappe/widgets/widget_dialog.js b/frappe/public/js/frappe/widgets/widget_dialog.js index a552efd216..9262627f02 100644 --- a/frappe/public/js/frappe/widgets/widget_dialog.js +++ b/frappe/public/js/frappe/widgets/widget_dialog.js @@ -124,6 +124,24 @@ class ChartDialog extends WidgetDialog { } } +class OnboardingDialog extends WidgetDialog { + constructor(opts) { + super(opts); + } + + get_fields() { + return [ + { + fieldtype: "Link", + fieldname: "onboarding_name", + label: "Onboarding Name", + options: "Module Onboarding", + reqd: 1, + } + ]; + } +} + class CardDialog extends WidgetDialog { constructor(opts) { super(opts); @@ -531,6 +549,7 @@ export default function get_dialog_constructor(type) { shortcut: ShortcutDialog, number_card: NumberCardDialog, links: CardDialog, + onboarding: OnboardingDialog }; return widget_map[type] || WidgetDialog; From 4a546942e4711ce5e25c78970faa8e4b016d9137 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:09:18 +0530 Subject: [PATCH 0435/1519] fix: currency test --- frappe/tests/test_currency_formatter.py | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 frappe/tests/test_currency_formatter.py diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py new file mode 100644 index 0000000000..75cb42dc49 --- /dev/null +++ b/frappe/tests/test_currency_formatter.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +import frappe +from frappe import format +import unittest + +class TestFormatter(unittest.TestCase): + def test_custom_currency_formatting(self): + df = frappe._dict({ + 'fieldname': 'amount', + 'fieldtype': 'Currency', + 'options': 'currency' + }) + + doc = frappe._dict({ + 'amount': 5 + }) + frappe.db.set_default("currency", 'INR') + + # if currency field is not passed then default currency should be used. + print("doc.currency") + print(doc.currency) + print("frappe.db.get_default('currency')") + print(frappe.db.get_default("currency")) + + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') + + doc.currency = 'USD' + self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") + + frappe.db.set_default("currency", None) From e0e1c15d760e71c78ac2a415a91f69a491a7d4c4 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:10:15 +0530 Subject: [PATCH 0436/1519] fix: remove redundant code --- frappe/tests/test_formatter.py | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index cd7b8add9d..5257e1c717 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -22,29 +22,4 @@ class TestFormatter(unittest.TestCase): doc.currency = 'USD' self.assertEqual(format(100, df, doc), "$ 100.00") - frappe.db.set_default("currency", None) - - def test_custom_currency_formatting(self): - df = frappe._dict({ - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'options': 'currency' - }) - - doc = frappe._dict({ - 'amount': 5 - }) - frappe.db.set_default("currency", 'INR') - - # if currency field is not passed then default currency should be used. - print("doc.currency") - print(doc.currency) - print("frappe.db.get_default('currency')") - print(frappe.db.get_default("currency")) - - self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') - - doc.currency = 'USD' - self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") - - frappe.db.set_default("currency", None) + frappe.db.set_default("currency", None) \ No newline at end of file From e7e8fcd6221dc662feb7b5421ef40f7eb7b9414d Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 20:32:24 +0530 Subject: [PATCH 0437/1519] fix: old currency test --- frappe/tests/test_currency_formatter.py | 4 ---- frappe/tests/test_formatter.py | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py index 75cb42dc49..c85f2d3c40 100644 --- a/frappe/tests/test_currency_formatter.py +++ b/frappe/tests/test_currency_formatter.py @@ -17,10 +17,6 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. - print("doc.currency") - print(doc.currency) - print("frappe.db.get_default('currency')") - print(frappe.db.get_default("currency")) self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 5257e1c717..701e81bb9a 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -20,6 +20,8 @@ class TestFormatter(unittest.TestCase): self.assertEqual(format(100, df, doc), '₹ 100.00') doc.currency = 'USD' + print('doc.currency') + print(doc.currency) self.assertEqual(format(100, df, doc), "$ 100.00") frappe.db.set_default("currency", None) \ No newline at end of file From 48d1d11656a61c737427dc7d488d5ce639b9ed15 Mon Sep 17 00:00:00 2001 From: Kenneth Sequeira Date: Tue, 20 Jul 2021 21:06:27 +0530 Subject: [PATCH 0438/1519] fix: modified original test --- frappe/tests/test_currency_formatter.py | 26 ------------------------- frappe/tests/test_formatter.py | 6 ++---- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 frappe/tests/test_currency_formatter.py diff --git a/frappe/tests/test_currency_formatter.py b/frappe/tests/test_currency_formatter.py deleted file mode 100644 index c85f2d3c40..0000000000 --- a/frappe/tests/test_currency_formatter.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -import frappe -from frappe import format -import unittest - -class TestFormatter(unittest.TestCase): - def test_custom_currency_formatting(self): - df = frappe._dict({ - 'fieldname': 'amount', - 'fieldtype': 'Currency', - 'options': 'currency' - }) - - doc = frappe._dict({ - 'amount': 5 - }) - frappe.db.set_default("currency", 'INR') - - # if currency field is not passed then default currency should be used. - - self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') - - doc.currency = 'USD' - self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") - - frappe.db.set_default("currency", None) diff --git a/frappe/tests/test_formatter.py b/frappe/tests/test_formatter.py index 701e81bb9a..5454c2b1cd 100644 --- a/frappe/tests/test_formatter.py +++ b/frappe/tests/test_formatter.py @@ -17,11 +17,9 @@ class TestFormatter(unittest.TestCase): frappe.db.set_default("currency", 'INR') # if currency field is not passed then default currency should be used. - self.assertEqual(format(100, df, doc), '₹ 100.00') + self.assertEqual(format(100000, df, doc, format="#,###.##"), '₹ 100,000.00') doc.currency = 'USD' - print('doc.currency') - print(doc.currency) - self.assertEqual(format(100, df, doc), "$ 100.00") + self.assertEqual(format(100000, df, doc, format="#,###.##"), "$ 100,000.00") frappe.db.set_default("currency", None) \ No newline at end of file From e1ade10a54df10d66fea326b350e628ae3a4568a Mon Sep 17 00:00:00 2001 From: leela Date: Tue, 20 Jul 2021 18:59:40 +0530 Subject: [PATCH 0439/1519] fix: `show Report` button in report view (cherry picked from commit 0917d59a40f77f4514b29599ae96cf10ff0573ac) --- frappe/public/js/frappe/router.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 2bfa7c7be6..1f5a250872 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -172,7 +172,7 @@ frappe.router = { standard_route = ['List', doctype_route.doctype, frappe.utils.to_title_case(route[2])]; if (route[3]) { // calendar / kanban / dashboard / folder name - standard_route.push(...route.splice(3, route.length)); + standard_route.push([...route].splice(3, route.length)); } } return standard_route; @@ -298,7 +298,7 @@ frappe.router = { new_route = [this.slug(route[1]), 'view', route[2].toLowerCase()]; // calendar / inbox / file folder - if (route[3]) new_route.push(...route.slice(3, route.length)); + if (route[3]) new_route.push([...route].slice(3, route.length)); } else { if ($.isPlainObject(route[2])) { frappe.route_options = route[2]; From d459847ae39f8e9917686c3db6340ee95103085e Mon Sep 17 00:00:00 2001 From: leela Date: Tue, 13 Jul 2021 20:25:32 +0530 Subject: [PATCH 0440/1519] refactor: set amended docname to original docname Currently, whenever a document is amended it's name is set to name-X(X is a counter) when amended again and so on. In this PR, we have changed all cancelled doc patterns to name-CAN-X, so that amended docs can use the original name instead of name-X. --- frappe/core/doctype/doctype/test_doctype.py | 8 +- frappe/model/document.py | 9 +- frappe/model/naming.py | 83 ++++++++++++++++--- frappe/patches.txt | 1 + frappe/patches/v13_0/rename_cancelled_docs.py | 27 ++++++ frappe/public/js/frappe/form/form.js | 24 +++--- frappe/public/js/frappe/router.js | 6 ++ frappe/tests/test_naming.py | 34 ++++++++ 8 files changed, 164 insertions(+), 28 deletions(-) create mode 100644 frappe/patches/v13_0/rename_cancelled_docs.py diff --git a/frappe/core/doctype/doctype/test_doctype.py b/frappe/core/doctype/doctype/test_doctype.py index 1e1a01a685..4b6d0e4794 100644 --- a/frappe/core/doctype/doctype/test_doctype.py +++ b/frappe/core/doctype/doctype/test_doctype.py @@ -348,6 +348,7 @@ class TestDocType(unittest.TestCase): dump_docs = json.dumps(docs.get('docs')) cancel_all_linked_docs(dump_docs) data_link_doc.cancel() + data_doc.name = '{}-CAN-0'.format(data_doc.name) data_doc.load_from_db() self.assertEqual(data_link_doc.docstatus, 2) self.assertEqual(data_doc.docstatus, 2) @@ -371,7 +372,7 @@ class TestDocType(unittest.TestCase): for data in link_doc.get('permissions'): data.submit = 1 data.cancel = 1 - link_doc.insert() + link_doc.insert(ignore_if_duplicate=True) #create first parent doctype test_doc_1 = new_doctype('Test Doctype 1') @@ -386,7 +387,7 @@ class TestDocType(unittest.TestCase): for data in test_doc_1.get('permissions'): data.submit = 1 data.cancel = 1 - test_doc_1.insert() + test_doc_1.insert(ignore_if_duplicate=True) #crete second parent doctype doc = new_doctype('Test Doctype 2') @@ -401,7 +402,7 @@ class TestDocType(unittest.TestCase): for data in link_doc.get('permissions'): data.submit = 1 data.cancel = 1 - doc.insert() + doc.insert(ignore_if_duplicate=True) # create doctype data data_link_doc_1 = frappe.new_doc('Test Linked Doctype 1') @@ -432,6 +433,7 @@ class TestDocType(unittest.TestCase): # checking that doc for Test Doctype 2 is not canceled self.assertRaises(frappe.LinkExistsError, data_link_doc_1.cancel) + data_doc_2.name = '{}-CAN-0'.format(data_doc_2.name) data_doc.load_from_db() data_doc_2.load_from_db() self.assertEqual(data_link_doc_1.docstatus, 2) diff --git a/frappe/model/document.py b/frappe/model/document.py index 61160e1f01..e974ae2a3e 100644 --- a/frappe/model/document.py +++ b/frappe/model/document.py @@ -5,7 +5,7 @@ import time from frappe import _, msgprint, is_whitelisted from frappe.utils import flt, cstr, now, get_datetime_str, file_lock, date_diff from frappe.model.base_document import BaseDocument, get_controller -from frappe.model.naming import set_new_name +from frappe.model.naming import set_new_name, gen_new_name_for_cancelled_doc from werkzeug.exceptions import NotFound, Forbidden import hashlib, json from frappe.model import optional_fields, table_fields @@ -705,7 +705,6 @@ class Document(BaseDocument): else: tmp = frappe.db.sql("""select modified, docstatus from `tab{0}` where name = %s for update""".format(self.doctype), self.name, as_dict=True) - if not tmp: frappe.throw(_("Record does not exist")) else: @@ -916,8 +915,12 @@ class Document(BaseDocument): @whitelist.__func__ def _cancel(self): - """Cancel the document. Sets `docstatus` = 2, then saves.""" + """Cancel the document. Sets `docstatus` = 2, then saves. + """ self.docstatus = 2 + new_name = gen_new_name_for_cancelled_doc(self) + frappe.rename_doc(self.doctype, self.name, new_name, force=True, show_alert=False) + self.name = new_name self.save() @whitelist.__func__ diff --git a/frappe/model/naming.py b/frappe/model/naming.py index fe136adce8..6dff0aaff6 100644 --- a/frappe/model/naming.py +++ b/frappe/model/naming.py @@ -28,7 +28,7 @@ def set_new_name(doc): doc.name = None if getattr(doc, "amended_from", None): - _set_amended_name(doc) + doc.name = _get_amended_name(doc) return elif getattr(doc.meta, "issingle", False): @@ -221,6 +221,15 @@ def revert_series_if_last(key, name, doc=None): * prefix = #### and hashes = 2021 (hash doesn't exist) * will search hash in key then accordingly get prefix = "" """ + if hasattr(doc, 'amended_from'): + # do not revert if doc is amended, since cancelled docs still exist + if doc.docstatus != 2 and doc.amended_from: + return + + # for first cancelled doc + if doc.docstatus == 2 and not doc.amended_from: + name, _ = NameParser.parse_docname(doc.name, sep='-CAN-') + if ".#" in key: prefix, hashes = key.rsplit(".", 1) if "#" not in hashes: @@ -303,16 +312,9 @@ def append_number_if_name_exists(doctype, value, fieldname="name", separator="-" return value -def _set_amended_name(doc): - am_id = 1 - am_prefix = doc.amended_from - if frappe.db.get_value(doc.doctype, doc.amended_from, "amended_from"): - am_id = cint(doc.amended_from.split("-")[-1]) + 1 - am_prefix = "-".join(doc.amended_from.split("-")[:-1]) # except the last hyphen - - doc.name = am_prefix + "-" + str(am_id) - return doc.name - +def _get_amended_name(doc): + name, _ = NameParser(doc).parse_amended_from() + return name def _field_autoname(autoname, doc, skip_slicing=None): """ @@ -323,7 +325,6 @@ def _field_autoname(autoname, doc, skip_slicing=None): name = (cstr(doc.get(fieldname)) or "").strip() return name - def _prompt_autoname(autoname, doc): """ Generate a name using Prompt option. This simply means the user will have to set the name manually. @@ -354,3 +355,61 @@ def _format_autoname(autoname, doc): name = re.sub(r"(\{[\w | #]+\})", get_param_value_for_match, autoname_value) return name + +class NameParser: + """Parse document name and return all the parts of it. + + NOTE: It handles cancellend and amended doc parsing for now. It can be expanded. + """ + def __init__(self, doc): + self.doc = doc + + def parse_name(self): + if not hasattr(self.doc, "amended_from"): + return (self.doc.name, None, None) + + #If document is cancelled document + if hasattr(self.doc, "amended_from") and self.doc.docstatus == 2: + return self.parse_docname(self.doc.name, sep='-CAN-') + return self.parse_docname(self.doc.name) + + def parse_amended_from(self): + if not getattr(self.doc, 'amended_from', None): + return (None, None) + return self.parse_docname(self.doc.amended_from, '-CAN-') + + @classmethod + def parse_docname(cls, name, sep='-'): + split_list = name.rsplit(sep, 1) + + if len(split_list) == 1: + return (name, None) + return (split_list[0], split_list[1]) + +def get_cancelled_doc_latest_counter(tname, docname): + """Get the latest counter used for cancelled docs of given docname. + """ + name_prefix = f'{docname}-CAN-' + + rows = frappe.db.sql(""" + select + name + from `tab{tname}` + where + name like %(name_prefix)s and docstatus=2 + """.format(tname=tname), {'name_prefix': name_prefix+'%'}, as_dict=1) + + if not rows: + return -1 + return max([int(row.name.replace(name_prefix, '') or -1) for row in rows]) + +def gen_new_name_for_cancelled_doc(doc): + """Generate a new name for cancelled document. + """ + if getattr(doc, "amended_from", None): + name, _ = NameParser(doc).parse_amended_from() + else: + name = doc.name + + counter = get_cancelled_doc_latest_counter(doc.doctype, name) + return f'{name}-CAN-{counter+1}' diff --git a/frappe/patches.txt b/frappe/patches.txt index 7605d8ea2b..a9c5807df0 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -180,3 +180,4 @@ frappe.patches.v12_0.rename_uploaded_files_with_proper_name frappe.patches.v13_0.queryreport_columns frappe.patches.v13_0.jinja_hook frappe.patches.v13_0.update_notification_channel_if_empty +frappe.patches.v13_0.rename_cancelled_docs diff --git a/frappe/patches/v13_0/rename_cancelled_docs.py b/frappe/patches/v13_0/rename_cancelled_docs.py new file mode 100644 index 0000000000..2e99a6f3cd --- /dev/null +++ b/frappe/patches/v13_0/rename_cancelled_docs.py @@ -0,0 +1,27 @@ +import frappe +from frappe.model.naming import NameParser +from frappe.model.rename_doc import rename_doc + +def execute(): + """Rename already cancelled documents by adding `CAN-X` postfix instead of `-X`. + """ + for doctype in frappe.db.get_all('DocType'): + doctype = frappe.get_doc('DocType', doctype.name) + if doctype.is_submittable and frappe.db.table_exists(doctype.name): + cancelled_docs = frappe.db.get_all(doctype.name, ['amended_from', 'name'], {'docstatus':2}) + + for doc in cancelled_docs: + if '-CAN-' in doc.name: + continue + + current_name = doc.name + + if getattr(doc, "amended_from", None): + orig_name, counter = NameParser.parse_docname(doc.name) + else: + orig_name, counter = doc.name, 0 + new_name = f'{orig_name}-CAN-{counter or 0}' + + print(f"Renaming {doctype.name} record from {current_name} to {new_name}") + rename_doc(doctype.name, current_name, new_name, ignore_permissions=True, show_alert=False) + frappe.db.commit() diff --git a/frappe/public/js/frappe/form/form.js b/frappe/public/js/frappe/form/form.js index 8064f90a98..30f023c987 100644 --- a/frappe/public/js/frappe/form/form.js +++ b/frappe/public/js/frappe/form/form.js @@ -770,32 +770,36 @@ frappe.ui.form.Form = class FrappeForm { } _cancel(btn, callback, on_error, skip_confirm) { - const me = this; const cancel_doc = () => { frappe.validated = true; - me.script_manager.trigger("before_cancel").then(() => { + this.script_manager.trigger("before_cancel").then(() => { if (!frappe.validated) { - return me.handle_save_fail(btn, on_error); + return this.handle_save_fail(btn, on_error); } - var after_cancel = function(r) { + const original_name = this.docname; + const after_cancel = (r) => { if (r.exc) { - me.handle_save_fail(btn, on_error); + this.handle_save_fail(btn, on_error); } else { frappe.utils.play_sound("cancel"); - me.refresh(); callback && callback(); - me.script_manager.trigger("after_cancel"); + this.script_manager.trigger("after_cancel"); + frappe.run_serially([ + () => this.rename_notify(this.doctype, original_name, r.docs[0].name), + () => frappe.router.clear_re_route(this.doctype, original_name), + () => this.refresh(), + ]); } }; - frappe.ui.form.save(me, "cancel", after_cancel, btn); + frappe.ui.form.save(this, "cancel", after_cancel, btn); }); } if (skip_confirm) { cancel_doc(); } else { - frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, me.handle_save_fail(btn, on_error)); + frappe.confirm(__("Permanently Cancel {0}?", [this.docname]), cancel_doc, this.handle_save_fail(btn, on_error)); } }; @@ -817,7 +821,7 @@ frappe.ui.form.Form = class FrappeForm { 'docname': this.doc.name }).then(is_amended => { if (is_amended) { - frappe.throw(__('This document is already amended, you cannot ammend it again')); + frappe.throw(__('This document is already amended, you cannot amend it again')); } this.validate_form_action("Amend"); var me = this; diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 2bfa7c7be6..17e0e689d3 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -235,6 +235,12 @@ frappe.router = { } }, + clear_re_route(doctype, docname) { + delete frappe.re_route[ + `${encodeURIComponent(frappe.router.slug(doctype))}/${encodeURIComponent(docname)}` + ]; + }, + set_title(sub_path) { if (frappe.route_titles[sub_path]) { frappe.utils.set_title(frappe.route_titles[sub_path]); diff --git a/frappe/tests/test_naming.py b/frappe/tests/test_naming.py index 557993882f..78071a4120 100644 --- a/frappe/tests/test_naming.py +++ b/frappe/tests/test_naming.py @@ -116,3 +116,37 @@ class TestNaming(unittest.TestCase): self.assertEqual(current_index.get('current'), 2) frappe.db.sql("""delete from `tabSeries` where name = %s""", series) + + def test_naming_for_cancelled_and_amended_doc(self): + submittable_doctype = frappe.get_doc({ + "doctype": "DocType", + "module": "Core", + "custom": 1, + "is_submittable": 1, + "permissions": [{ + "role": "System Manager", + "read": 1 + }], + "name": 'Submittable Doctype' + }).insert(ignore_if_duplicate=True) + + doc = frappe.new_doc('Submittable Doctype') + doc.save() + original_name = doc.name + + doc.submit() + doc.cancel() + cancelled_name = doc.name + self.assertEqual(cancelled_name, "{}-CAN-0".format(original_name)) + + amended_doc = frappe.copy_doc(doc) + amended_doc.docstatus = 0 + amended_doc.amended_from = doc.name + amended_doc.save() + self.assertEqual(amended_doc.name, original_name) + + amended_doc.submit() + amended_doc.cancel() + self.assertEqual(amended_doc.name, "{}-CAN-1".format(original_name)) + + submittable_doctype.delete() From 09ca4d5af3c8aeda0496d8d2a16b025df8ca275f Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Wed, 21 Jul 2021 14:21:44 +0530 Subject: [PATCH 0441/1519] fix: V1 support and external links --- frappe/public/js/frappe/router.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/frappe/public/js/frappe/router.js b/frappe/public/js/frappe/router.js index 8f8704713e..0d8315bbc8 100644 --- a/frappe/public/js/frappe/router.js +++ b/frappe/public/js/frappe/router.js @@ -47,20 +47,18 @@ $('body').on('click', 'a', function(e) { return; } - if (href==='') { + if (href === '') { return override('/app'); } + if (href.startsWith('#')) { + // target startswith "#", this is a v1 style route, so remake it. + return override(e.currentTarget.hash); + } + if (frappe.router.is_app_route(e.currentTarget.pathname)) { // target has "/app, this is a v2 style route. - if (e.currentTarget.pathname) { - return override(e.currentTarget.pathname + e.currentTarget.hash); - } - } else { - // target has "#" ,this is a v1 style route, so remake it. - if (e.currentTarget.hash) { - return override(e.currentTarget.hash); - } + return override(e.currentTarget.pathname + e.currentTarget.hash); } }); From fa6cb14ee5221ec4d9db82bc731be8910eefb7b0 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 19:15:38 +0530 Subject: [PATCH 0442/1519] refactor: moved from raw queries to frappe orm in core --- frappe/core/doctype/activity_log/feed.py | 15 +++-- .../domain_settings/domain_settings.py | 3 +- .../core/doctype/log_settings/log_settings.py | 1 + frappe/core/doctype/report/test_report.py | 9 ++- frappe/core/doctype/role/role.py | 3 +- .../scheduled_job_type/scheduled_job_type.py | 7 +- frappe/core/doctype/user/user.py | 27 +++++--- .../user_permission/test_user_permission.py | 19 ++++-- .../user_permission/user_permission.py | 66 +++++++++++++------ .../permission_manager/permission_manager.py | 6 +- 10 files changed, 106 insertions(+), 50 deletions(-) diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py index caa3cae613..cf8f7416e8 100644 --- a/frappe/core/doctype/activity_log/feed.py +++ b/frappe/core/doctype/activity_log/feed.py @@ -27,12 +27,15 @@ def update_feed(doc, method=None): feed = frappe._dict(feed) doctype = feed.doctype or doc.doctype name = feed.name or doc.name - - # delete earlier feed - frappe.db.sql("""delete from `tabActivity Log` - where - reference_doctype=%s and reference_name=%s - and link_doctype=%s""", (doctype, name,feed.link_doctype)) + + + frappe.db.delete(doctype="Activity Log", conditions={"reference_doctype": doctype, + "reference_name": name, + "link_doctype": name.feed.link_doctype}) + # frappe.db.sql("""delete from `tabActivity Log` + # where + # reference_doctype=%s and reference_name=%s + # and link_doctype=%s""", (doctype, name,feed.link_doctype)) frappe.get_doc({ "doctype": "Activity Log", "reference_doctype": doctype, diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index 7ad0aeff21..6ca180def1 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -34,7 +34,8 @@ class DomainSettings(Document): all_domains = list((frappe.get_hooks('domains') or {})) def remove_role(role): - frappe.db.sql('delete from `tabHas Role` where role=%s', role) + frappe.db.delete(doctype="Has Role", conditions={"role": role}) + # frappe.db.sql('delete from `tabHas Role` where role=%s', role) frappe.set_value('Role', role, 'disabled', 1) for domain in all_domains: diff --git a/frappe/core/doctype/log_settings/log_settings.py b/frappe/core/doctype/log_settings/log_settings.py index e73aa8dac1..776fcc92e9 100644 --- a/frappe/core/doctype/log_settings/log_settings.py +++ b/frappe/core/doctype/log_settings/log_settings.py @@ -13,6 +13,7 @@ class LogSettings(Document): self.clear_email_queue() def clear_error_logs(self): + # frappe.db.delete(doctype="Error Log", conditions="") frappe.db.sql(""" DELETE FROM `tabError Log` WHERE `creation` < (NOW() - INTERVAL '{0}' DAY) """.format(self.clear_error_log_after)) diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py index 9d0c0b9af0..2bab6adf19 100644 --- a/frappe/core/doctype/report/test_report.py +++ b/frappe/core/doctype/report/test_report.py @@ -81,9 +81,14 @@ class TestReport(unittest.TestCase): self.assertDictEqual({'name': 'Administrator', 'user_type': 'System User', 'email': 'admin@example.com'}, admin_dict) def test_report_permissions(self): + frappe.set_user('test@example.com') - frappe.db.sql("""delete from `tabHas Role` where parent = %s - and role = 'Test Has Role'""", frappe.session.user, auto_commit=1) + frappe.db.delete(doctype="Has Role", conditions={ + "parent": frappe.session.user, + "role": "Test Has Role" + }) + # frappe.db.sql("""delete from `tabHas Role` where parent = %s + # and role = 'Test Has Role'""", frappe.session.user, auto_commit=1) if not frappe.db.exists('Role', 'Test Has Role'): role = frappe.get_doc({ diff --git a/frappe/core/doctype/role/role.py b/frappe/core/doctype/role/role.py index 02482c75ca..fae8ae2d28 100644 --- a/frappe/core/doctype/role/role.py +++ b/frappe/core/doctype/role/role.py @@ -38,7 +38,8 @@ class Role(Document): self.set(key, 0) def remove_roles(self): - frappe.db.sql("delete from `tabHas Role` where role = %s", self.name) + frappe.db.delete(doctype="Has Role", conditions={"role": self.name}) + # frappe.db.sql("delete from `tabHas Role` where role = %s", self.name) frappe.clear_cache() def on_update(self): diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index 59089d12ad..d6c94aded1 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -13,7 +13,6 @@ from frappe.model.document import Document from frappe.utils import get_datetime, now_datetime from frappe.utils.background_jobs import enqueue, get_jobs - class ScheduledJobType(Document): def autoname(self): self.name = ".".join(self.method.split(".")[-2:]) @@ -110,7 +109,11 @@ class ScheduledJobType(Document): return 'long' if ('Long' in self.frequency) else 'default' def on_trash(self): - frappe.db.sql('delete from `tabScheduled Job Log` where scheduled_job_type=%s', self.name) + + frappe.db.delete(doctype="Scheduled Job Log", conditions={ + "scheduled_job_type": self.name + }) + # frappe.db.sql('delete from `tabScheduled Job Log` where scheduled_job_type=%s', self.name) @frappe.whitelist() diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index 53d1c9ffe5..f69af4e4a8 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -17,7 +17,7 @@ from frappe.website.utils import is_signup_disabled from frappe.rate_limiter import rate_limit from frappe.utils.background_jobs import enqueue from frappe.core.doctype.user_type.user_type import user_linked_with_permission_on_doctype - +from frappe.database.database import Database STANDARD_USERS = ("Guest", "Administrator") @@ -367,23 +367,30 @@ class User(Document): if getattr(frappe.local, "login_manager", None): frappe.local.login_manager.logout(user=self.name) - # delete todos - frappe.db.sql("""DELETE FROM `tabToDo` WHERE `owner`=%s""", (self.name,)) + frappe.db.delete("Todo", {"owner": self.name}) + # frappe.db.sql("""DELETE FROM `tabToDo` WHERE `owner`=%s""", (self.name,)) frappe.db.sql("""UPDATE `tabToDo` SET `assigned_by`=NULL WHERE `assigned_by`=%s""", (self.name,)) # delete events - frappe.db.sql("""delete from `tabEvent` where owner=%s - and event_type='Private'""", (self.name,)) + frappe.db.delete("Event", {"owner": self.name, "event_type": "Private"}) + # frappe.db.sql("""delete from `tabEvent` where owner=%s + # and event_type='Private'""", (self.name,)) # delete shares - frappe.db.sql("""delete from `tabDocShare` where user=%s""", self.name) + frappe.db.delete("DocShare", {"user": self.name}) + # frappe.db.sql("""delete from `tabDocShare` where user=%s""", self.name) # delete messages - frappe.db.sql("""delete from `tabCommunication` - where communication_type in ('Chat', 'Notification') - and reference_doctype='User' - and (reference_name=%s or owner=%s)""", (self.name, self.name)) + # TODO: CHANGE THIS FROM ABHISHEK KA PYPIKA + frappe.db.delete("Communication", { + "reference_doctype": "User", + "communication_type": ("in", ("Chat", "Notification")), + }) + # frappe.db.sql("""delete from `tabCommunication` + # where communication_type in ('Chat', 'Notification') + # and reference_doctype='User' + # and (reference_name=%s or owner=%s)""", (self.name, self.name)) # unlink contact frappe.db.sql("""update `tabContact` diff --git a/frappe/core/doctype/user_permission/test_user_permission.py b/frappe/core/doctype/user_permission/test_user_permission.py index 1a442b53e7..9393e47ee9 100644 --- a/frappe/core/doctype/user_permission/test_user_permission.py +++ b/frappe/core/doctype/user_permission/test_user_permission.py @@ -10,12 +10,19 @@ import unittest class TestUserPermission(unittest.TestCase): def setUp(self): - frappe.db.sql("""DELETE FROM `tabUser Permission` - WHERE `user` in ( - 'test_bulk_creation_update@example.com', - 'test_user_perm1@example.com', - 'nested_doc_user@example.com')""") - frappe.delete_doc_if_exists("DocType", "Person") + + frappe.db.delete("User Permission", { + "user": ("in", ("test_bulk_creation_update@example.com", + "test_user_perm1@example.com", + "nested_doc_user@example.com")) + }) + + # frappe.db.sql("""DELETE FROM `tabUser Permission` + # WHERE `user` in ( + # 'test_bulk_creation_update@example.com', + # 'test_user_perm1@example.com', + # 'nested_doc_user@example.com')""") + # frappe.delete_doc_if_exists("DocType", "Person") frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabPerson`") frappe.delete_doc_if_exists("DocType", "Doc A") frappe.db.sql_ddl("DROP TABLE IF EXISTS `tabDoc A`") diff --git a/frappe/core/doctype/user_permission/user_permission.py b/frappe/core/doctype/user_permission/user_permission.py index 4aa5797c7f..5b3822d82f 100644 --- a/frappe/core/doctype/user_permission/user_permission.py +++ b/frappe/core/doctype/user_permission/user_permission.py @@ -182,7 +182,11 @@ def clear_user_permissions(user, for_doctype): frappe.only_for('System Manager') total = frappe.db.count('User Permission', filters = dict(user=user, allow=for_doctype)) if total: - frappe.db.sql('DELETE FROM `tabUser Permission` WHERE `user`=%s AND `allow`=%s', (user, for_doctype)) + frappe.db.delete("User Permission", { + "user": user, + "allow": for_doctype + }) + # frappe.db.sql('DELETE FROM `tabUser Permission` WHERE `user`=%s AND `allow`=%s', (user, for_doctype)) frappe.clear_cache() return total @@ -232,28 +236,50 @@ def insert_user_perm(user, doctype, docname, is_default=0, hide_descendants=0, a user_perm.insert() def remove_applicable(perm_applied_docs, user, doctype, docname): + for applicable_for in perm_applied_docs: - frappe.db.sql("""DELETE FROM `tabUser Permission` - WHERE `user`=%s - AND `applicable_for`=%s - AND `allow`=%s - AND `for_value`=%s - """, (user, applicable_for, doctype, docname)) - + frappe.db.delete("User Permission", { + "user": user, + "applicable_for": applicable_for, + "allow": doctype, + "for_value": docname + }) + # + # frappe.db.sql("""DELETE FROM `tabUser Permission` + # WHERE `user`=%s + # AND `applicable_for`=%s + # AND `allow`=%s + # AND `for_value`=%s + # """, (user, applicable_for, doctype, docname)) def remove_apply_to_all(user, doctype, docname): - frappe.db.sql("""DELETE from `tabUser Permission` - WHERE `user`=%s - AND `apply_to_all_doctypes`=1 - AND `allow`=%s - AND `for_value`=%s - """,(user, doctype, docname)) + + frappe.db.delete("User Permission", { + "user": user, + "apply_to_all_doctypes": 1, + "allow": doctype, + "for_value": docname + }) + # frappe.db.sql("""DELETE from `tabUser Permission` + # WHERE `user`=%s + # AND `apply_to_all_doctypes`=1 + # AND `allow`=%s + # AND `for_value`=%s + # """,(user, doctype, docname)) def update_applicable(already_applied, to_apply, user, doctype, docname): for applied in already_applied: if applied not in to_apply: - frappe.db.sql("""DELETE FROM `tabUser Permission` - WHERE `user`=%s - AND `applicable_for`=%s - AND `allow`=%s - AND `for_value`=%s - """,(user, applied, doctype, docname)) + + frappe.db.delete("User Permission", { + "user": user, + "applicable_for": applied, + "allow": doctype, + "for_value": docname + }) + + # frappe.db.sql("""DELETE FROM `tabUser Permission` + # WHERE `user`=%s + # AND `applicable_for`=%s + # AND `allow`=%s + # AND `for_value`=%s + # """,(user, applied, doctype, docname)) diff --git a/frappe/core/page/permission_manager/permission_manager.py b/frappe/core/page/permission_manager/permission_manager.py index 15c7cb55ae..0a76283813 100644 --- a/frappe/core/page/permission_manager/permission_manager.py +++ b/frappe/core/page/permission_manager/permission_manager.py @@ -111,8 +111,10 @@ def remove(doctype, role, permlevel): setup_custom_perms(doctype) name = frappe.get_value('Custom DocPerm', dict(parent=doctype, role=role, permlevel=permlevel)) - - frappe.db.sql('delete from `tabCustom DocPerm` where name=%s', name) + frappe.db.delete("Custom DocPerm", { + "name": name + }) + # frappe.db.sql('delete from `tabCustom DocPerm` where name=%s', name) if not frappe.get_all('Custom DocPerm', dict(parent=doctype)): frappe.throw(_('There must be atleast one permission rule.'), title=_('Cannot Remove')) From 9aa17db392d54f52cc7eda223eb3ece276ee74a1 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 19:16:17 +0530 Subject: [PATCH 0443/1519] refactor: moved from raw queries to frappe orm in desk --- .../dashboard_chart/test_dashboard_chart.py | 6 ++++-- frappe/desk/doctype/event/event.py | 11 ++++++++--- .../desk/doctype/route_history/route_history.py | 17 +++++++++++------ frappe/desk/doctype/tag/tag.py | 13 +++++++++++-- 4 files changed, 34 insertions(+), 13 deletions(-) diff --git a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py index 78d133b2d5..7133640c21 100644 --- a/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py +++ b/frappe/desk/doctype/dashboard_chart/test_dashboard_chart.py @@ -64,7 +64,8 @@ class TestDashboardChart(unittest.TestCase): if frappe.db.exists('Dashboard Chart', 'Test Empty Dashboard Chart'): frappe.delete_doc('Dashboard Chart', 'Test Empty Dashboard Chart') - frappe.db.sql('delete from `tabError Log`') + frappe.db.delete("Error Log") + # frappe.db.sql('delete from `tabError Log`') frappe.get_doc(dict( doctype = 'Dashboard Chart', @@ -94,7 +95,8 @@ class TestDashboardChart(unittest.TestCase): if frappe.db.exists('Dashboard Chart', 'Test Empty Dashboard Chart 2'): frappe.delete_doc('Dashboard Chart', 'Test Empty Dashboard Chart 2') - frappe.db.sql('delete from `tabError Log`') + frappe.db.delete("Error Log") + # frappe.db.sql('delete from `tabError Log`') # create one data point frappe.get_doc(dict(doctype = 'Error Log', creation = '2018-06-01 00:00:00')).insert() diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py index 57c89eaf2e..f9a0dd74fd 100644 --- a/frappe/desk/doctype/event/event.py +++ b/frappe/desk/doctype/event/event.py @@ -338,9 +338,14 @@ def delete_events(ref_type, ref_name, delete_event=False): total_participants = frappe.get_all("Event Participants", filters={"parenttype": "Event", "parent": participation.parent}) if len(total_participants) <= 1: - frappe.db.sql("DELETE FROM `tabEvent` WHERE `name` = %(name)s", {'name': participation.parent}) - - frappe.db.sql("DELETE FROM `tabEvent Participants ` WHERE `name` = %(name)s", {'name': participation.name}) + frappe.db.delete("Event", { + "name": participation.parent + }) + # frappe.db.sql("DELETE FROM `tabEvent` WHERE `name` = %(name)s", {'name': participation.parent}) + frappe.db.delete("Event Participants", { + "name": participation.name + }) + # frappe.db.sql("DELETE FROM `tabEvent Participants ` WHERE `name` = %(name)s", {'name': participation.name}) # Close events if ends_on or repeat_till is less than now_datetime def set_status_of_events(): diff --git a/frappe/desk/doctype/route_history/route_history.py b/frappe/desk/doctype/route_history/route_history.py index b82077f485..bfa2711b8f 100644 --- a/frappe/desk/doctype/route_history/route_history.py +++ b/frappe/desk/doctype/route_history/route_history.py @@ -32,11 +32,16 @@ def flush_old_route_records(): fields=['modified'], order_by='modified desc') - frappe.db.sql(''' - DELETE - FROM `tabRoute History` - WHERE `modified` <= %(modified)s and `user`=%(modified)s - ''', { + frappe.db.delete("Route History", { "modified": last_record_to_keep[0].modified, "user": user - }) \ No newline at end of file + }) + + # frappe.db.sql(''' + # DELETE + # FROM `tabRoute History` + # WHERE `modified` <= %(modified)s and `user`=%(modified)s + # ''', { + # "modified": last_record_to_keep[0].modified, + # "user": user + # }) \ No newline at end of file diff --git a/frappe/desk/doctype/tag/tag.py b/frappe/desk/doctype/tag/tag.py index 4ea5c9cd7e..8b78405d06 100644 --- a/frappe/desk/doctype/tag/tag.py +++ b/frappe/desk/doctype/tag/tag.py @@ -123,7 +123,11 @@ def delete_tags_for_document(doc): if not frappe.db.table_exists("Tag Link"): return - frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s""", (doc.doctype, doc.name)) + frappe.db.delete("Tag Link", { + "document_type": doc.doctype, + "document_name": doc.name + }) + # frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s""", (doc.doctype, doc.name)) def update_tags(doc, tags): """ @@ -161,7 +165,12 @@ def get_deleted_tags(new_tags, existing_tags): return list(set(existing_tags) - set(new_tags)) def delete_tag_for_document(dt, dn, tag): - frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s AND tag=%s""", (dt, dn, tag)) + frappe.db.delete("Tag Link", { + "document_type": dt, + "document_name": dn, + "tag": tag + }) + # frappe.db.sql("""DELETE FROM `tabTag Link` WHERE `document_type`=%s AND `document_name`=%s AND tag=%s""", (dt, dn, tag)) @frappe.whitelist() def get_documents_for_tag(tag): From a256219dd27b5251b90e0d04b1a5b7797117ea6c Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 19:16:59 +0530 Subject: [PATCH 0444/1519] refactor: moved from raw queries in frappe email to frappe orm --- frappe/email/doctype/unhandled_email/unhandled_email.py | 7 +++++-- frappe/email/queue.py | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/frappe/email/doctype/unhandled_email/unhandled_email.py b/frappe/email/doctype/unhandled_email/unhandled_email.py index 6414dbece3..850007d85f 100644 --- a/frappe/email/doctype/unhandled_email/unhandled_email.py +++ b/frappe/email/doctype/unhandled_email/unhandled_email.py @@ -10,5 +10,8 @@ class UnhandledEmail(Document): def remove_old_unhandled_emails(): - frappe.db.sql("""DELETE FROM `tabUnhandled Email` - WHERE creation < %s""", frappe.utils.add_days(frappe.utils.nowdate(), -30)) + frappe.db.delete("Unhandled Email", { + "creation": ("<", frappe.utils.add_days(frappe.utils.nowdate(), -30)) + }) + # frappe.db.sql("""DELETE FROM `tabUnhandled Email` + # WHERE creation < %s""", frappe.utils.add_days(frappe.utils.nowdate(), -30)) \ No newline at end of file diff --git a/frappe/email/queue.py b/frappe/email/queue.py index 885a306cfb..40f1c7be3a 100755 --- a/frappe/email/queue.py +++ b/frappe/email/queue.py @@ -173,6 +173,7 @@ def clear_outbox(days=None): WHERE `priority`=0 AND `modified` < (NOW() - INTERVAL '{0}' DAY)""".format(days)) if email_queues: + # TODO: email_queues IN frappe.db.sql frappe.db.sql("""DELETE FROM `tabEmail Queue` WHERE `name` IN ({0})""".format( ','.join(['%s']*len(email_queues) )), tuple(email_queues)) From eb7e95ae26a542e82066b302e6bc85edffe7df25 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 19:19:06 +0530 Subject: [PATCH 0445/1519] refactor: using frappe orm --- .../doctype/custom_field/custom_field.py | 14 ++++-- .../doctype/customize_form/customize_form.py | 8 +++- frappe/model/__init__.py | 26 +++++++---- frappe/model/delete_doc.py | 46 +++++++++++++++---- frappe/permissions.py | 7 ++- frappe/sessions.py | 5 +- 6 files changed, 78 insertions(+), 28 deletions(-) diff --git a/frappe/custom/doctype/custom_field/custom_field.py b/frappe/custom/doctype/custom_field/custom_field.py index 7e6ea1875a..1d8f4ae67a 100644 --- a/frappe/custom/doctype/custom_field/custom_field.py +++ b/frappe/custom/doctype/custom_field/custom_field.py @@ -85,11 +85,15 @@ class CustomField(Document): frappe.bold(self.label))) # delete property setter entries - frappe.db.sql("""\ - DELETE FROM `tabProperty Setter` - WHERE doc_type = %s - AND field_name = %s""", - (self.dt, self.fieldname)) + frappe.db.delete("Property Setter", { + "doc_type": self.dt, + "field_name": self.fieldname + }) + # frappe.db.sql("""\ + # DELETE FROM `tabProperty Setter` + # WHERE doc_type = %s + # AND field_name = %s""", + # (self.dt, self.fieldname)) frappe.clear_cache(doctype=self.dt) diff --git a/frappe/custom/doctype/customize_form/customize_form.py b/frappe/custom/doctype/customize_form/customize_form.py index 1b8977acc4..3b7de448d3 100644 --- a/frappe/custom/doctype/customize_form/customize_form.py +++ b/frappe/custom/doctype/customize_form/customize_form.py @@ -20,8 +20,12 @@ from frappe.core.doctype.doctype.doctype import validate_series class CustomizeForm(Document): def on_update(self): - frappe.db.sql("delete from tabSingles where doctype='Customize Form'") - frappe.db.sql("delete from `tabCustomize Form Field`") + frappe.db.delete("Singles", { + "doctype": "Customize Form" + }) + frappe.db.delete("Customize Form Field") + # frappe.db.sql("delete from tabSingles where doctype='Customize Form'") + # frappe.db.sql("delete from `tabCustomize Form Field`") @frappe.whitelist() def fetch_to_customize(self): diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 75122f5aba..763fd36cc7 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -151,21 +151,29 @@ def delete_fields(args_dict, delete=0): fields = args_dict[dt] if not fields: continue - - frappe.db.sql(""" - DELETE FROM `tabDocField` - WHERE parent='%s' AND fieldname IN (%s) - """ % (dt, ", ".join(["'{}'".format(f) for f in fields]))) + + frappe.db.delete("DocField", { + "parent": dt, + "fieldname": ("in", ", ".join(["'{}'".format(f) for f in fields])) + }) + # frappe.db.sql(""" + # DELETE FROM `tabDocField` + # WHERE parent='%s' AND fieldname IN (%s) + # """ % (dt, ", ".join(["'{}'".format(f) for f in fields]))) # Delete the data/column only if delete is specified if not delete: continue if frappe.db.get_value("DocType", dt, "issingle"): - frappe.db.sql(""" - DELETE FROM `tabSingles` - WHERE doctype='%s' AND field IN (%s) - """ % (dt, ", ".join("'{}'".format(f) for f in fields))) + frappe.db.delete("Singles", { + "doctype": dt, + "field": ("in", ", ".join("'{}'".format(f) for f in fields)) + }) + # frappe.db.sql(""" + # DELETE FROM `tabSingles` + # WHERE doctype='%s' AND field IN (%s) + # """ % (dt, ", ".join("'{}'".format(f) for f in fields))) else: existing_fields = frappe.db.multisql({ "mariadb": "DESC `tab%s`" % dt, diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index cc88cfa106..ec53d060fd 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -65,12 +65,36 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa update_flags(doc, flags, ignore_permissions) check_permission_and_not_submitted(doc) - frappe.db.sql("delete from `tabCustom Field` where dt = %s", name) - frappe.db.sql("delete from `tabClient Script` where dt = %s", name) - frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", name) - frappe.db.sql("delete from `tabReport` where ref_doctype=%s", name) - frappe.db.sql("delete from `tabCustom DocPerm` where parent=%s", name) - frappe.db.sql("delete from `__global_search` where doctype=%s", name) + frappe.db.delete("Custom Field", { + "dt": name + }) + + frappe.db.delete("Client Script", { + "dt": name + }) + + frappe.db.delete("Property Setter", { + "doc_type": name + }) + + frappe.db.delete("Report", { + "ref_doctype": name + }) + + frappe.db.delete("Custom DocPerm", { + "parent": name + }) + + frappe.db.delete("__global_search", { + "doctype": name + }) + + # frappe.db.sql("delete from `tabCustom Field` where dt = %s", name) + # frappe.db.sql("delete from `tabClient Script` where dt = %s", name) + # frappe.db.sql("delete from `tabProperty Setter` where doc_type = %s", name) + # frappe.db.sql("delete from `tabReport` where ref_doctype=%s", name) + # frappe.db.sql("delete from `tabCustom DocPerm` where parent=%s", name) + # frappe.db.sql("delete from `__global_search` where doctype=%s", name) delete_from_table(doctype, name, ignore_doctypes, None) @@ -162,9 +186,15 @@ def update_naming_series(doc): def delete_from_table(doctype, name, ignore_doctypes, doc): if doctype!="DocType" and doctype==name: - frappe.db.sql("delete from `tabSingles` where `doctype`=%s", name) + frappe.db.delete("Singles", { + "doctype": name + }) + # frappe.db.sql("delete from `tabSingles` where `doctype`=%s", name) else: - frappe.db.sql("delete from `tab{0}` where `name`=%s".format(doctype), name) + frappe.db.delete(f"{doctype}", { + "name": name + }) + # frappe.db.sql("delete from `tab{0}` where `name`=%s".format(doctype), name) # get child tables if doc: diff --git a/frappe/permissions.py b/frappe/permissions.py index 07b4a2e68f..4cd846e52c 100644 --- a/frappe/permissions.py +++ b/frappe/permissions.py @@ -6,10 +6,12 @@ import frappe import frappe.share from frappe import _, msgprint from frappe.utils import cint - +from frappe.database.database import Database rights = ("select", "read", "write", "create", "delete", "submit", "cancel", "amend", "print", "email", "report", "import", "export", "set_user_permissions", "share") + + def check_admin_or_system_manager(user=None): if not user: user = frappe.session.user @@ -516,8 +518,9 @@ def reset_perms(doctype): """Reset permissions for given doctype.""" from frappe.desk.notifications import delete_notification_count_for delete_notification_count_for(doctype) + frappe.db.delete(doctype="Custom DocPerm", conditions={"parent": doctype}) - frappe.db.sql("""delete from `tabCustom DocPerm` where parent=%s""", doctype) + # frappe.db.sql("""delete from `tabCustom DocPerm` where parent=%s""", doctype) def get_linked_doctypes(dt): return list(set([dt] + [d.options for d in diff --git a/frappe/sessions.py b/frappe/sessions.py index 4d922d6769..ae2bd02d98 100644 --- a/frappe/sessions.py +++ b/frappe/sessions.py @@ -16,6 +16,7 @@ import frappe.translate import redis from urllib.parse import unquote from frappe.cache_manager import clear_user_cache +from frappe.database.database import Database @frappe.whitelist(allow_guest=True) def clear(user=None): @@ -76,7 +77,6 @@ def get_sessions_to_clear(user=None, keep_current=False, device=None): def delete_session(sid=None, user=None, reason="Session Expired"): from frappe.core.doctype.activity_log.feed import logout_feed - frappe.cache().hdel("session", sid) frappe.cache().hdel("last_db_session_update", sid) if sid and not user: @@ -84,7 +84,8 @@ def delete_session(sid=None, user=None, reason="Session Expired"): if user_details: user = user_details[0].get("user") logout_feed(user, reason) - frappe.db.sql("""delete from tabSessions where sid=%s""", sid) + frappe.db.delete(doctype="Sessions", conditions={"sid": sid}) + # frappe.db.sql("""delete from tabSessions where sid=%s""", sid) frappe.db.commit() def clear_all_sessions(reason=None): From 931549ee054e8193591e4ff5e6796144a74d94ee Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 19:20:35 +0530 Subject: [PATCH 0446/1519] refactor: changed delete to accept no conditions --- frappe/database/database.py | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 6012e47445..5b4d813011 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -951,15 +951,25 @@ class Database(object): query = sql_dict.get(current_dialect) return self.sql(query, values, **kwargs) - def delete(self, doctype, conditions, debug=False): + def delete(self, doctype, conditions=None, debug=False): if conditions: conditions, values = self.build_conditions(conditions) - return self.sql("DELETE FROM `tab{doctype}` where {conditions}".format( + if doctype.startswith("__"): + return self.sql("DELETE FROM `{doctype}` where {conditions}".format( doctype=doctype, conditions=conditions ), values, debug=debug) + else: + return self.sql("DELETE FROM `tab{doctype}` where {conditions}".format( + doctype=doctype, + conditions=conditions + ), values, debug=debug) + else: - frappe.throw(_('No conditions provided')) + return self.sql("DELETE FROM `tab{doctype}`".format( + doctype=doctype + ), debug=debug) + def get_last_created(self, doctype): last_record = self.get_all(doctype, ('creation'), limit=1, order_by='creation desc') From dd2648b1414e47b46071109ab3bba9c5ed6a37f9 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 23:28:17 +0530 Subject: [PATCH 0447/1519] refactor: Moving from core raw queries to frappe orm --- frappe/core/doctype/activity_log/feed.py | 6 +++--- .../domain_settings/domain_settings.py | 2 +- frappe/core/doctype/error_log/error_log.py | 3 ++- frappe/core/doctype/report/test_report.py | 2 +- frappe/core/doctype/role/role.py | 2 +- .../scheduled_job_type/scheduled_job_type.py | 2 +- frappe/core/doctype/user/user.py | 19 +++++++++---------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/frappe/core/doctype/activity_log/feed.py b/frappe/core/doctype/activity_log/feed.py index cf8f7416e8..92e18d4a5a 100644 --- a/frappe/core/doctype/activity_log/feed.py +++ b/frappe/core/doctype/activity_log/feed.py @@ -29,9 +29,9 @@ def update_feed(doc, method=None): name = feed.name or doc.name - frappe.db.delete(doctype="Activity Log", conditions={"reference_doctype": doctype, - "reference_name": name, - "link_doctype": name.feed.link_doctype}) + frappe.db.delete("Activity Log", {"reference_doctype": doctype, + "reference_name": name, + "link_doctype": name.feed.link_doctype}) # frappe.db.sql("""delete from `tabActivity Log` # where # reference_doctype=%s and reference_name=%s diff --git a/frappe/core/doctype/domain_settings/domain_settings.py b/frappe/core/doctype/domain_settings/domain_settings.py index 6ca180def1..4ed9d1e15a 100644 --- a/frappe/core/doctype/domain_settings/domain_settings.py +++ b/frappe/core/doctype/domain_settings/domain_settings.py @@ -34,7 +34,7 @@ class DomainSettings(Document): all_domains = list((frappe.get_hooks('domains') or {})) def remove_role(role): - frappe.db.delete(doctype="Has Role", conditions={"role": role}) + frappe.db.delete("Has Role", {"role": role}) # frappe.db.sql('delete from `tabHas Role` where role=%s', role) frappe.set_value('Role', role, 'disabled', 1) diff --git a/frappe/core/doctype/error_log/error_log.py b/frappe/core/doctype/error_log/error_log.py index 8223238c57..9a7333995c 100644 --- a/frappe/core/doctype/error_log/error_log.py +++ b/frappe/core/doctype/error_log/error_log.py @@ -20,4 +20,5 @@ def set_old_logs_as_seen(): def clear_error_logs(): '''Flush all Error Logs''' frappe.only_for('System Manager') - frappe.db.sql('''DELETE FROM `tabError Log`''') \ No newline at end of file + frappe.db.delete("Error Log") + # frappe.db.sql('''DELETE FROM `tabError Log`''') \ No newline at end of file diff --git a/frappe/core/doctype/report/test_report.py b/frappe/core/doctype/report/test_report.py index 2bab6adf19..2ac41cca2b 100644 --- a/frappe/core/doctype/report/test_report.py +++ b/frappe/core/doctype/report/test_report.py @@ -83,7 +83,7 @@ class TestReport(unittest.TestCase): def test_report_permissions(self): frappe.set_user('test@example.com') - frappe.db.delete(doctype="Has Role", conditions={ + frappe.db.delete("Has Role", { "parent": frappe.session.user, "role": "Test Has Role" }) diff --git a/frappe/core/doctype/role/role.py b/frappe/core/doctype/role/role.py index fae8ae2d28..dee25eb476 100644 --- a/frappe/core/doctype/role/role.py +++ b/frappe/core/doctype/role/role.py @@ -38,7 +38,7 @@ class Role(Document): self.set(key, 0) def remove_roles(self): - frappe.db.delete(doctype="Has Role", conditions={"role": self.name}) + frappe.db.delete("Has Role", {"role": self.name}) # frappe.db.sql("delete from `tabHas Role` where role = %s", self.name) frappe.clear_cache() diff --git a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py index d6c94aded1..9882f0edfe 100644 --- a/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py +++ b/frappe/core/doctype/scheduled_job_type/scheduled_job_type.py @@ -110,7 +110,7 @@ class ScheduledJobType(Document): def on_trash(self): - frappe.db.delete(doctype="Scheduled Job Log", conditions={ + frappe.db.delete("Scheduled Job Log", { "scheduled_job_type": self.name }) # frappe.db.sql('delete from `tabScheduled Job Log` where scheduled_job_type=%s', self.name) diff --git a/frappe/core/doctype/user/user.py b/frappe/core/doctype/user/user.py index f69af4e4a8..166f61de8d 100644 --- a/frappe/core/doctype/user/user.py +++ b/frappe/core/doctype/user/user.py @@ -17,7 +17,6 @@ from frappe.website.utils import is_signup_disabled from frappe.rate_limiter import rate_limit from frappe.utils.background_jobs import enqueue from frappe.core.doctype.user_type.user_type import user_linked_with_permission_on_doctype -from frappe.database.database import Database STANDARD_USERS = ("Guest", "Administrator") @@ -382,15 +381,15 @@ class User(Document): # frappe.db.sql("""delete from `tabDocShare` where user=%s""", self.name) # delete messages - # TODO: CHANGE THIS FROM ABHISHEK KA PYPIKA - frappe.db.delete("Communication", { - "reference_doctype": "User", - "communication_type": ("in", ("Chat", "Notification")), - }) - # frappe.db.sql("""delete from `tabCommunication` - # where communication_type in ('Chat', 'Notification') - # and reference_doctype='User' - # and (reference_name=%s or owner=%s)""", (self.name, self.name)) + + # frappe.db.delete("Communication", { + # "reference_doctype": "User", + # "communication_type": ("in", ("Chat", "Notification")), + # }) + frappe.db.sql("""delete from `tabCommunication` + where communication_type in ('Chat', 'Notification') + and reference_doctype='User' + and (reference_name=%s or owner=%s)""", (self.name, self.name)) # unlink contact frappe.db.sql("""update `tabContact` From 79ccaa95f3aff078a3ebdc68291b270b7cbeed26 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 23:29:50 +0530 Subject: [PATCH 0448/1519] refactor: Moved raw queries to frappe orm --- .../personal_data_deletion_request.py | 18 ++++++++++++------ .../doctype/workflow_action/workflow_action.py | 12 +++++++++--- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py index 63ba96d138..b23c7fa11d 100644 --- a/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py +++ b/frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py @@ -323,12 +323,18 @@ class PersonalDataDeletionRequest(Document): def remove_unverified_record(): - frappe.db.sql( - """ - DELETE FROM `tabPersonal Data Deletion Request` - WHERE `status` = 'Pending Verification' - AND `creation` < (NOW() - INTERVAL '7' DAY)""" - ) + + frappe.db.delete("Personal Data Deletion Request", { + "status": "Pending Verification", + "creation": ("<", ["Now()", "-", "INTERVAL 7 DAY"]) + }) + + # frappe.db.sql( + # """ + # DELETE FROM `tabPersonal Data Deletion Request` + # WHERE `status` = 'Pending Verification' + # AND `creation` < (NOW() - INTERVAL '7' DAY)""" + # ) @frappe.whitelist(allow_guest=True) diff --git a/frappe/workflow/doctype/workflow_action/workflow_action.py b/frappe/workflow/doctype/workflow_action/workflow_action.py index b70ffb2406..af168d3477 100644 --- a/frappe/workflow/doctype/workflow_action/workflow_action.py +++ b/frappe/workflow/doctype/workflow_action/workflow_action.py @@ -133,9 +133,15 @@ def return_link_expired_page(doc, doc_workflow_state): def clear_old_workflow_actions(doc, user=None): user = user if user else frappe.session.user - frappe.db.sql("""DELETE FROM `tabWorkflow Action` - WHERE `reference_doctype`=%s AND `reference_name`=%s AND `user`!=%s AND `status`='Open'""", - (doc.get('doctype'), doc.get('name'), user)) + frappe.db.delete("Workflow Action", { + "reference_doctype": doc.get("doctype"), + "reference_name": doc.get("name"), + "user": ("!=", user), + "status": "Open" + }) + # frappe.db.sql("""DELETE FROM `tabWorkflow Action` + # WHERE `reference_doctype`=%s AND `reference_name`=%s AND `user`!=%s AND `status`='Open'""", + # (doc.get('doctype'), doc.get('name'), user)) def update_completed_workflow_actions(doc, user=None): user = user if user else frappe.session.user From 888783682072330987f713bd700b8bb1f7db916d Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 23:31:15 +0530 Subject: [PATCH 0449/1519] refactor: Moved util queries to frappe orm --- frappe/utils/global_search.py | 25 +++++++++++++++++-------- frappe/utils/password.py | 15 +++++++++++---- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 8fa2ea474f..a018761370 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -23,7 +23,8 @@ def reset(): Deletes all data in __global_search :return: """ - frappe.db.sql('DELETE FROM `__global_search`') + frappe.db.delete("__global_search") + # frappe.db.sql('DELETE FROM `__global_search`') def get_doctypes_with_global_search(with_child_tables=True): @@ -146,9 +147,12 @@ def rebuild_for_doctype(doctype): def delete_global_search_records_for_doctype(doctype): - frappe.db.sql('''DELETE - FROM `__global_search` - WHERE doctype = %s''', doctype, as_dict=True) + frappe.db.delete("__global_search", { + "doctype": doctype + }) + # frappe.db.sql('''DELETE + # FROM `__global_search` + # WHERE doctype = %s''', doctype, as_dict=True) def get_selected_fields(meta, global_search_fields): @@ -400,10 +404,15 @@ def delete_for_document(doc): :param doc: Deleted document """ - frappe.db.sql('''DELETE - FROM `__global_search` - WHERE doctype = %s - AND name = %s''', (doc.doctype, doc.name), as_dict=True) + frappe.db.delete("__global_search", { + "doctype": doc.doctype, + "name": doc.name + }) + + # frappe.db.sql('''DELETE + # FROM `__global_search` + # WHERE doctype = %s + # AND name = %s''', (doc.doctype, doc.name), as_dict=True) @frappe.whitelist() diff --git a/frappe/utils/password.py b/frappe/utils/password.py index 428f2e9577..caa89af64e 100644 --- a/frappe/utils/password.py +++ b/frappe/utils/password.py @@ -65,10 +65,17 @@ def set_encrypted_password(doctype, name, pwd, fieldname='password'): def remove_encrypted_password(doctype, name, fieldname='password'): - frappe.db.sql( - 'DELETE FROM `__Auth` WHERE doctype = %s and name = %s and fieldname = %s', - values=[doctype, name, fieldname] - ) + + frappe.db.delete("__Auth", { + "doctype": doctype, + "name": name, + "fieldname": fieldname + }) + + # frappe.db.sql( + # 'DELETE FROM `__Auth` WHERE doctype = %s and name = %s and fieldname = %s', + # values=[doctype, name, fieldname] + # ) def check_password(user, pwd, doctype='User', fieldname='password', delete_tracker_cache=True): From 8feb430371d38b34ca90f6ae2f08bd651e812a64 Mon Sep 17 00:00:00 2001 From: Aradhya-Tripathi Date: Wed, 21 Jul 2021 23:32:18 +0530 Subject: [PATCH 0450/1519] refactor: Moved raw queries to frappe orm --- frappe/model/__init__.py | 2 +- frappe/model/delete_doc.py | 8 ++++++-- .../v11_0/apply_customization_to_custom_doctype.py | 10 ++++++++-- .../v11_0/sync_stripe_settings_before_migrate.py | 5 ++++- .../v12_0/delete_feedback_request_if_exists.py | 11 +++++++---- .../v12_0/remove_deprecated_fields_from_doctype.py | 12 ++++++++---- 6 files changed, 34 insertions(+), 14 deletions(-) diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py index 763fd36cc7..99eaa7ff5d 100644 --- a/frappe/model/__init__.py +++ b/frappe/model/__init__.py @@ -154,7 +154,7 @@ def delete_fields(args_dict, delete=0): frappe.db.delete("DocField", { "parent": dt, - "fieldname": ("in", ", ".join(["'{}'".format(f) for f in fields])) + "fieldname": ("in", fields) }) # frappe.db.sql(""" # DELETE FROM `tabDocField` diff --git a/frappe/model/delete_doc.py b/frappe/model/delete_doc.py index ec53d060fd..9b5ebb1031 100644 --- a/frappe/model/delete_doc.py +++ b/frappe/model/delete_doc.py @@ -369,8 +369,12 @@ def clear_references(doctype, reference_doctype, reference_name, (reference_doctype, reference_name)) def clear_timeline_references(link_doctype, link_name): - frappe.db.sql("""DELETE FROM `tabCommunication Link` - WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name)) + frappe.db.delete("Communication Link", { + "link_doctype": link_doctype, + "link_name": link_name + }) + # frappe.db.sql("""DELETE FROM `tabCommunication Link` + # WHERE `tabCommunication Link`.link_doctype=%s AND `tabCommunication Link`.link_name=%s""", (link_doctype, link_name)) def insert_feed(doc): if ( diff --git a/frappe/patches/v11_0/apply_customization_to_custom_doctype.py b/frappe/patches/v11_0/apply_customization_to_custom_doctype.py index 49b68ed240..c13ff83a1f 100644 --- a/frappe/patches/v11_0/apply_customization_to_custom_doctype.py +++ b/frappe/patches/v11_0/apply_customization_to_custom_doctype.py @@ -28,7 +28,10 @@ def execute(): for prop in property_setters: property_setter_map[prop.field_name] = prop - frappe.db.sql('DELETE FROM `tabProperty Setter` WHERE `name`=%s', prop.name) + frappe.db.delete("Property Setter", { + "name": prop.name + }) + # frappe.db.sql('DELETE FROM `tabProperty Setter` WHERE `name`=%s', prop.name) meta = frappe.get_meta(doctype.name) @@ -50,6 +53,9 @@ def execute(): df = frappe.new_doc('DocField', meta, 'fields') df.update(cf) meta.fields.append(df) - frappe.db.sql('DELETE FROM `tabCustom Field` WHERE name=%s', cf.name) + frappe.db.delete("Custom Field", { + "name": cf.name + }) + # frappe.db.sql('DELETE FROM `tabCustom Field` WHERE name=%s', cf.name) meta.save() diff --git a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py index a8e9bd4de1..1a12d4dc1d 100644 --- a/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py +++ b/frappe/patches/v11_0/sync_stripe_settings_before_migrate.py @@ -17,4 +17,7 @@ def execute(): settings.secret_key = secret_key settings.save(ignore_permissions=True) - frappe.db.sql("""DELETE FROM tabSingles WHERE doctype='Stripe Settings'""") \ No newline at end of file + frappe.db.delete("Singles", { + "doctype": "Stripe Settings" + }) + # frappe.db.sql("""DELETE FROM tabSingles WHERE doctype='Stripe Settings'""") \ No newline at end of file diff --git a/frappe/patches/v12_0/delete_feedback_request_if_exists.py b/frappe/patches/v12_0/delete_feedback_request_if_exists.py index fdbcecfc5a..537d509424 100644 --- a/frappe/patches/v12_0/delete_feedback_request_if_exists.py +++ b/frappe/patches/v12_0/delete_feedback_request_if_exists.py @@ -2,7 +2,10 @@ import frappe def execute(): - frappe.db.sql(''' - DELETE from `tabDocType` - WHERE name = 'Feedback Request' - ''') \ No newline at end of file + frappe.db.delete("DocType", { + "name": "Feedback Request" + }) + # frappe.db.sql(''' + # DELETE from `tabDocType` + # WHERE name = 'Feedback Request' + # ''') \ No newline at end of file diff --git a/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py b/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py index 60599066e6..17dfbc5ca1 100644 --- a/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py +++ b/frappe/patches/v12_0/remove_deprecated_fields_from_doctype.py @@ -8,7 +8,11 @@ def execute(): 'DocType': ['hide_heading', 'image_view', 'read_only_onload'] }, delete=1) - frappe.db.sql(''' - DELETE from `tabProperty Setter` - WHERE property = 'read_only_onload' - ''') + frappe.db.delete("Property Setter", { + "property": "read_only_onload" + }) + + # frappe.db.sql(''' + # DELETE from `tabProperty Setter` + # WHERE property = 'read_only_onload' + # ''') From 6f70dcf52dd66cc2d200d41c07ad7900a10aa58e Mon Sep 17 00:00:00 2001 From: Suraj Shetty Date: Thu, 22 Jul 2021 12:02:47 +0530 Subject: [PATCH 0451/1519] test: Add navingation test case --- cypress/integration/navigation.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 cypress/integration/navigation.js diff --git a/cypress/integration/navigation.js b/cypress/integration/navigation.js new file mode 100644 index 0000000000..3fe12f3547 --- /dev/null +++ b/cypress/integration/navigation.js @@ -0,0 +1,15 @@ +context('Navigation', () => { + before(() => { + cy.login(); + cy.visit('/app/website'); + }); + it('Navigate to route with hash in document name', () => { + cy.insert_doc('ToDo', {'__newname': 'ABC#123', 'description': 'Test this', 'ignore_duplicate': true}); + cy.visit('/app/todo/ABC#123'); + cy.title().should('eq', 'Test this - ABC#123'); + cy.get_field('description', 'Text Editor').contains('Test this'); + cy.go('back'); + cy.title().should('eq', 'Website'); + cy.remove_doc('ToDo', 'ABC#123'); + }); +}); \ No newline at end of file From a9cab2cf786560689678be4a686d113c83e414aa Mon Sep 17 00:00:00 2001 From: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com> Date: Thu, 22 Jul 2021 13:07:31 +0530 Subject: [PATCH 0452/1519] test: Remove `remove_doc`. to avoid flaky test --- cypress/integration/navigation.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cypress/integration/navigation.js b/cypress/integration/navigation.js index 3fe12f3547..7e1426aa46 100644 --- a/cypress/integration/navigation.js +++ b/cypress/integration/navigation.js @@ -10,6 +10,5 @@ context('Navigation', () => { cy.get_field('description', 'Text Editor').contains('Test this'); cy.go('back'); cy.title().should('eq', 'Website'); - cy.remove_doc('ToDo', 'ABC#123'); }); -}); \ No newline at end of file +}); From eff9f10f5d46663c01f14b8f67cc3e1d52ab3b65 Mon Sep 17 00:00:00 2001 From: Faris Ansari Date: Fri, 23 Jul 2021 01:48:39 +0530 Subject: [PATCH 0453/1519] fix: UX for Fetch From --- frappe/core/doctype/doctype/doctype.js | 88 +++++++++++++++++++ .../public/js/frappe/form/controls/select.js | 2 + 2 files changed, 90 insertions(+) diff --git a/frappe/core/doctype/doctype/doctype.js b/frappe/core/doctype/doctype/doctype.js index b4d3fb9a89..4039bf12a4 100644 --- a/frappe/core/doctype/doctype/doctype.js +++ b/frappe/core/doctype/doctype/doctype.js @@ -67,3 +67,91 @@ frappe.ui.form.on('DocType', { frm.set_df_property('fields', 'reqd', frm.doc.autoname !== 'Prompt'); } }) + +frappe.ui.form.on("DocField", { + form_render(frm, doctype, docname) { + // Render two select fields for Fetch From instead of Small Text for better UX + let field = frm.cur_grid.grid_form.fields_dict.fetch_from; + $(field.input_area).hide(); + + let $doctype_select = $(``); + let $wrapper = $('
    '); + $wrapper.append($doctype_select, $field_select); + field.$input_wrapper.append($wrapper); + $doctype_select.wrap('
    '); + $field_select.wrap('
    '); + + let row = frappe.get_doc(doctype, docname); + let curr_value = { doctype: null, fieldname: null }; + if (row.fetch_from) { + let [doctype, fieldname] = row.fetch_from.split("."); + curr_value.doctype = doctype; + curr_value.fieldname = fieldname; + } + let curr_df_link_doctype = row.fieldtype == "Link" ? row.options : null; + + let doctypes = frm.doc.fields + .filter(df => df.fieldtype == "Link") + .filter(df => df.options && df.options != curr_df_link_doctype) + .map(df => ({ + label: `${df.options} (${df.fieldname})`, + value: df.fieldname + })); + $doctype_select.add_options([ + { label: __("Select DocType"), value: "", selected: true }, + ...doctypes + ]); + + $doctype_select.on("change", () => { + row.fetch_from = ""; + frm.dirty(); + update_fieldname_options(); + }); + + function update_fieldname_options() { + $field_select.find("option").remove(); + + let link_fieldname = $doctype_select.val(); + if (!link_fieldname) return; + let link_field = frm.doc.fields.find( + df => df.fieldname === link_fieldname + ); + let link_doctype = link_field.options; + frappe.model.with_doctype(link_doctype, () => { + let fields = frappe.meta + .get_docfields(link_doctype, null, { + fieldtype: ["not in", frappe.model.no_value_type] + }) + .map(df => ({ + label: `${df.label} (${df.fieldtype})`, + value: df.fieldname + })); + $field_select.add_options([ + { + label: __("Select Field"), + value: "", + selected: true, + disabled: true + }, + ...fields + ]); + + if (curr_value.fieldname) { + $field_select.val(curr_value.fieldname); + } + }); + } + + $field_select.on("change", e => { + let fetch_from = `${$doctype_select.val()}.${$field_select.val()}`; + row.fetch_from = fetch_from; + frm.dirty(); + }); + + if (curr_value.doctype) { + $doctype_select.val(curr_value.doctype); + update_fieldname_options(); + } + } +}); diff --git a/frappe/public/js/frappe/form/controls/select.js b/frappe/public/js/frappe/form/controls/select.js index 042d86814d..7df2bbfbaa 100644 --- a/frappe/public/js/frappe/form/controls/select.js +++ b/frappe/public/js/frappe/form/controls/select.js @@ -113,6 +113,7 @@ frappe.ui.form.ControlSelect = class ControlSelect extends frappe.ui.form.Contro var is_value_null = is_null(v.value); var is_label_null = is_null(v.label); var is_disabled = Boolean(v.disabled); + var is_selected = Boolean(v.selected); if (is_value_null && is_label_null) { value = v; @@ -126,6 +127,7 @@ frappe.ui.form.ControlSelect = class ControlSelect extends frappe.ui.form.Contro $('