From 56d19ed6fa4facbba0e6ac50fa394bd89fe96bd1 Mon Sep 17 00:00:00 2001 From: sokumon Date: Thu, 24 Apr 2025 00:12:40 +0530 Subject: [PATCH 1/3] fix: add deprecation warning for social module energy points (cherry picked from commit 6764a9ed49314ba03a0a6705a124e1e25069f794) # Conflicts: # frappe/patches.txt # frappe/social/doctype/energy_point_log/energy_point_log.js # frappe/social/doctype/energy_point_rule/energy_point_rule.js # frappe/social/doctype/energy_point_settings/energy_point_settings.js --- frappe/patches.txt | 5 ++ .../v16_0/social_eps_deprecation_warning.py | 9 +++ .../energy_point_log/energy_point_log.js | 59 ++++++++++++++++ .../energy_point_rule/energy_point_rule.js | 67 +++++++++++++++++++ .../energy_point_settings.js | 59 ++++++++++++++++ 5 files changed, 199 insertions(+) create mode 100644 frappe/patches/v16_0/social_eps_deprecation_warning.py create mode 100644 frappe/social/doctype/energy_point_log/energy_point_log.js create mode 100644 frappe/social/doctype/energy_point_rule/energy_point_rule.js create mode 100644 frappe/social/doctype/energy_point_settings/energy_point_settings.js diff --git a/frappe/patches.txt b/frappe/patches.txt index 7142e04d64..34913f8e68 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -245,3 +245,8 @@ frappe.patches.v16_0.move_role_desk_settings_to_user frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field frappe.patches.v14_0.fix_user_settings_collation execute:frappe.core.doctype.system_settings.system_settings.sync_system_settings +<<<<<<< HEAD +======= +frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field +frappe.patches.v16_0.social_eps_deprecation_warning +>>>>>>> 6764a9ed49 (fix: add deprecation warning for social module energy points) diff --git a/frappe/patches/v16_0/social_eps_deprecation_warning.py b/frappe/patches/v16_0/social_eps_deprecation_warning.py new file mode 100644 index 0000000000..e412e5969f --- /dev/null +++ b/frappe/patches/v16_0/social_eps_deprecation_warning.py @@ -0,0 +1,9 @@ +import click + + +def execute(): + click.secho( + "Social Module/Energy Points System is moving to a new app and will removed from the framework in version-16.\n" + "Please install the app to continue using the integration: https://github.com/frappe/eps", + fg="yellow", + ) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js new file mode 100644 index 0000000000..b455c01b8a --- /dev/null +++ b/frappe/social/doctype/energy_point_log/energy_point_log.js @@ -0,0 +1,59 @@ +// Copyright (c) 2018, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on("Energy Point Log", { + refresh: function (frm) { + frm.events.make_reference_name_link(frm); + if (frm.doc.reverted) { + frm.set_intro(__("This document has been reverted")); + } else if (frm.doc.type === "Auto" && frappe.user_roles.includes("System Manager")) { + frm.add_custom_button(__("Revert"), () => frm.events.show_revert_dialog(frm)); + } + let app_link = "EPS"; + frm.dashboard.add_comment( + __( + "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", + [app_link] + ), + "yellow", + true + ); + }, + show_revert_dialog(frm) { + const revert_dialog = new frappe.ui.Dialog({ + title: __("Revert"), + fields: [ + { + fieldname: "reason", + fieldtype: "Small Text", + label: __("Reason"), + reqd: 1, + }, + ], + primary_action: (values) => { + return frm + .call("revert", { + reason: values.reason, + }) + .then((res) => { + let revert_log = res.message; + revert_dialog.hide(); + revert_dialog.clear(); + frappe.model.docinfo[frm.doc.reference_doctype][ + frm.doc.reference_name + ].energy_point_logs.unshift(revert_log); + frm.refresh(); + }); + }, + primary_action_label: __("Submit"), + }); + revert_dialog.show(); + }, + make_reference_name_link(frm) { + let dt = frm.doc.reference_doctype; + let dn = frm.doc.reference_name; + frm.fields_dict.reference_name.$input_wrapper + .find(".control-value") + .wrapInner(``); + }, +}); diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js new file mode 100644 index 0000000000..0cafa08901 --- /dev/null +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js @@ -0,0 +1,67 @@ +// Copyright (c) 2018, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on("Energy Point Rule", { + validate(frm) { + frm.set_df_property("user_field", "reqd", !frm.doc.for_assigned_users); + frm.set_df_property("condition", "reqd", frm.doc.for_doc_event === "Custom"); + }, + refresh(frm) { + frm.events.set_field_options(frm); + let app_link = "EPS"; + frm.dashboard.add_comment( + __( + "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", + [app_link] + ), + "yellow", + true + ); + }, + for_doc_event(frm) { + if (frm.doc.for_assigned_users) { + frm.set_value("for_assigned_users", !frm.doc.for_doc_event === "New"); + } + }, + reference_doctype(frm) { + frm.events.set_field_options(frm); + }, + set_field_options(frm) { + // sets options for field_to_check, user_field and multiplier fields + // based on reference doctype + const reference_doctype = frm.doc.reference_doctype; + if (!reference_doctype) return; + + frappe.model.with_doctype(reference_doctype, () => { + const map_for_options = (df) => ({ label: df.label, value: df.fieldname }); + const fields = frappe.meta + .get_docfields(frm.doc.reference_doctype) + .filter(frappe.model.is_value_type); + + const fields_to_check = fields.map(map_for_options); + + const user_fields = fields + .filter( + (df) => + (df.fieldtype === "Link" && df.options === "User") || + df.fieldtype === "Data" + ) + .map(map_for_options) + .concat([ + { label: __("Owner"), value: "owner" }, + { label: __("Modified By"), value: "modified_by" }, + ]); + + const multiplier_fields = fields + .filter((df) => ["Int", "Float"].includes(df.fieldtype)) + .map(map_for_options); + + // blank option for the ability to unset the multiplier field + multiplier_fields.unshift(null); + + frm.set_df_property("field_to_check", "options", fields_to_check); + frm.set_df_property("user_field", "options", user_fields); + frm.set_df_property("multiplier_field", "options", multiplier_fields); + }); + }, +}); diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.js b/frappe/social/doctype/energy_point_settings/energy_point_settings.js new file mode 100644 index 0000000000..f382aa6db2 --- /dev/null +++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.js @@ -0,0 +1,59 @@ +// Copyright (c) 2019, Frappe Technologies and contributors +// For license information, please see license.txt + +frappe.ui.form.on("Energy Point Settings", { + refresh: function (frm) { + if (frm.doc.enabled) { + frm.add_custom_button(__("Give Review Points"), show_review_points_dialog); + } + let app_link = "EPS"; + frm.dashboard.add_comment( + __( + "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", + [app_link] + ), + "yellow", + true + ); + }, +}); + +function show_review_points_dialog() { + const dialog = new frappe.ui.Dialog({ + title: __("Give Review Points"), + fields: [ + { + label: "User", + fieldname: "user", + fieldtype: "Link", + options: "User", + reqd: 1, + }, + { + label: "Points", + fieldname: "points", + fieldtype: "Int", + reqd: 1, + }, + ], + primary_action: function (values) { + frappe + .xcall( + "frappe.social.doctype.energy_point_log.energy_point_log.add_review_points", + { + user: values.user, + points: values.points, + } + ) + .then(() => { + frappe.show_alert({ + message: __("Successfully Done"), + indicator: "green", + }); + }) + .finally(() => dialog.hide()); + }, + primary_action_label: __("Submit"), + }); + dialog.show(); +} From 2a1cb79824ad9431768b5d7aa1b6e1ab9caddb7d Mon Sep 17 00:00:00 2001 From: sokumon Date: Sat, 26 Apr 2025 13:12:15 +0530 Subject: [PATCH 2/3] fix: remove ui warnings for now (cherry picked from commit 6721178deedfa5cfee01d399656d646ccac514a7) --- .../social/doctype/energy_point_log/energy_point_log.js | 9 --------- .../doctype/energy_point_rule/energy_point_rule.js | 9 --------- .../energy_point_settings/energy_point_settings.js | 9 --------- 3 files changed, 27 deletions(-) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js index b455c01b8a..0fe79103ae 100644 --- a/frappe/social/doctype/energy_point_log/energy_point_log.js +++ b/frappe/social/doctype/energy_point_log/energy_point_log.js @@ -9,15 +9,6 @@ frappe.ui.form.on("Energy Point Log", { } else if (frm.doc.type === "Auto" && frappe.user_roles.includes("System Manager")) { frm.add_custom_button(__("Revert"), () => frm.events.show_revert_dialog(frm)); } - let app_link = "EPS"; - frm.dashboard.add_comment( - __( - "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", - [app_link] - ), - "yellow", - true - ); }, show_revert_dialog(frm) { const revert_dialog = new frappe.ui.Dialog({ diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js index 0cafa08901..21bb318d65 100644 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js +++ b/frappe/social/doctype/energy_point_rule/energy_point_rule.js @@ -8,15 +8,6 @@ frappe.ui.form.on("Energy Point Rule", { }, refresh(frm) { frm.events.set_field_options(frm); - let app_link = "EPS"; - frm.dashboard.add_comment( - __( - "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", - [app_link] - ), - "yellow", - true - ); }, for_doc_event(frm) { if (frm.doc.for_assigned_users) { diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.js b/frappe/social/doctype/energy_point_settings/energy_point_settings.js index f382aa6db2..c4a0f0a1f7 100644 --- a/frappe/social/doctype/energy_point_settings/energy_point_settings.js +++ b/frappe/social/doctype/energy_point_settings/energy_point_settings.js @@ -6,15 +6,6 @@ frappe.ui.form.on("Energy Point Settings", { if (frm.doc.enabled) { frm.add_custom_button(__("Give Review Points"), show_review_points_dialog); } - let app_link = "EPS"; - frm.dashboard.add_comment( - __( - "Energy Point System will be removed from Framework in Version 16. Please install {0} app to continue using it.", - [app_link] - ), - "yellow", - true - ); }, }); From 4039a3b31ca8be38c535a7c2a57b316cdcb34b51 Mon Sep 17 00:00:00 2001 From: sokumon Date: Mon, 12 May 2025 23:18:33 +0530 Subject: [PATCH 3/3] fix: resolve conflicts --- frappe/patches.txt | 4 -- .../energy_point_log/energy_point_log.js | 50 ---------------- .../energy_point_rule/energy_point_rule.js | 58 ------------------- .../energy_point_settings.js | 50 ---------------- 4 files changed, 162 deletions(-) delete mode 100644 frappe/social/doctype/energy_point_log/energy_point_log.js delete mode 100644 frappe/social/doctype/energy_point_rule/energy_point_rule.js delete mode 100644 frappe/social/doctype/energy_point_settings/energy_point_settings.js diff --git a/frappe/patches.txt b/frappe/patches.txt index 34913f8e68..86d33380de 100644 --- a/frappe/patches.txt +++ b/frappe/patches.txt @@ -245,8 +245,4 @@ frappe.patches.v16_0.move_role_desk_settings_to_user frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field frappe.patches.v14_0.fix_user_settings_collation execute:frappe.core.doctype.system_settings.system_settings.sync_system_settings -<<<<<<< HEAD -======= -frappe.printing.doctype.print_format.patches.sets_wkhtmltopdf_as_default_for_pdf_generator_field frappe.patches.v16_0.social_eps_deprecation_warning ->>>>>>> 6764a9ed49 (fix: add deprecation warning for social module energy points) diff --git a/frappe/social/doctype/energy_point_log/energy_point_log.js b/frappe/social/doctype/energy_point_log/energy_point_log.js deleted file mode 100644 index 0fe79103ae..0000000000 --- a/frappe/social/doctype/energy_point_log/energy_point_log.js +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Energy Point Log", { - refresh: function (frm) { - frm.events.make_reference_name_link(frm); - if (frm.doc.reverted) { - frm.set_intro(__("This document has been reverted")); - } else if (frm.doc.type === "Auto" && frappe.user_roles.includes("System Manager")) { - frm.add_custom_button(__("Revert"), () => frm.events.show_revert_dialog(frm)); - } - }, - show_revert_dialog(frm) { - const revert_dialog = new frappe.ui.Dialog({ - title: __("Revert"), - fields: [ - { - fieldname: "reason", - fieldtype: "Small Text", - label: __("Reason"), - reqd: 1, - }, - ], - primary_action: (values) => { - return frm - .call("revert", { - reason: values.reason, - }) - .then((res) => { - let revert_log = res.message; - revert_dialog.hide(); - revert_dialog.clear(); - frappe.model.docinfo[frm.doc.reference_doctype][ - frm.doc.reference_name - ].energy_point_logs.unshift(revert_log); - frm.refresh(); - }); - }, - primary_action_label: __("Submit"), - }); - revert_dialog.show(); - }, - make_reference_name_link(frm) { - let dt = frm.doc.reference_doctype; - let dn = frm.doc.reference_name; - frm.fields_dict.reference_name.$input_wrapper - .find(".control-value") - .wrapInner(``); - }, -}); diff --git a/frappe/social/doctype/energy_point_rule/energy_point_rule.js b/frappe/social/doctype/energy_point_rule/energy_point_rule.js deleted file mode 100644 index 21bb318d65..0000000000 --- a/frappe/social/doctype/energy_point_rule/energy_point_rule.js +++ /dev/null @@ -1,58 +0,0 @@ -// Copyright (c) 2018, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Energy Point Rule", { - validate(frm) { - frm.set_df_property("user_field", "reqd", !frm.doc.for_assigned_users); - frm.set_df_property("condition", "reqd", frm.doc.for_doc_event === "Custom"); - }, - refresh(frm) { - frm.events.set_field_options(frm); - }, - for_doc_event(frm) { - if (frm.doc.for_assigned_users) { - frm.set_value("for_assigned_users", !frm.doc.for_doc_event === "New"); - } - }, - reference_doctype(frm) { - frm.events.set_field_options(frm); - }, - set_field_options(frm) { - // sets options for field_to_check, user_field and multiplier fields - // based on reference doctype - const reference_doctype = frm.doc.reference_doctype; - if (!reference_doctype) return; - - frappe.model.with_doctype(reference_doctype, () => { - const map_for_options = (df) => ({ label: df.label, value: df.fieldname }); - const fields = frappe.meta - .get_docfields(frm.doc.reference_doctype) - .filter(frappe.model.is_value_type); - - const fields_to_check = fields.map(map_for_options); - - const user_fields = fields - .filter( - (df) => - (df.fieldtype === "Link" && df.options === "User") || - df.fieldtype === "Data" - ) - .map(map_for_options) - .concat([ - { label: __("Owner"), value: "owner" }, - { label: __("Modified By"), value: "modified_by" }, - ]); - - const multiplier_fields = fields - .filter((df) => ["Int", "Float"].includes(df.fieldtype)) - .map(map_for_options); - - // blank option for the ability to unset the multiplier field - multiplier_fields.unshift(null); - - frm.set_df_property("field_to_check", "options", fields_to_check); - frm.set_df_property("user_field", "options", user_fields); - frm.set_df_property("multiplier_field", "options", multiplier_fields); - }); - }, -}); diff --git a/frappe/social/doctype/energy_point_settings/energy_point_settings.js b/frappe/social/doctype/energy_point_settings/energy_point_settings.js deleted file mode 100644 index c4a0f0a1f7..0000000000 --- a/frappe/social/doctype/energy_point_settings/energy_point_settings.js +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright (c) 2019, Frappe Technologies and contributors -// For license information, please see license.txt - -frappe.ui.form.on("Energy Point Settings", { - refresh: function (frm) { - if (frm.doc.enabled) { - frm.add_custom_button(__("Give Review Points"), show_review_points_dialog); - } - }, -}); - -function show_review_points_dialog() { - const dialog = new frappe.ui.Dialog({ - title: __("Give Review Points"), - fields: [ - { - label: "User", - fieldname: "user", - fieldtype: "Link", - options: "User", - reqd: 1, - }, - { - label: "Points", - fieldname: "points", - fieldtype: "Int", - reqd: 1, - }, - ], - primary_action: function (values) { - frappe - .xcall( - "frappe.social.doctype.energy_point_log.energy_point_log.add_review_points", - { - user: values.user, - points: values.points, - } - ) - .then(() => { - frappe.show_alert({ - message: __("Successfully Done"), - indicator: "green", - }); - }) - .finally(() => dialog.hide()); - }, - primary_action_label: __("Submit"), - }); - dialog.show(); -}