From d73c3f622e43c74815526250e2fe940c03705965 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Fri, 8 Nov 2019 01:20:45 +0530 Subject: [PATCH 1/6] chore(chat): update chat doctypes --- .../doctype/chat_message/chat_message.json | 230 +--------- .../doctype/chat_profile/chat_profile.json | 405 ++++-------------- frappe/chat/doctype/chat_room/chat_room.json | 270 +----------- .../chat_room_user/chat_room_user.json | 132 ++---- .../chat/doctype/chat_token/chat_token.json | 118 +---- .../doctype/chat_token/test_chat_token.py | 10 + 6 files changed, 174 insertions(+), 991 deletions(-) create mode 100644 frappe/chat/doctype/chat_token/test_chat_token.py diff --git a/frappe/chat/doctype/chat_message/chat_message.json b/frappe/chat/doctype/chat_message/chat_message.json index c37923b341..ea3491acfa 100644 --- a/frappe/chat/doctype/chat_message/chat_message.json +++ b/frappe/chat/doctype/chat_message/chat_message.json @@ -1,282 +1,88 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, "beta": 1, "creation": "2017-11-10 11:10:40.011099", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "room_type", + "type", + "user", + "room", + "content", + "mentions", + "urls" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "room_type", "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": "Room Type", - "length": 0, - "no_copy": 0, "options": "Direct\nGroup\nVisitor", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "type", "fieldtype": "Data", - "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": "Type", - "length": 0, - "no_copy": 0, - "options": "Content\nFile", - "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": "Content\nFile" }, { - "allow_bulk_edit": 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": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "read_only": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "room", "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": "Room", - "length": 0, - "no_copy": 0, "options": "Chat Room", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "content", "fieldtype": "Text", - "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": "Content", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "reqd": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "mentions", "fieldtype": "Code", "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": "Mentions", - "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 + "label": "Mentions" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "urls", "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": "URLs", - "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 + "label": "URLs" } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-03-29 12:41:10.890765", - "modified_by": "achilles@erpnext.com", + "modified": "2019-11-07 13:21:19.395927", + "modified_by": "Administrator", "module": "Chat", "name": "Chat Message", - "name_case": "", "owner": "arjun@gmail.com", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 } ], "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, "search_fields": "content, user", - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", "title_field": "content", diff --git a/frappe/chat/doctype/chat_profile/chat_profile.json b/frappe/chat/doctype/chat_profile/chat_profile.json index acf883ea4f..f585924930 100644 --- a/frappe/chat/doctype/chat_profile/chat_profile.json +++ b/frappe/chat/doctype/chat_profile/chat_profile.json @@ -1,340 +1,99 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "field:user", - "beta": 1, - "creation": "2017-11-13 18:26:57.943027", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "autoname": "field:user", + "beta": 1, + "creation": "2017-11-13 18:26:57.943027", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "user", + "status", + "chat_background", + "notifications", + "message_preview", + "notification_tones", + "conversation_tones", + "settings", + "enable_chat" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_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": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "user", + "fieldtype": "Link", + "label": "User", + "options": "User", + "reqd": 1, + "unique": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Online", - "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": "Online\nAway\nBusy\nOffline", - "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, - "unique": 0 - }, + "default": "Online", + "fieldname": "status", + "fieldtype": "Select", + "in_list_view": 1, + "label": "Status", + "options": "Online\nAway\nBusy\nOffline" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "chat_background", - "fieldtype": "Attach Image", - "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": "Chat Background", - "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, - "unique": 0 - }, + "fieldname": "chat_background", + "fieldtype": "Attach Image", + "label": "Chat Background" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "notifications", - "fieldtype": "Section Break", - "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": "Notifications", - "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, - "unique": 0 - }, + "fieldname": "notifications", + "fieldtype": "Section Break", + "label": "Notifications" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "fieldname": "message_preview", - "fieldtype": "Check", - "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": "Message Preview", - "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, - "unique": 0 - }, + "default": "1", + "fieldname": "message_preview", + "fieldtype": "Check", + "label": "Message Preview" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "fieldname": "notification_tones", - "fieldtype": "Check", - "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": "Notification Tones", - "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, - "unique": 0 - }, + "default": "1", + "fieldname": "notification_tones", + "fieldtype": "Check", + "label": "Notification Tones" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "fieldname": "conversation_tones", - "fieldtype": "Check", - "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": "Conversation Tones", - "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, - "unique": 0 - }, + "default": "1", + "fieldname": "conversation_tones", + "fieldtype": "Check", + "label": "Conversation Tones" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "settings", - "fieldtype": "Section Break", - "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": "Settings", - "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, - "unique": 0 - }, + "fieldname": "settings", + "fieldtype": "Section Break", + "label": "Settings" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "fieldname": "enable_chat", - "fieldtype": "Check", - "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": "Enable Chat", - "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, - "unique": 0 + "default": "1", + "fieldname": "enable_chat", + "fieldtype": "Check", + "label": "Enable Chat" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 1, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-01-18 07:27:35.718898", - "modified_by": "faris@erpnext.com", - "module": "Chat", - "name": "Chat Profile", - "name_case": "", - "owner": "Administrator", + ], + "in_create": 1, + "modified": "2019-11-07 13:21:36.414961", + "modified_by": "Administrator", + "module": "Chat", + "name": "Chat Profile", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 + ], + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 } \ No newline at end of file diff --git a/frappe/chat/doctype/chat_room/chat_room.json b/frappe/chat/doctype/chat_room/chat_room.json index 0060a04b65..1417306c45 100644 --- a/frappe/chat/doctype/chat_room/chat_room.json +++ b/frappe/chat/doctype/chat_room/chat_room.json @@ -1,330 +1,100 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, "autoname": "CR.#####", "beta": 1, "creation": "2017-11-08 15:27:21.156667", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "type", + "room_name", + "avatar", + "last_message", + "message_count", + "owner", + "user_list", + "users" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "default": "Direct", "fieldname": "type", "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": "Type", - "length": 0, - "no_copy": 0, "options": "Direct\nGroup\nVisitor", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, "reqd": 1, - "search_index": 0, - "set_only_once": 1, - "translatable": 0, - "unique": 0 + "set_only_once": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "depends_on": "eval:doc.type==\"Group\"", "fieldname": "room_name", "fieldtype": "Data", - "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": "Name", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "label": "Name" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "depends_on": "eval:doc.type==\"Group\"", "fieldname": "avatar", "fieldtype": "Attach Image", "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": "Avatar", - "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 + "label": "Avatar" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "last_message", "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": "Last Message", - "length": 0, - "no_copy": 0, - "options": "", - "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 + "label": "Last Message" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "message_count", "fieldtype": "Int", "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": "Message Count", - "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 + "label": "Message Count" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "", "fieldname": "owner", "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": "Owner", - "length": 0, - "no_copy": 0, - "options": "", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 1, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "read_only": 1 }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "user_list", "fieldtype": "Section Break", - "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": "Users", - "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 + "label": "Users" }, { - "allow_bulk_edit": 0, - "allow_in_quick_entry": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "users", "fieldtype": "Table", - "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": "Users", - "length": 0, - "no_copy": 0, - "options": "Chat Room 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": "Chat Room User" } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, "image_field": "avatar", - "image_view": 0, - "in_create": 0, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-08-16 10:45:13.970081", + "modified": "2019-11-07 13:20:24.625329", "modified_by": "Administrator", "module": "Chat", "name": "Chat Room", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", "set_user_permissions": 1, "share": 1, - "submit": 0, "write": 1 } ], - "quick_entry": 0, - "read_only": 0, - "read_only_onload": 0, "search_fields": "room_name", "show_name_in_global_search": 1, "sort_field": "modified", "sort_order": "DESC", "title_field": "room_name", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + "track_changes": 1 } \ No newline at end of file diff --git a/frappe/chat/doctype/chat_room_user/chat_room_user.json b/frappe/chat/doctype/chat_room_user/chat_room_user.json index 24ea4ff81f..f7bdf6706b 100644 --- a/frappe/chat/doctype/chat_room_user/chat_room_user.json +++ b/frappe/chat/doctype/chat_room_user/chat_room_user.json @@ -1,104 +1,40 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, - "autoname": "", - "beta": 1, - "creation": "2017-11-08 15:24:21.029314", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "beta": 1, + "creation": "2017-11-08 15:24:21.029314", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "user", + "is_admin" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "user", - "fieldtype": "Link", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "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": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "user", + "fieldtype": "Link", + "in_list_view": 1, + "label": "User", + "options": "User", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "0", - "fieldname": "is_admin", - "fieldtype": "Check", - "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": "Admin", - "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, - "unique": 0 + "default": "0", + "fieldname": "is_admin", + "fieldtype": "Check", + "label": "Admin" } - ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 1, - "is_submittable": 0, - "issingle": 0, - "istable": 1, - "max_attachments": 0, - "modified": "2018-01-02 17:12:12.622244", - "modified_by": "achilles@erpnext.com", - "module": "Chat", - "name": "Chat Room User", - "name_case": "", - "owner": "Administrator", - "permissions": [], - "quick_entry": 1, - "read_only": 1, - "read_only_onload": 0, - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 + ], + "in_create": 1, + "istable": 1, + "modified": "2019-11-07 13:21:05.297337", + "modified_by": "Administrator", + "module": "Chat", + "name": "Chat Room User", + "owner": "Administrator", + "permissions": [], + "quick_entry": 1, + "read_only": 1, + "sort_field": "modified", + "sort_order": "DESC", + "track_changes": 1 } \ No newline at end of file diff --git a/frappe/chat/doctype/chat_token/chat_token.json b/frappe/chat/doctype/chat_token/chat_token.json index f7fc1d98a3..40b85c5c6e 100644 --- a/frappe/chat/doctype/chat_token/chat_token.json +++ b/frappe/chat/doctype/chat_token/chat_token.json @@ -1,156 +1,58 @@ { - "allow_copy": 0, - "allow_guest_to_view": 0, - "allow_import": 0, - "allow_rename": 0, "autoname": "field:token", "beta": 1, "creation": "2018-03-26 18:20:13.825652", - "custom": 0, - "docstatus": 0, "doctype": "DocType", - "document_type": "", "editable_grid": 1, "engine": "InnoDB", + "field_order": [ + "token", + "ip_address", + "country" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "token", "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, "in_list_view": 1, - "in_standard_filter": 0, "label": "Token", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "translatable": 0, - "unique": 0 + "unique": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "ip_address", "fieldtype": "Data", - "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": "IP Address", - "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 + "label": "IP Address" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "country", "fieldtype": "Data", - "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": "Country", - "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 + "label": "Country" } ], - "has_web_view": 0, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, "in_create": 1, - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-03-26 18:35:55.651273", + "modified": "2019-11-07 13:21:24.514558", "modified_by": "Administrator", "module": "Chat", "name": "Chat Token", - "name_case": "", "owner": "Administrator", "permissions": [ { - "amend": 0, - "apply_user_permissions": 0, - "cancel": 0, "create": 1, "delete": 1, "email": 1, "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, "print": 1, "read": 1, "report": 1, "role": "System Manager", - "set_user_permissions": 0, "share": 1, - "submit": 0, "write": 1 } ], "quick_entry": 1, "read_only": 1, - "read_only_onload": 0, - "show_name_in_global_search": 0, "sort_field": "modified", "sort_order": "DESC", - "track_changes": 1, - "track_seen": 0 + "track_changes": 1 } \ No newline at end of file diff --git a/frappe/chat/doctype/chat_token/test_chat_token.py b/frappe/chat/doctype/chat_token/test_chat_token.py new file mode 100644 index 0000000000..cbc9a4cc4b --- /dev/null +++ b/frappe/chat/doctype/chat_token/test_chat_token.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- +# Copyright (c) 2019, Frappe Technologies and Contributors +# See license.txt +from __future__ import unicode_literals + +# import frappe +import unittest + +class TestChatToken(unittest.TestCase): + pass From 7d6c381f0149716e336a41b21a8b97292d6610dd Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Sat, 9 Nov 2019 08:20:15 +0530 Subject: [PATCH 2/6] fix(chat): namespace fixing and build.json updates updated build.json for visitor chat, added desk namespace on desk load, removed redundant frappe.desk.* namespaces --- frappe/public/build.json | 5 ++++- frappe/public/js/frappe/desk.js | 1 + frappe/public/js/frappe/provide.js | 2 -- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index 6c67c17374..debd4e7482 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -1,7 +1,10 @@ { "css/frappe-web-b4.css": [ + "public/css/font-awesome.css", + "public/css/octicons/octicons.css", + "public/scss/website.scss", "public/less/indicator.less", - "public/scss/website.scss" + "public/less/chat.less" ], "concat:js/moment-bundle.min.js": [ "node_modules/moment/min/moment-with-locales.min.js", diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js index 5a972e0dbe..3deeb02ae4 100644 --- a/frappe/public/js/frappe/desk.js +++ b/frappe/public/js/frappe/desk.js @@ -9,6 +9,7 @@ frappe.start_app = function() { return; frappe.assets.check(); frappe.provide('frappe.app'); + frappe.provide('frappe.desk'); frappe.app = new frappe.Application(); }; diff --git a/frappe/public/js/frappe/provide.js b/frappe/public/js/frappe/provide.js index 5535fba1c5..1dacc4dd47 100644 --- a/frappe/public/js/frappe/provide.js +++ b/frappe/public/js/frappe/provide.js @@ -27,8 +27,6 @@ frappe.provide("frappe.ui.form"); frappe.provide("frappe.modules"); frappe.provide("frappe.templates"); frappe.provide("frappe.test_data"); -frappe.provide('frappe.desk.form'); -frappe.provide('frappe.desk.report'); frappe.provide('frappe.utils'); frappe.provide('frappe.model'); frappe.provide('frappe.user'); From 5d847da35112ddde56d912e734da70e9f30faf3e Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 11 Nov 2019 15:22:27 +0530 Subject: [PATCH 3/6] fix(chat): css and socketio for visitor chat --- frappe/public/less/chat.less | 22 +++++++++++++++++----- frappe/templates/base.html | 1 + 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/frappe/public/less/chat.less b/frappe/public/less/chat.less index 15185d95d6..05e2243504 100644 --- a/frappe/public/less/chat.less +++ b/frappe/public/less/chat.less @@ -1,9 +1,8 @@ // Author - Achilles Rasquinha - // http://codeguide.co - @mdo (Author of Bootstrap) + @import "flex.less"; -@import (reference) "common.less"; // Typography @font-weight-bold: 700; @@ -105,8 +104,6 @@ .panel-heading { - // height: 50px; - .panel-title { .media-heading @@ -116,6 +113,10 @@ padding: 0px; } + .media-left { + padding-right: 10px; + } + .media-subtitle { font-size: 12px; @@ -151,7 +152,6 @@ { .media-heading, .media-subtitle { - .ellipsis; max-width: @chat-room-list-content-max-width; } } @@ -440,3 +440,15 @@ padding: 5px; // background-color: white; } + +// v12 fixes for visitor chat +.panel-default > .panel-heading { + background-color: #f7fafc; + border-color: #ced5db; + display: flex; +} + +textarea.form-control { + resize: none; + height: 3.2em; +} \ No newline at end of file diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 1c5f286442..fbeae433d5 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -76,6 +76,7 @@ {% block base_scripts %} + {% endblock %} From 873e8879221f81a3ec3986b86ce70673dfb18f21 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 11 Nov 2019 17:18:56 +0530 Subject: [PATCH 4/6] chore: include css/js only if chat is enabled --- frappe/public/build.json | 6 ++++-- frappe/templates/base.html | 1 - frappe/website/doctype/website_settings/website_settings.py | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frappe/public/build.json b/frappe/public/build.json index debd4e7482..ddca0bbc7e 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -1,9 +1,11 @@ { "css/frappe-web-b4.css": [ + "public/scss/website.scss", + "public/less/indicator.less" + ], + "css/frappe-chat-web.css": [ "public/css/font-awesome.css", "public/css/octicons/octicons.css", - "public/scss/website.scss", - "public/less/indicator.less", "public/less/chat.less" ], "concat:js/moment-bundle.min.js": [ diff --git a/frappe/templates/base.html b/frappe/templates/base.html index fbeae433d5..1c5f286442 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -76,7 +76,6 @@ {% block base_scripts %} - {% endblock %} diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index 64558e751a..1dd78084d9 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -105,6 +105,10 @@ def get_website_settings(): context.web_include_css = hooks.web_include_css or [] + if settings.chat_enable: + context.web_include_css += ["/assets/css/frappe-chat-web.css"] + context.web_include_js += ["/assets/frappe/js/lib/socket.io.min.js"] + via_hooks = frappe.get_hooks("website_context") for key in via_hooks: context[key] = via_hooks[key] From 9aa0f9750d582046287555285e91b35ff54c5552 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Mon, 11 Nov 2019 17:31:28 +0530 Subject: [PATCH 5/6] chore(chat): delete redundant test files --- .../doctype/chat_message/test_chat_message.js | 23 ------- .../doctype/chat_message/test_chat_message.py | 19 ------ .../doctype/chat_profile/test_chat_profile.js | 23 ------- .../doctype/chat_profile/test_chat_profile.py | 60 ------------------- .../chat/doctype/chat_room/test_chat_room.js | 23 ------- .../chat/doctype/chat_room/test_chat_room.py | 10 ---- .../doctype/chat_token/test_chat_token.js | 23 ------- .../doctype/chat_token/test_chat_token.py | 10 ---- 8 files changed, 191 deletions(-) delete mode 100644 frappe/chat/doctype/chat_message/test_chat_message.js delete mode 100644 frappe/chat/doctype/chat_message/test_chat_message.py delete mode 100644 frappe/chat/doctype/chat_profile/test_chat_profile.js delete mode 100644 frappe/chat/doctype/chat_profile/test_chat_profile.py delete mode 100644 frappe/chat/doctype/chat_room/test_chat_room.js delete mode 100644 frappe/chat/doctype/chat_room/test_chat_room.py delete mode 100644 frappe/chat/doctype/chat_token/test_chat_token.js delete mode 100644 frappe/chat/doctype/chat_token/test_chat_token.py diff --git a/frappe/chat/doctype/chat_message/test_chat_message.js b/frappe/chat/doctype/chat_message/test_chat_message.js deleted file mode 100644 index b117f366ce..0000000000 --- a/frappe/chat/doctype/chat_message/test_chat_message.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Chat Message", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Chat Message - () => frappe.tests.make('Chat Message', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/chat/doctype/chat_message/test_chat_message.py b/frappe/chat/doctype/chat_message/test_chat_message.py deleted file mode 100644 index 5d040220db..0000000000 --- a/frappe/chat/doctype/chat_message/test_chat_message.py +++ /dev/null @@ -1,19 +0,0 @@ -from __future__ import unicode_literals - -# imports - standard imports -import unittest - -# imports - module imports -import frappe - -# imports - frappe module imports -from frappe.chat.doctype.chat_message import chat_message -from frappe.chat.util import create_test_user - - -class TestChatMessage(unittest.TestCase): - def test_send(self): - # TODO - Write the case once you're done with Chat Room - # user = test_user - # chat_message.send(user, room, 'foobar') - pass diff --git a/frappe/chat/doctype/chat_profile/test_chat_profile.js b/frappe/chat/doctype/chat_profile/test_chat_profile.js deleted file mode 100644 index 20a8eb8708..0000000000 --- a/frappe/chat/doctype/chat_profile/test_chat_profile.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Chat Profile", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Chat Profile - () => frappe.tests.make('Chat Profile', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/chat/doctype/chat_profile/test_chat_profile.py b/frappe/chat/doctype/chat_profile/test_chat_profile.py deleted file mode 100644 index 5e14e5a12b..0000000000 --- a/frappe/chat/doctype/chat_profile/test_chat_profile.py +++ /dev/null @@ -1,60 +0,0 @@ -from __future__ import unicode_literals - -# imports - standard imports -import unittest - -# imports - module imports -import frappe - -# imports - frappe module imports -from frappe.chat.doctype.chat_profile import chat_profile -from frappe.chat.util import get_user_doc, create_test_user - - -class TestChatProfile(unittest.TestCase): - pass - # def test_create(self): - # with self.assertRaises(frappe.ValidationError): - # chat_profile.create(test_user) - - # user = get_user_doc(session.user) - # if not user.chat_profile: - # chat_profile.create(user.name) - # prof = chat_profile.get(user.name) - # self.assertEqual(prof.status, 'Online') - # else: - # with self.assertRaises(frappe.ValidationError): - # chat_profile.create(user.name) - - # def test_get(self): - # user = session.user - # prof = chat_profile.get(user) - - # self.assertNotEquals(len(prof), 1) - - # prof = chat_profile.get(user, fields = ['status']) - # self.assertEqual(len(prof), 1) - # self.assertEqual(prof.status, 'Online') - - # prof = chat_profile.get(user, fields = ['status', 'chat_bg']) - # self.assertEqual(len(prof), 2) - - # def test_update(self): - # user = test_user - # with self.assertRaises(frappe.ValidationError): - # prof = chat_profile.update(user, data = dict( - # status = 'Online' - # )) - - # user = get_user_doc(session.user) - # prev = chat_profile.get(user.name) - - # chat_profile.update(user.name, data = dict( - # status = 'Offline' - # )) - # prof = chat_profile.get(user.name) - # self.assertEqual(prof.status, 'Offline') - # # revert - # chat_profile.update(user.name, data = dict( - # status = prev.status - # )) \ No newline at end of file diff --git a/frappe/chat/doctype/chat_room/test_chat_room.js b/frappe/chat/doctype/chat_room/test_chat_room.js deleted file mode 100644 index bc07a0e7f5..0000000000 --- a/frappe/chat/doctype/chat_room/test_chat_room.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Chat Room", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Chat Room - () => frappe.tests.make('Chat Room', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/chat/doctype/chat_room/test_chat_room.py b/frappe/chat/doctype/chat_room/test_chat_room.py deleted file mode 100644 index 046d781d6f..0000000000 --- a/frappe/chat/doctype/chat_room/test_chat_room.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2017, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -import frappe -import unittest - -class TestChatRoom(unittest.TestCase): - pass diff --git a/frappe/chat/doctype/chat_token/test_chat_token.js b/frappe/chat/doctype/chat_token/test_chat_token.js deleted file mode 100644 index df38de9603..0000000000 --- a/frappe/chat/doctype/chat_token/test_chat_token.js +++ /dev/null @@ -1,23 +0,0 @@ -/* eslint-disable */ -// rename this file from _test_[name] to test_[name] to activate -// and remove above this line - -QUnit.test("test: Chat Token", function (assert) { - let done = assert.async(); - - // number of asserts - assert.expect(1); - - frappe.run_serially([ - // insert a new Chat Token - () => frappe.tests.make('Chat Token', [ - // values to be set - {key: 'value'} - ]), - () => { - assert.equal(cur_frm.doc.key, 'value'); - }, - () => done() - ]); - -}); diff --git a/frappe/chat/doctype/chat_token/test_chat_token.py b/frappe/chat/doctype/chat_token/test_chat_token.py deleted file mode 100644 index cbc9a4cc4b..0000000000 --- a/frappe/chat/doctype/chat_token/test_chat_token.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- -# Copyright (c) 2019, Frappe Technologies and Contributors -# See license.txt -from __future__ import unicode_literals - -# import frappe -import unittest - -class TestChatToken(unittest.TestCase): - pass From 767ff4f9f07e22a2203ea597278b9540fcb525bd Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Tue, 12 Nov 2019 10:45:49 +0530 Subject: [PATCH 6/6] fix: making chat resources async available --- frappe/website/doctype/website_settings/website_settings.py | 4 ---- frappe/website/js/website.js | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/frappe/website/doctype/website_settings/website_settings.py b/frappe/website/doctype/website_settings/website_settings.py index 1dd78084d9..64558e751a 100644 --- a/frappe/website/doctype/website_settings/website_settings.py +++ b/frappe/website/doctype/website_settings/website_settings.py @@ -105,10 +105,6 @@ def get_website_settings(): context.web_include_css = hooks.web_include_css or [] - if settings.chat_enable: - context.web_include_css += ["/assets/css/frappe-chat-web.css"] - context.web_include_js += ["/assets/frappe/js/lib/socket.io.min.js"] - via_hooks = frappe.get_hooks("website_context") for key in via_hooks: context[key] = via_hooks[key] diff --git a/frappe/website/js/website.js b/frappe/website/js/website.js index 384167715c..f9766bae1d 100644 --- a/frappe/website/js/website.js +++ b/frappe/website/js/website.js @@ -459,7 +459,7 @@ frappe.ready(function() { method: 'frappe.website.doctype.website_settings.website_settings.is_chat_enabled', callback: (r) => { if (r.message) { - frappe.require('/assets/js/moment-bundle.min.js', () => { + frappe.require(['/assets/js/moment-bundle.min.js', "/assets/css/frappe-chat-web.css", "/assets/frappe/js/lib/socket.io.min.js"], () => { frappe.require('/assets/js/chat.js', () => { frappe.chat.setup(); });