From 2e8497dc01c0e023176410588a75dc48863fce00 Mon Sep 17 00:00:00 2001
From: the-djmaze <>
Date: Mon, 28 Feb 2022 17:26:23 +0100
Subject: [PATCH] Bugfix: Admin extensions page didn't refresh after
 install/update

---
 dev/Settings/Admin/About.js                      |  2 +-
 dev/Settings/Admin/Packages.js                   |  6 +++---
 dev/Styles/Admin/Layout.less                     |  1 +
 dev/View/Admin/Settings/Pane.js                  | 16 ++--------------
 .../app/templates/Views/Admin/AdminPane.html     |  1 -
 .../Views/Admin/AdminSettingsPackages.html       | 10 +++++-----
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index 130a4130b..94570f794 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -4,7 +4,7 @@ import Remote from 'Remote/Admin/Fetch';
 
 export class AboutAdminSettings /*extends AbstractViewSettings*/ {
 	constructor() {
-		this.version = ko.observable(Settings.app('version'));
+		this.version = Settings.app('version');
 		this.phpextensions = ko.observableArray();
 	}
 
diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js
index 354a5e650..6c1d9b58c 100644
--- a/dev/Settings/Admin/Packages.js
+++ b/dev/Settings/Admin/Packages.js
@@ -21,9 +21,9 @@ export class PackagesAdminSettings /*extends AbstractViewSettings*/ {
 		this.packages = PackageAdminStore;
 
 		addComputablesTo(this, {
-			packagesCurrent: () => PackageAdminStore.filter(item => item && item.installed && !item.canBeUpdated),
-			packagesAvailableForUpdate: () => PackageAdminStore.filter(item => item && item.installed && !!item.canBeUpdated),
-			packagesAvailableForInstallation: () => PackageAdminStore.filter(item => item && !item.installed),
+			packagesCurrent: () => PackageAdminStore().filter(item => item && item.installed && !item.canBeUpdated),
+			packagesUpdate: () => PackageAdminStore().filter(item => item && item.installed && item.canBeUpdated),
+			packagesAvailable: () => PackageAdminStore().filter(item => item && !item.installed),
 
 			visibility: () => (PackageAdminStore.loading() ? 'visible' : 'hidden')
 		});
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 4f82cc97a..83294f1d8 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -64,6 +64,7 @@
 
 		h4 {
 			flex-grow: 1;
+			margin: 8px;
 		}
 	}
 }
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index 5233313ed..207c90440 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -1,28 +1,16 @@
-import ko from 'ko';
-import { koComputable } from 'External/ko';
-
 import Remote from 'Remote/Admin/Fetch';
 
-import { PackageAdminStore } from 'Stores/Admin/Package';
-
 import { AbstractViewRight } from 'Knoin/AbstractViews';
 
-import { leftPanelDisabled, Settings } from 'Common/Globals';
+import { leftPanelDisabled } from 'Common/Globals';
 
-class PaneSettingsAdminView extends AbstractViewRight {
+export class PaneSettingsAdminView extends AbstractViewRight {
 	constructor() {
 		super('AdminPane');
-
-		this.version = ko.observable(Settings.app('version'));
-
 		this.leftPanelDisabled = leftPanelDisabled;
-
-		this.adminManLoadingVisibility = koComputable(() => PackageAdminStore.loading() ? 'visible' : 'hidden');
 	}
 
 	logoutClick() {
 		Remote.request('AdminLogout', () => rl.logoutReload());
 	}
 }
-
-export { PaneSettingsAdminView };
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index 8725f936a..b261adad7 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -1,6 +1,5 @@
 <div class="b-toolbar g-ui-user-select-none">
 	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
-	<i class="icon-spinner" style="margin: 10px" data-bind="style: {'visibility': adminManLoadingVisibility }"></i>
 	<h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4>
 	<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
index 1eb226d89..842123746 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsPackages.html
@@ -20,12 +20,12 @@
 
 <br>
 
-<div data-bind="visible: packagesAvailableForUpdate().length">
+<div data-bind="visible: packagesUpdate().length">
 	<div class="legend">
 		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>&nbsp;
-		(<span data-bind="text: packagesAvailableForUpdate().length"></span>)
+		(<span data-bind="text: packagesUpdate().length"></span>)
 	</div>
-	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesAvailableForUpdate} }"></div>
+	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesUpdate} }"></div>
 </div>
 
 <div id="packages-installed" data-bind="visible: packagesCurrent().length, css: {'disabled': !enabledPlugins()}">
@@ -33,7 +33,7 @@
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesCurrent} }"></div>
 </div>
 
-<div data-bind="visible: packagesAvailableForInstallation().length">
+<div data-bind="visible: packagesAvailable().length">
 	<div class="legend" data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_INSTALLATION"></div>
-	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesAvailableForInstallation} }"></div>
+	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesAvailable} }"></div>
 </div>