From 63b26b0fadeda969da30c8af44647af285adb111 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 27 Dec 2016 13:23:11 +0530
Subject: [PATCH] [minor] added "Remove app" and updated app list, fixes #1558

---
 frappe/data/app_listing/knowledge_base.json   | 13 ----------
 frappe/data/app_listing/poll.json             | 13 ----------
 .../page/applications/application_row.html    |  6 +++--
 frappe/desk/page/applications/applications.js | 24 ++++++++++++-------
 frappe/desk/page/applications/applications.py | 21 ++++++++++++++++
 5 files changed, 41 insertions(+), 36 deletions(-)
 delete mode 100644 frappe/data/app_listing/knowledge_base.json
 delete mode 100644 frappe/data/app_listing/poll.json

diff --git a/frappe/data/app_listing/knowledge_base.json b/frappe/data/app_listing/knowledge_base.json
deleted file mode 100644
index b93c0238d4..0000000000
--- a/frappe/data/app_listing/knowledge_base.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"app_url": "https://github.com/frappe/knowledge_base",
-	"app_name": "knowledge_base",
-	"app_icon": "fa fa-question-sign",
-	"app_color": "#4cd964",
-	"app_description": "Publish help articles by category on the portal",
-	"app_publisher": "Frappe",
-	"app_email": "hello@frappe.io",
-	"repo_url": "https://github.com/frappe/knowledge_base.git",
-	"app_title": "Knowledge Base",
-	"app_version": "0.1.0",
-	"app_category": "Portal"
-}
diff --git a/frappe/data/app_listing/poll.json b/frappe/data/app_listing/poll.json
deleted file mode 100644
index 2e16376f34..0000000000
--- a/frappe/data/app_listing/poll.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"app_url": "https://github.com/frappe/poll",
-	"app_name": "poll",
-	"app_icon": "fa fa-ok-sign",
-	"app_color": "#4cd964",
-	"app_description": "Online poll for the website",
-	"app_publisher": "Frappe",
-	"app_email": "hello@frappe.io",
-	"repo_url": "https://github.com/frappe/poll.git",
-	"app_title": "Poll",
-	"app_version": "0.1.0",
-	"app_category": "Portal"
-}
diff --git a/frappe/desk/page/applications/application_row.html b/frappe/desk/page/applications/application_row.html
index c428a4e274..6c79749ec2 100644
--- a/frappe/desk/page/applications/application_row.html
+++ b/frappe/desk/page/applications/application_row.html
@@ -7,8 +7,10 @@
 			<a class="btn btn-default btn-xs"
                 href="{{ app.app_url }}" target="_blank">{{ __("Website") }}</a>
 			{% if (app.installed) { %}
-			<button class="btn btn-default btn-xs" disabled=disabled>
-                {{ __("Installed") }}</button>
+			<button class="btn btn-danger btn-xs btn-remove"
+                data-title="{{ app.app_title }}"
+                data-app="{{ app.app_name }}">
+                {{ __("Remove") }}</button>
 			{% } else { %}
 			<button class="btn btn-primary btn-xs install"
                 data-app="{{ app.app_name }}"
diff --git a/frappe/desk/page/applications/applications.js b/frappe/desk/page/applications/applications.js
index ad5a10138b..3cd33d7000 100644
--- a/frappe/desk/page/applications/applications.js
+++ b/frappe/desk/page/applications/applications.js
@@ -150,6 +150,10 @@ frappe.applications.Installer = Class.extend({
 			me.install_app($(this).attr("data-app"), $(this).attr("data-title"), this);
 		});
 
+		this.wrapper.find(".btn-remove").on("click", function() {
+			me.remove_app($(this).attr("data-app"), $(this).attr("data-title"), this);
+		});
+
 	},
 
 	update_no_result: function() {
@@ -162,13 +166,18 @@ frappe.applications.Installer = Class.extend({
 				method: "frappe.desk.page.applications.applications.install_app",
 				args: { name: app_name },
 				freeze: true,
-				btn: btn,
-				callback: function(r) {
-					if(!r.exc) {
-						frappe.update_msgprint(__("Refreshing..."));
-						setTimeout(function() { window.location.reload() }, 2000)
-					}
-				}
+				btn: btn
+			});
+		});
+	},
+
+	remove_app: function(app_name, app_title, btn) {
+		frappe.confirm(__("Remove {0} and delete all data?", [app_title]), function() {
+			frappe.call({
+				method: "frappe.desk.page.applications.applications.remove_app",
+				args: { name: app_name },
+				freeze: true,
+				btn: btn
 			});
 		});
 	},
@@ -193,7 +202,6 @@ frappe.applications.Installer = Class.extend({
 		frappe.realtime.on("install_app_progress", function(data) {
 			if(data.status) {
 				frappe.update_msgprint(data.status);
-				msg_dialog.show_loading();
 			}
 		})
 	}
diff --git a/frappe/desk/page/applications/applications.py b/frappe/desk/page/applications/applications.py
index 680cabadf0..9fa1b30f95 100644
--- a/frappe/desk/page/applications/applications.py
+++ b/frappe/desk/page/applications/applications.py
@@ -11,6 +11,7 @@ import os
 import json
 from frappe import _
 from distutils.spawn import find_executable
+from frappe.utils.background_jobs import enqueue
 
 @frappe.whitelist()
 def get_app_list():
@@ -73,6 +74,12 @@ def install_app(name):
 	if app_hooks.get('hide_in_installer'):
 		frappe.throw(_("You cannot install this app"))
 
+	enqueue('frappe.desk.page.applications.applications.start_install', name=name)
+
+	frappe.msgprint(_('Queued for install'))
+
+
+def start_install(name):
 	frappe.publish_realtime("install_app_progress", {"status": _("Installing App {0}").format(name)},
 		user=frappe.session.user)
 
@@ -81,6 +88,20 @@ def install_app(name):
 	frappe.publish_realtime("install_app_progress", {"status": _("{0} Installed").format(name)},
 		user=frappe.session.user)
 
+@frappe.whitelist()
+def remove_app(name):
+	"""Remove installed app"""
+	frappe.only_for("System Manager")
+
+	if name in frappe.get_installed_apps():
+		enqueue('frappe.desk.page.applications.applications.start_remove', name=name)
+
+	frappe.msgprint(_('Queued for backup and removing {0}').format(frappe.bold(name)))
+
+def start_remove(name):
+	frappe.installer.remove_app(app_name=name, yes=True)
+	frappe.publish_realtime('msgprint', _('App {0} removed').format(frappe.bold(name)))
+
 def get_app(name):
 	"""Get app using git clone and install it in bench environment"""
 	app_listing = get_app_listing()