From af6607cebbf7539b20cc08a8ac665a0ed545d755 Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Thu, 22 Jan 2026 10:26:56 +0530 Subject: [PATCH 1/2] feat(marketplace): handle connection url for externally available apps in marketplace Signed-off-by: Sanskar Soni --- .../page/market_place/market_place.js | 60 +++++++++---------- 1 file changed, 28 insertions(+), 32 deletions(-) diff --git a/clientside/clientside/page/market_place/market_place.js b/clientside/clientside/page/market_place/market_place.js index 9d9ac68..47827d2 100644 --- a/clientside/clientside/page/market_place/market_place.js +++ b/clientside/clientside/page/market_place/market_place.js @@ -5,19 +5,19 @@ frappe.pages["market-place"].on_page_load = function (wrapper) { single_column: true, }); $(frappe.render_template("market_place")).appendTo( - page.body.addClass("no-border") + page.body.addClass("no-border"), ); $(document).ready(function () { - document.getElementById( - "app_div" - ).innerHTML = `
+ document.getElementById("app_div").innerHTML = + `
`; frappe.call({ - method: "clientside.clientside.page.market_place.market_place.get_all_apps", + method: + "clientside.clientside.page.market_place.market_place.get_all_apps", callback: (res) => { document.getElementById("app_div").innerHTML = ""; Object.keys(res.message).forEach(function (key, index) { @@ -35,28 +35,24 @@ frappe.pages["market-place"].on_page_load = function (wrapper) {
`; - if(res.message[key].enabled==1) - { + if (res.message[key].enabled == 1) { var userRoles = frappe.user_roles; - if (userRoles.includes('OneHash Manager')) - { - if (res.message[key].installed == "true") { - document.getElementById( - `div${index}` - ).innerHTML += ``; - } else { - document.getElementById( - `div${index}` - ).innerHTML += ``; - } + if (userRoles.includes("OneHash Manager")) { + if (res.message[key].installed == "true") { + document.getElementById(`div${index}`).innerHTML += + ``; + } else if (res.message[key].connection_url) { + document.getElementById(`div${index}`).innerHTML += + `Connect `; + } else { + document.getElementById(`div${index}`).innerHTML += + ``; } - } - else - { - document.getElementById( - `div${index}` - ).innerHTML += ``; } + } else { + document.getElementById(`div${index}`).innerHTML += + ``; + } }); }, error: (err) => { @@ -69,12 +65,12 @@ frappe.pages["market-place"].on_page_load = function (wrapper) { $(document).ready(function () { $(document).on("click", "button", function () { if (this.value == "install") { - document.getElementById( - `${this.id}` - ).innerHTML = ` Installing...`; + document.getElementById(`${this.id}`).innerHTML = + ` Installing...`; $(":button").prop("disabled", true); frappe.call({ - method: "clientside.clientside.page.market_place.market_place.install_app", + method: + "clientside.clientside.page.market_place.market_place.install_app", args: { app_name: this.name, }, @@ -94,12 +90,12 @@ $(document).ready(function () { }, }); } else { - document.getElementById( - `${this.id}` - ).innerHTML = ` Uninstalling...`; + document.getElementById(`${this.id}`).innerHTML = + ` Uninstalling...`; $(":button").prop("disabled", true); frappe.call({ - method: "clientside.clientside.page.market_place.market_place.uninstall_app", + method: + "clientside.clientside.page.market_place.market_place.uninstall_app", args: { app_name: this.name, }, From 2a6f677912e6a350423638dff0f46bea741aa69f Mon Sep 17 00:00:00 2001 From: Sanskar Soni Date: Thu, 22 Jan 2026 14:44:57 +0530 Subject: [PATCH 2/2] fix(marketplace): replace connect button icon with available icon Signed-off-by: Sanskar Soni --- clientside/clientside/page/market_place/market_place.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clientside/clientside/page/market_place/market_place.js b/clientside/clientside/page/market_place/market_place.js index 47827d2..c6269f9 100644 --- a/clientside/clientside/page/market_place/market_place.js +++ b/clientside/clientside/page/market_place/market_place.js @@ -43,7 +43,7 @@ frappe.pages["market-place"].on_page_load = function (wrapper) { ``; } else if (res.message[key].connection_url) { document.getElementById(`div${index}`).innerHTML += - `Connect `; + `Connect `; } else { document.getElementById(`div${index}`).innerHTML += ``;