From 476965b1611c45dac1e250365cbbfd03df78926f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@fakecake.org>
Date: Thu, 4 Mar 2021 19:50:19 +0300
Subject: [PATCH] show installed plugins in the installer list
---
classes/pref/prefs.php | 12 +++---------
js/PrefHelpers.js | 18 ++++++++++++------
themes/compact.css | 3 +++
themes/compact_night.css | 3 +++
themes/light.css | 3 +++
themes/light/prefs.less | 6 ++++++
themes/night.css | 3 +++
themes/night_blue.css | 3 +++
8 files changed, 36 insertions(+), 15 deletions(-)
diff --git a/classes/pref/prefs.php b/classes/pref/prefs.php
index 277334ac9..b15b403e8 100644
--- a/classes/pref/prefs.php
+++ b/classes/pref/prefs.php
@@ -1357,20 +1357,14 @@ class Pref_Prefs extends Handler_Protected {
}
}
- private function _get_available_plugins(array $installed = []) {
+ private function _get_available_plugins() {
if ($_SESSION["access_level"] >= 10 && Config::get(Config::ENABLE_PLUGIN_INSTALLER)) {
- $obj = json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']), true);
-
- // TODO: filter installed, we'll need class names in the plugins.json
-
- return $obj;
+ return json_decode(UrlHelper::fetch(['url' => 'https://tt-rss.org/plugins.json']), true);
}
}
function getAvailablePlugins() {
- $installed = $_REQUEST['installed'];
-
if ($_SESSION["access_level"] >= 10) {
- print json_encode($this->_get_available_plugins($installed));
+ print json_encode($this->_get_available_plugins());
}
}
diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js
index 6012d2d02..5ee84f258 100644
--- a/js/PrefHelpers.js
+++ b/js/PrefHelpers.js
@@ -374,6 +374,7 @@ const Helpers = {
need_refresh: false,
entries: false,
search_query: "",
+ installed_plugins: [],
onHide: function() {
if (this.need_refresh) {
Helpers.Prefs.refresh();
@@ -449,6 +450,9 @@ const Helpers = {
.filter((stoken) => (stoken.length > 0 ? stoken : null));
dialog.entries.forEach((plugin) => {
+ const is_installed = (dialog.installed_plugins
+ .filter((p) => plugin.topics.map((t) => t.replace(/-/, "_")).includes(p))).length > 0;
+
if (search_tokens.length == 0 ||
Object.values(plugin).filter((pval) =>
search_tokens.filter((stoken) =>
@@ -458,8 +462,9 @@ const Helpers = {
++results_rendered;
container.innerHTML += `
- <li data-row-value="${App.escapeHtml(plugin.name)}">
- ${App.FormFields.button_tag(__('Install'), "", {class: 'alt-primary pull-right',
+ <li data-row-value="${App.escapeHtml(plugin.name)}" class="${is_installed ? "plugin-installed" : ""}">
+ ${App.FormFields.button_tag(is_installed ? __("Already installed") : __('Install'), "", {class: 'alt-primary pull-right',
+ disabled: is_installed,
onclick: `App.dialogOf(this).performInstall("${App.escapeHtml(plugin.name)}")`})}
<h3 style="margin-top: 0">${plugin.name}
@@ -487,9 +492,7 @@ const Helpers = {
const container = dialog.domNode.querySelector(".contents");
container.innerHTML = `<li class='text-center'>${__("Looking for plugins...")}</li>`;
- const installed = [...document.querySelectorAll('*[data-plugin-name]')].map((p) => p.getAttribute('data-plugin-name'));
-
- xhr.json("backend.php", {op: "pref-prefs", method: "getAvailablePlugins", 'installed[]': installed}, (reply) => {
+ xhr.json("backend.php", {op: "pref-prefs", method: "getAvailablePlugins"}, (reply) => {
dialog.entries = reply;
dialog.render_contents();
});
@@ -502,7 +505,7 @@ const Helpers = {
<div style='height : 16px'> </div> <!-- disgusting -->
</div>
- <ul style='clear : both' class="panel panel-scrollable-400px contents"> </ul>
+ <ul style='clear : both' class="panel panel-scrollable-400px contents plugin-installer-list"> </ul>
<footer>
${App.FormFields.button_tag(__("Refresh"), "", {class: 'alt-primary', onclick: 'App.dialogOf(this).reload()'})}
@@ -513,6 +516,9 @@ const Helpers = {
const tmph = dojo.connect(dialog, 'onShow', function () {
dojo.disconnect(tmph);
+
+ dialog.installed_plugins = [...document.querySelectorAll('*[data-plugin-name]')].map((p) => p.getAttribute('data-plugin-name'));
+
dialog.reload();
});
diff --git a/themes/compact.css b/themes/compact.css
index 9656cd383..12a01bedd 100644
--- a/themes/compact.css
+++ b/themes/compact.css
@@ -1516,6 +1516,9 @@ body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
body.ttrss_prefs .users-list td {
cursor: pointer;
}
+body.ttrss_prefs .plugin-installer-list .plugin-installed {
+ opacity: 0.5;
+}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
padding: 8px;
diff --git a/themes/compact_night.css b/themes/compact_night.css
index 987f98b1b..0ca19d6ef 100644
--- a/themes/compact_night.css
+++ b/themes/compact_night.css
@@ -1516,6 +1516,9 @@ body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
body.ttrss_prefs .users-list td {
cursor: pointer;
}
+body.ttrss_prefs .plugin-installer-list .plugin-installed {
+ opacity: 0.5;
+}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
padding: 8px;
diff --git a/themes/light.css b/themes/light.css
index 12ef7efd2..f3ad4813d 100644
--- a/themes/light.css
+++ b/themes/light.css
@@ -1516,6 +1516,9 @@ body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
body.ttrss_prefs .users-list td {
cursor: pointer;
}
+body.ttrss_prefs .plugin-installer-list .plugin-installed {
+ opacity: 0.5;
+}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
padding: 8px;
diff --git a/themes/light/prefs.less b/themes/light/prefs.less
index 3fe328ec5..1c09271a6 100644
--- a/themes/light/prefs.less
+++ b/themes/light/prefs.less
@@ -112,6 +112,12 @@ body.ttrss_prefs {
}
}
+ .plugin-installer-list {
+ .plugin-installed {
+ opacity : 0.5;
+ }
+ }
+
.event-log {
tr {
td {
diff --git a/themes/night.css b/themes/night.css
index 9a2ee53fa..1d536a84c 100644
--- a/themes/night.css
+++ b/themes/night.css
@@ -1517,6 +1517,9 @@ body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
body.ttrss_prefs .users-list td {
cursor: pointer;
}
+body.ttrss_prefs .plugin-installer-list .plugin-installed {
+ opacity: 0.5;
+}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
padding: 8px;
diff --git a/themes/night_blue.css b/themes/night_blue.css
index 80f173c7e..69c454763 100644
--- a/themes/night_blue.css
+++ b/themes/night_blue.css
@@ -1517,6 +1517,9 @@ body.ttrss_prefs fieldset.plugin label.description .dijitCheckBox {
body.ttrss_prefs .users-list td {
cursor: pointer;
}
+body.ttrss_prefs .plugin-installer-list .plugin-installed {
+ opacity: 0.5;
+}
body.ttrss_prefs .event-log tr td {
font-size: 10px;
padding: 8px;
--
GitLab