Add a dedicated page for the recommended apps installation

apps/settings/src/components/AppList.vue

@@ -96,11 +96,9 @@
 </template>
 
 <script>
-import pLimit from 'p-limit'
-
 import AppItem from './AppList/AppItem'
 import PrefixMixin from './PrefixMixin'
-import recommended from '../recommendedApps'
+import pLimit from 'p-limit'
 
 export default {
 	name: 'AppList',
@@ -131,26 +129,26 @@ export default {
 					return OC.Util.naturalSortCompare(sortStringA, sortStringB)
 				})
 
-			switch (this.category) {
-			case 'installed':
+			if (this.category === 'installed') {
 				return apps.filter(app => app.installed)
-			case 'recommended':
-				return apps.filter(app => recommended.includes(app.id))
-			case 'enabled':
+			}
+			if (this.category === 'enabled') {
 				return apps.filter(app => app.active && app.installed)
-			case 'disabled':
+			}
+			if (this.category === 'disabled') {
 				return apps.filter(app => !app.active && app.installed)
-			case 'app-bundles':
+			}
+			if (this.category === 'app-bundles') {
 				return apps.filter(app => app.bundles)
-			case 'updates':
+			}
+			if (this.category === 'updates') {
 				return apps.filter(app => app.update)
-			default:
-				// filter app store categories
-				return apps.filter(app => {
-					return app.appstore && app.category !== undefined
-							&& (app.category === this.category || app.category.indexOf(this.category) > -1)
-				})
 			}
+			// filter app store categories
+			return apps.filter(app => {
+				return app.appstore && app.category !== undefined
+					&& (app.category === this.category || app.category.indexOf(this.category) > -1)
+			})
 		},
 		bundles() {
 			return this.$store.getters.getServerData.bundles.filter(bundle => this.bundleApps(bundle.id).length > 0)
@@ -177,7 +175,7 @@ export default {
 			return !this.useListView && !this.useBundleView
 		},
 		useListView() {
-			return ['installed', 'recommended', 'enabled', 'disabled', 'updates'].includes(this.category)
+			return (this.category === 'installed' || this.category === 'enabled' || this.category === 'disabled' || this.category === 'updates')
 		},
 		useBundleView() {
 			return (this.category === 'app-bundles')
@@ -198,24 +196,6 @@ export default {
 			}
 		}
 	},
-	mounted() {
-		if (this.category === 'recommended' && 'download' in this.$route.query) {
-			const limit = pLimit(1)
-			const installing = this.apps
-				.filter(app => !app.active && app.canInstall)
-				.map(app => limit(() => this.$store.dispatch('enableApp', { appId: app.id, groups: [] })))
-			console.debug(`installing ${installing.length} recommended apps`)
-			Promise.all(installing)
-				.then(() => {
-					console.info('recommended apps installed')
-
-					if ('returnTo' in this.$route.query) {
-						window.location = this.$route.query.returnTo
-					}
-				})
-				.catch(e => console.error('could not install recommended apps', e))
-		}
-	},
 	methods: {
 		toggleBundle(id) {
 			if (this.allBundlesEnabled(id)) {

apps/settings/src/views/Apps.vue

@@ -31,10 +31,7 @@
 			</ul>
 		</AppNavigation>
 		<AppContent class="app-settings-content" :class="{ 'icon-loading': loadingList }">
-			<AppList v-if="!loadingList"
-				:category="category"
-				:app="currentApp"
-				:search="searchQuery" />
+			<AppList :category="category" :app="currentApp" :search="searchQuery" />
 		</AppContent>
 		<AppSidebar v-if="id && currentApp" @close="hideAppDetails">
 			<AppDetails :category="category" :app="currentApp" />
@@ -136,21 +133,13 @@ export default {
 					icon: 'icon-category-installed',
 					text: t('settings', 'Your apps')
 				},
-				{
-					id: 'app-category-recommended',
-					classes: [],
-					router: { name: 'apps-category', params: { category: 'recommended' } },
-					icon: 'icon-category-installed',
-					text: t('settings', 'Recommended apps')
-				},
 				{
 					id: 'app-category-enabled',
 					classes: [],
 					icon: 'icon-category-enabled',
 					router: { name: 'apps-category', params: { category: 'enabled' } },
 					text: t('settings', 'Active apps')
-				},
-				{
+				}, {
 					id: 'app-category-disabled',
 					classes: [],
 					icon: 'icon-category-disabled',

core/Controller/RecommendedAppsController.php

@@ -0,0 +1,53 @@
+<?php declare(strict_types=1);
+
+/**
+ * @copyright 2019 Christoph Wurst <[email protected]>
+ *
+ * @author 2019 Christoph Wurst <[email protected]>
+ *
+ * @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 <http://www.gnu.org/licenses/>.
+ */
+
+namespace OC\Core\Controller;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\ContentSecurityPolicy;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\StandaloneTemplateResponse;
+use OCP\IInitialStateService;
+use OCP\IRequest;
+
+class RecommendedAppsController extends Controller {
+
+	/** @var IInitialStateService */
+	private $initialStateService;
+
+	public function __construct(IRequest $request,
+								IInitialStateService $initialStateService) {
+		parent::__construct('core', $request);
+		$this->initialStateService = $initialStateService;
+	}
+
+	/**
+	 * @NoCSRFRequired
+	 * @return Response
+	 */
+	public function index(): Response {
+		$this->initialStateService->provideInitialState('core', 'defaultPageUrl', \OC_Util::getDefaultPageUrl());
+		return new StandaloneTemplateResponse($this->appName, 'recommendedapps', [], 'guest');
+	}
+
+}

core/Controller/SetupController.php

@@ -123,7 +123,7 @@ private function finishSetup(bool $installRecommended) {
 
 		if ($installRecommended) {
 			$urlGenerator = \OC::$server->getURLGenerator();
-			$location = $urlGenerator->getAbsoluteURL('/index.php/settings/apps/recommended?download&returnTo=' . urlencode(\OC_Util::getDefaultPageUrl()));
+			$location = $urlGenerator->getAbsoluteURL('index.php/core/apps/recommended');
 			header('Location: ' . $location);
 			exit();
 		}

core/routes.php

@@ -74,6 +74,7 @@
 		['name' => 'OCJS#getConfig', 'url' => '/core/js/oc.js', 'verb' => 'GET'],
 		['name' => 'Preview#getPreviewByFileId', 'url' => '/core/preview', 'verb' => 'GET'],
 		['name' => 'Preview#getPreview', 'url' => '/core/preview.png', 'verb' => 'GET'],
+		['name' => 'RecommendedApps#index', 'url' => '/core/apps/recommended', 'verb' => 'GET'],
 		['name' => 'Svg#getSvgFromCore', 'url' => '/svg/core/{folder}/{fileName}', 'verb' => 'GET'],
 		['name' => 'Svg#getSvgFromApp', 'url' => '/svg/{app}/{fileName}', 'verb' => 'GET'],
 		['name' => 'Css#getCss', 'url' => '/css/{appName}/{fileName}', 'verb' => 'GET'],