-
@@ -29,10 +33,9 @@
+
+
+
+
diff --git a/frappe/public/js/frappe/social/social_home.js b/frappe/public/js/frappe/social/social_home.js
index ccddbb580a..26e4542d88 100644
--- a/frappe/public/js/frappe/social/social_home.js
+++ b/frappe/public/js/frappe/social/social_home.js
@@ -8,25 +8,20 @@ frappe.social.Home = class SocialHome {
this.page = parent.page;
this.setup_header();
this.make_body();
- this.set_primary_action();
}
make_body() {
this.$social_container = this.$parent.find('.layout-main');
- frappe.require('/assets/js/frappe-vue.min.js', () => {
- new Vue({
- el: this.$social_container[0],
- render: h => h(Home)
- });
+ new Vue({
+ el: this.$social_container[0],
+ render: h => h(Home),
+ data: {
+ 'page': this.page
+ }
});
}
setup_header() {
this.page.set_title(__('Social'));
}
- set_primary_action() {
- this.page.set_primary_action(__('Post'), () => {
- frappe.social.post_dialog.show();
- });
- }
};
frappe.social.post_dialog = new frappe.ui.Dialog({
diff --git a/frappe/public/js/frappe/ui/like.js b/frappe/public/js/frappe/ui/like.js
index c99f62dee6..8bed02119f 100644
--- a/frappe/public/js/frappe/ui/like.js
+++ b/frappe/public/js/frappe/ui/like.js
@@ -85,26 +85,30 @@ frappe.ui.click_toggle_like = function() {
return false;
}
-frappe.ui.setup_like_popover = function($parent, selector, check_not_liked=true) {
+frappe.ui.setup_like_popover = ($parent, selector, check_not_liked=true) => {
if (frappe.dom.is_touchscreen()) {
return;
}
- $parent.on("mouseover", selector, function() {
- var $wrapper = $(this);
-
- $wrapper.popover({
+ $parent.on('mouseover', selector, function() {
+ const target_element = $(this);
+ target_element.popover({
animation: true,
- placement: "right",
- content: function() {
- var liked_by = $wrapper.attr('data-liked-by');
+ placement: 'right',
+ trigger: 'manual',
+ template:`
`,
+ content: () => {
+ let liked_by = target_element.attr('data-liked-by');
liked_by = liked_by ? decodeURI(liked_by) : '[]';
liked_by = JSON.parse(liked_by);
- var user = frappe.session.user;
+ const user = frappe.session.user;
// hack
if (check_not_liked) {
- if ($wrapper.find(".not-liked").length) {
+ if (target_element.find(".not-liked").length) {
if (liked_by.indexOf(user)!==-1) {
liked_by.splice(liked_by.indexOf(user), 1);
}
@@ -118,16 +122,46 @@ frappe.ui.setup_like_popover = function($parent, selector, check_not_liked=true)
if (!liked_by.length) {
return "";
}
- return frappe.render_template("liked_by", {"liked_by": liked_by});
+
+ let liked_by_list = $(`
`);
+
+ // to show social profile of the user
+ let link_base = '#social/profile/';
+
+ liked_by.forEach(user => {
+ // append user list item
+ liked_by_list.append(`
+
${frappe.avatar(user)}
+ ${frappe.user.full_name(user)}
+
+ `);
+ });
+
+ liked_by_list.children('li').click(ev => {
+ let user = ev.currentTarget.dataset.user;
+ target_element.popover('hide');
+ frappe.set_route(link_base + user);
+ });
+
+ return liked_by_list;
},
html: true,
container: 'body'
});
- $wrapper.popover('show');
+ target_element.popover('show');
+
+ $(".popover").on("mouseleave", () => {
+ target_element.popover('hide');
+ });
+
+ target_element.on('mouseout', () => {
+ setTimeout(() => {
+ if (!$('.popover:hover').length) {
+ target_element.popover('hide');
+ }
+ }, 100);
+ });
});
- $parent.on("mouseout", selector, function() {
- $(this).popover('destroy');
- });
-}
+};
diff --git a/frappe/public/js/frappe/ui/liked_by.html b/frappe/public/js/frappe/ui/liked_by.html
deleted file mode 100644
index 0b836c5561..0000000000
--- a/frappe/public/js/frappe/ui/liked_by.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- {% for (var i in liked_by) { var liked_by_user = liked_by[i]; %}
- -
- {%= frappe.avatar(liked_by_user) %}
- {%= frappe.user.full_name(liked_by_user) %}
-
- {% } %}
-
diff --git a/frappe/public/js/frappe/views/components/DeskSection.vue b/frappe/public/js/frappe/views/components/DeskSection.vue
index 0718f05d02..3a9ec45e9c 100644
--- a/frappe/public/js/frappe/views/components/DeskSection.vue
+++ b/frappe/public/js/frappe/views/components/DeskSection.vue
@@ -28,192 +28,216 @@ import DeskModuleBox from "./DeskModuleBox.vue";
import { generate_route } from "./utils.js";
export default {
- props: ["category", "all_modules"],
- components: {
- DeskModuleBox
- },
- data() {
- let template_modules = this.all_modules;
- template_modules.forEach(module => {
- if (module.links) {
- module.links.forEach(link => {
- link.route = generate_route(link);
- });
- }
- });
+ props: ['category', 'all_modules', 'customization_settings'],
+ components: {
+ DeskModuleBox
+ },
+ data() {
+ let default_modules = this.all_modules;
+ let modules = this.get_customized_modules(default_modules, this.customization_settings);
- return {
- template_modules: template_modules,
- modules: template_modules.slice(),
- settings: {},
- all_settings: {},
- dragged_index: -1,
- hovered_index: -1
- };
- },
- methods: {
- show_customize_dialog() {
- if (!this.dialog) {
- this.get_settings().then(() => {
- const fields = this.make_fields();
- this.make_and_show_dialog(fields);
- });
- } else {
- this.dialog.show();
- }
- },
- get_settings() {
- return frappe.db.get_value("User", user, "home_settings").then(resp => {
- this.all_settings = JSON.parse(resp.message["home_settings"]);
- this.settings = this.all_settings[this.category];
- });
- },
- make_fields() {
- let fields = [];
- let template_modules = this.template_modules;
- let selected_modules = Object.keys(this.settings);
+ return {
+ default_modules: default_modules,
+ modules: modules,
+ new_settings: {},
+ dragged_index: -1,
+ hovered_index: -1,
+ }
+ },
+ methods: {
+ show_customize_dialog() {
+ if(!this.dialog) {
+ const fields = this.make_fields();
+ this.make_and_show_dialog(fields);
+ } else {
+ this.dialog.show();
+ }
+ },
+ make_fields() {
+ let fields = [];
+ this.modules.forEach(module => {
+ fields.push(this.get_module_select_field(module));
- template_modules.forEach(module => {
- fields.push(this.get_module_select_field(module, selected_modules));
+ if(module.links) {
+ fields.push(this.get_links_multiselect_field(module));
+ }
+ });
+ return fields;
+ },
+ make_and_show_dialog(fields) {
+ this.dialog = new frappe.ui.Dialog({
+ title: __("Customize " + this.category),
+ fields: fields,
+ primary_action_label: __("Update"),
+ primary_action: (values) => {
+ this.update_settings(values);
+ }
+ });
- if (module.links) {
- fields.push(this.get_links_multiselect_field(module));
- }
- });
+ this.dialog.modal_body.find('.clearfix').css({'display': 'none'});
+ this.dialog.modal_body.find('.frappe-control*[data-fieldtype="MultiSelect"]').css({'margin-bottom': '30px'});
- return fields;
- },
- make_and_show_dialog(fields) {
- this.dialog = new frappe.ui.Dialog({
- title: __("Customize " + this.category),
- fields: fields,
- primary_action_label: __("Update"),
- primary_action: values => {
- let module_link_list_map = {};
+ this.dialog.show();
+ },
- Object.keys(values).forEach(module_name => {
- if (!module_name.includes("links") && values[module_name]) {
- const links_str = values[module_name + "_links"] || "";
- this.settings[module_name]["links"] = links_str;
- if (values[module_name]) {
- module_link_list_map[module_name] = {
- links: links_str.split(","),
- app: this.template_modules.filter(
- m => m.module_name === module_name
- )[0].app
- };
- }
- }
- });
+ update_settings(values) {
+ // Figure out the diff from the default settings known from modules
+ let new_settings = {};
+ const checkbox_fields = Object.keys(values).filter(f => !f.includes('links'));
- frappe.db
- .set_value("User", user, "home_settings", this.all_settings)
- .then(resp => {
- this.update_modules(module_link_list_map);
- this.dialog.hide();
- })
- .fail(err => {
- frappe.msgprint(err);
- });
- }
- });
+ checkbox_fields.forEach(module_name => {
+ const default_module = this.default_modules.filter(f => f.module_name === module_name)[0];
- this.dialog.modal_body.find(".clearfix").css({ display: "none" });
- this.dialog.modal_body
- .find('.frappe-control*[data-fieldtype="MultiSelect"]')
- .css({ "margin-bottom": "30px" });
+ // Check if hidden changed
+ const default_hidden = default_module.hidden ? 1 : 0;
+ const new_hidden = !values[module_name] ? 1 : 0;
+ const hidden_changed = new_hidden != default_hidden;
- this.dialog.show();
- },
+ // Check if links changed
+ let links_changed = 0;
+ let new_links = [];
- update_modules(module_link_list_map) {
- frappe.call({
- type: "GET",
- method: "frappe.desk.moduleview.get_module_link_items_from_dict",
- freeze: true,
- args: {
- module_link_list_map: module_link_list_map
- },
- callback: r => {
- const module_links_dict = r.message;
- this.template_modules.map((m, i) => {
- let raw_links = module_links_dict[m.module_name];
- raw_links.forEach(link => {
- link.route = generate_route(link);
- });
- if (Object.keys(module_link_list_map).includes(m.module_name)) {
- m.hidden = 0;
- m.links = raw_links;
- } else {
- m.hidden = 1;
- }
- });
+ if(!new_hidden) {
+ const default_links = default_module.links.map(l => (l.name || l.label));
+ const new_links_str = values[module_name + '_links'] || '';
+ new_links = new_links_str ? new_links_str.split(",") : [];
+ links_changed = !this.are_arrays_equal(new_links, default_links);
+ }
- this.modules = this.template_modules.filter(m => !m.hidden);
- }
- });
- },
+ // Make new settings
+ let new_module_settings;
- get_module_select_field(module, selected_modules) {
- return {
- label: __(module.module_name),
- fieldname: module.module_name,
- fieldtype: "Check",
- default: selected_modules.includes(module.module_name) ? 1 : 0
- };
- },
+ if(hidden_changed || links_changed) {
+ new_module_settings = {};
+ if(hidden_changed) {
+ new_module_settings.hidden = new_hidden;
+ }
+ if(links_changed) {
+ new_module_settings.links = new_links;
+ }
+ }
- get_links_multiselect_field(module) {
- return {
- label: __(""),
- fieldname: module.module_name + "_links",
- fieldtype: "MultiSelect",
- get_data: function() {
- let data = [];
+ if(new_module_settings) {
+ new_module_settings.app = this.default_modules.filter(m => m.module_name === module_name)[0].app;
+ new_settings[module_name] = new_module_settings;
+ }
+ });
- frappe.call({
- type: "GET",
- method: "frappe.desk.moduleview.get_links",
- async: false,
- no_spinner: true,
- args: {
- app: module.app,
- module: module.module_name
- },
- callback: function(r) {
- data = r.message;
- }
- });
- return data;
- },
- default: module.links.map(m => m.name || m.label),
- depends_on: module.module_name
- };
- },
+ if(Object.keys(new_settings)) {
+ frappe.call({
+ type: "GET",
+ method:'frappe.desk.moduleview.update_desk_section_settings',
+ freeze: true,
+ args: {
+ desk_section: this.category,
+ new_settings: new_settings
+ },
+ callback: (r) => {
+ let new_settings_with_link_objects = r.message;
+ let home_settings = JSON.parse(frappe.boot.home_settings);
+ home_settings[this.category] = new_settings_with_link_objects;
+ frappe.boot.home_settings = JSON.stringify(home_settings);
- box_dragstart(index) {
- this.dragged_index = index;
- },
+ this.modules = this.get_customized_modules(this.default_modules, new_settings_with_link_objects);
+ this.dialog.hide();
+ }
+ });
+ } else {
+ this.dialog.hide();
+ };
+ },
- box_dragend(index) {
- this.dragged_index = -1;
- this.hovered_index = -1;
- },
+ get_customized_modules(default_modules, customization_settings={}) {
+ return default_modules.map(module => {
+ let customized_module = JSON.parse(JSON.stringify(module));
- box_enter(index) {
- this.hovered_index = index;
- },
+ const module_settings = customization_settings[module.module_name];
+ if(module_settings) {
+ if(module_settings.links) {
+ customized_module.links = module_settings.links;
+ }
+ customized_module.hidden = module_settings ? module_settings.hidden : 0;
+ }
- box_drop(index) {
- let d = this.dragged_index;
- let h = this.hovered_index;
- if (d < h) {
- this.modules.splice(h, 0, this.modules[d]);
- this.modules.splice(d, 1);
- }
- }
- }
-};
+ if(customized_module.links) {
+ customized_module.links.forEach(link => {
+ link.route = generate_route(link);
+ });
+ }
+
+ return customized_module;
+ });
+ },
+
+ get_module_select_field(module) {
+ return {
+ label: __(module.module_name),
+ fieldname: module.module_name,
+ fieldtype: "Check",
+ default: module.hidden ? 0 : 1
+ }
+ },
+
+ get_links_multiselect_field(module) {
+ return {
+ label: __(""),
+ fieldname: module.module_name + "_links",
+ fieldtype: "MultiSelect",
+ get_data: function() {
+ let data = [];
+
+ frappe.call({
+ type: "GET",
+ method:'frappe.desk.moduleview.get_links',
+ async: false,
+ no_spinner: true,
+ args: {
+ app: module.app,
+ module: module.module_name,
+ },
+ callback: function(r) {
+ data = r.message;
+ }
+ });
+ return data;
+ },
+ default: module.links.map(l => (l.name || l.label)),
+ depends_on: module.module_name
+ };
+ },
+
+ are_arrays_equal(arr1, arr2) {
+ if(arr1.length !== arr2.length) return false;
+ let areEqual = true;
+ arr1.map((d, i) => {
+ if(arr2[i] !== d) areEqual = false;
+ });
+ return areEqual;
+ },
+
+ box_dragstart(index) {
+ this.dragged_index = index;
+ },
+
+ box_dragend(index) {
+ this.dragged_index = -1;
+ this.hovered_index = -1;
+ },
+
+ box_enter(index) {
+ this.hovered_index = index;
+ },
+
+ box_drop(index) {
+ let d = this.dragged_index;
+ let h = this.hovered_index;
+ if (d < h) {
+ this.modules.splice(h, 0, this.modules[d]);
+ this.modules.splice(d, 1);
+ }
+ },
+ }
+}