diff --git a/apps/updatenotification/appinfo/routes.php b/apps/updatenotification/appinfo/routes.php index fd508d3705..86191680c4 100644 --- a/apps/updatenotification/appinfo/routes.php +++ b/apps/updatenotification/appinfo/routes.php @@ -21,10 +21,12 @@ * */ -use OCA\UpdateNotification\AppInfo\Application; - -$application = new Application(); -$application->registerRoutes($this, ['routes' => [ - ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], - ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], -]]); +return [ + 'routes' => [ + ['name' => 'Admin#createCredentials', 'url' => '/credentials', 'verb' => 'GET'], + ['name' => 'Admin#setChannel', 'url' => '/channel', 'verb' => 'POST'], + ], + 'ocs' => [ + ['name' => 'API#getAppList', 'url' => '/api/{apiVersion}/applist/{newVersion}', 'verb' => 'GET', 'requirements' => ['apiVersion' => 'v1']], + ], +]; diff --git a/apps/updatenotification/composer/composer/autoload_classmap.php b/apps/updatenotification/composer/composer/autoload_classmap.php index 55ad497a85..bc9474d545 100644 --- a/apps/updatenotification/composer/composer/autoload_classmap.php +++ b/apps/updatenotification/composer/composer/autoload_classmap.php @@ -7,6 +7,7 @@ $baseDir = $vendorDir; return array( 'OCA\\UpdateNotification\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', + 'OCA\\UpdateNotification\\Controller\\APIController' => $baseDir . '/../lib/Controller/APIController.php', 'OCA\\UpdateNotification\\Controller\\AdminController' => $baseDir . '/../lib/Controller/AdminController.php', 'OCA\\UpdateNotification\\Notification\\BackgroundJob' => $baseDir . '/../lib/Notification/BackgroundJob.php', 'OCA\\UpdateNotification\\Notification\\Notifier' => $baseDir . '/../lib/Notification/Notifier.php', diff --git a/apps/updatenotification/composer/composer/autoload_static.php b/apps/updatenotification/composer/composer/autoload_static.php index 4a50e180a8..1908e43394 100644 --- a/apps/updatenotification/composer/composer/autoload_static.php +++ b/apps/updatenotification/composer/composer/autoload_static.php @@ -22,6 +22,7 @@ class ComposerStaticInitUpdateNotification public static $classMap = array ( 'OCA\\UpdateNotification\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php', + 'OCA\\UpdateNotification\\Controller\\APIController' => __DIR__ . '/..' . '/../lib/Controller/APIController.php', 'OCA\\UpdateNotification\\Controller\\AdminController' => __DIR__ . '/..' . '/../lib/Controller/AdminController.php', 'OCA\\UpdateNotification\\Notification\\BackgroundJob' => __DIR__ . '/..' . '/../lib/Notification/BackgroundJob.php', 'OCA\\UpdateNotification\\Notification\\Notifier' => __DIR__ . '/..' . '/../lib/Notification/Notifier.php', diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css index c136b61d09..78f79502c8 100644 --- a/apps/updatenotification/css/admin.css +++ b/apps/updatenotification/css/admin.css @@ -1,4 +1,22 @@ -#updatenotification p, -#oca_updatenotification_section p { - margin: 25px 0; +#updatenotification { + margin-top: -25px; +} + +#updatenotification div.update, +#updatenotification ul, +#updatenotification p:not(.inlineblock) { + margin-bottom: 25px; +} + + +#updatenotification h2.inlineblock { + margin-top: 25px; +} + +#updatenotification h3 { + cursor: pointer; +} + +#updatenotification h3:first-of-type { + margin-top: 0; } diff --git a/apps/updatenotification/js-src/components/root.vue b/apps/updatenotification/js-src/components/root.vue index a6c78d9cdf..f123e3283d 100644 --- a/apps/updatenotification/js-src/components/root.vue +++ b/apps/updatenotification/js-src/components/root.vue @@ -1,9 +1,27 @@ -

+

@@ -58,7 +76,15 @@ notifyGroups: '', availableGroups: [], isDefaultUpdateServerURL: true, - enableChangeWatcher: false + enableChangeWatcher: false, + + availableAppUpdates: [], + missingAppUpdates: [], + appStoreFailed: false, + appStoreDisabled: false, + isListFetched: false, + hideMissingUpdates: false, + hideAvailableUpdates: true }; }, @@ -78,19 +104,68 @@ }); OCP.AppConfig.setValue('updatenotification', 'notify_groups', JSON.stringify(selectedGroups)); + }, + isNewVersionAvailable: function() { + if (!this.isNewVersionAvailable) { + return; + } + + $.ajax({ + url: OC.linkToOCS('apps/updatenotification/api/v1/applist', 2) + this.newVersionString, + type: 'GET', + beforeSend: function (request) { + request.setRequestHeader('Accept', 'application/json'); + }, + success: function(response) { + this.availableAppUpdates = response.ocs.data.available; + this.missingAppUpdates = response.ocs.data.missing; + this.availableAppUpdates = response.ocs.data.missing; + this.isListFetched = true; + this.appStoreFailed = false; + }.bind(this), + error: function(xhr) { + this.availableAppUpdates = []; + this.missingAppUpdates = []; + this.appStoreDisabled = xhr.responseJSON.ocs.data.appstore_disabled; + this.isListFetched = true; + this.appStoreFailed = true; + }.bind(this) + }); } }, computed: { newVersionAvailableString: function() { - return t('updatenotification', 'A new version is available: {newVersionString}', { + return t('updatenotification', 'A new version is available: {newVersionString}', { newVersionString: this.newVersionString }); }, + lastCheckedOnString: function() { return t('updatenotification', 'Checked on {lastCheckedDate}', { lastCheckedDate: this.lastCheckedDate }); + }, + + statusText: function() { + if (!this.isListFetched) { + return ''; + } + + if (this.appstoreDisabled) { + return t('updatenotification', 'Please make sure your config.php does not set appstoreenabled to false.'); + } + + if (this.appstoreFailed) { + return t('updatenotification', 'Could not connect to the appstore or the appstore returned no updates at all. Search manually for updates or make sure your server has access to the internet and can connect to the appstore.'); + } + + return this.missingAppUpdates.length === 0 ? t('updatenotification', 'All apps have an update for this version available', this) : n('updatenotification', + '%n app has no update for this version available', + '%n apps have no update for this version available', + this.missingAppUpdates.length, { + version: this.newVersionString + }); } }, @@ -144,6 +219,12 @@ OC.msg.finishedAction('#channel_save_msg', data); } }); + }, + toggleHideMissingUpdates: function() { + this.hideMissingUpdates = !this.hideMissingUpdates; + }, + toggleHideAvailableUpdates: function() { + this.hideAvailableUpdates = !this.hideAvailableUpdates; } }, diff --git a/apps/updatenotification/lib/Controller/APIController.php b/apps/updatenotification/lib/Controller/APIController.php new file mode 100644 index 0000000000..90a5fb782f --- /dev/null +++ b/apps/updatenotification/lib/Controller/APIController.php @@ -0,0 +1,134 @@ + + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +namespace OCA\UpdateNotification\Controller; + +use OC\App\AppStore\Fetcher\AppFetcher; +use OCP\App\AppPathNotFoundException; +use OCP\App\IAppManager; +use OCP\AppFramework\Http; +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCSController; +use OCP\IConfig; +use OCP\IRequest; + +class APIController extends OCSController { + + /** @var IConfig */ + protected $config; + + /** @var IAppManager */ + protected $appManager; + + /** @var AppFetcher */ + protected $appFetcher; + + /** + * @param string $appName + * @param IRequest $request + * @param IConfig $config + * @param IAppManager $appManager + * @param AppFetcher $appFetcher + */ + public function __construct($appName, + IRequest $request, + IConfig $config, + IAppManager $appManager, + AppFetcher $appFetcher) { + parent::__construct($appName, $request); + + $this->config = $config; + $this->appManager = $appManager; + $this->appFetcher = $appFetcher; + } + + /** + * @param string $newVersion + * @return DataResponse + */ + public function getAppList(string $newVersion): DataResponse { + if (!$this->config->getSystemValue('appstoreenabled', true)) { + return new DataResponse([ + 'appstore_disabled' => true, + ], Http::STATUS_NOT_FOUND); + } + + // Get list of installed custom apps + $installedApps = $this->appManager->getInstalledApps(); + $installedApps = array_filter($installedApps, function($app) { + try { + $this->appManager->getAppPath($app); + } catch (AppPathNotFoundException $e) { + return false; + } + return !$this->appManager->isShipped($app); + }); + + if (empty($installedApps)) { + return new DataResponse([ + 'missing' => [], + 'available' => [], + ]); + } + + $this->appFetcher->setVersion($newVersion, 'future-apps.json'); + + // Apps available on the app store for that version + $availableApps = array_map(function(array $app) { + return $app['id']; + }, $this->appFetcher->get()); + + if (empty($availableApps)) { + return new DataResponse([ + 'appstore_disabled' => false, + 'already_on_latest' => false, + ], Http::STATUS_NOT_FOUND); + } + + $missing = array_diff($installedApps, $availableApps); + $missing = array_map([$this, 'getAppDetails'], $missing); + sort($missing); + + $available = array_intersect($installedApps, $availableApps); + $available = array_map([$this, 'getAppDetails'], $available); + sort($available); + + return new DataResponse([ + 'missing' => $missing, + 'available' => $available, + ]); + } + + /** + * Get translated app name + * + * @param string $appId + * @return string[] + */ + protected function getAppDetails($appId): array { + $app = $this->appManager->getAppInfo($appId); + return [ + 'appId' => $appId, + 'appName' => $app['name'] ?? $appId, + ]; + } +}