From 5a65008e0a8b27d9001513a5eb564bd9154d3644 Mon Sep 17 00:00:00 2001 From: Eugen Ciur <eugen@papermerge.com> Date: Sun, 7 Nov 2021 08:02:57 +0100 Subject: [PATCH] index route now redirects to home folder i.e. /nodes/<home folder id>/ --- app/controllers/authenticated/index.js | 8 -------- app/routes/authenticated/index.js | 24 +++++++++--------------- app/templates/authenticated/index.hbs | 5 ----- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 app/controllers/authenticated/index.js delete mode 100644 app/templates/authenticated/index.hbs diff --git a/app/controllers/authenticated/index.js b/app/controllers/authenticated/index.js deleted file mode 100644 index d2be72f..0000000 --- a/app/controllers/authenticated/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import Controller from '@ember/controller'; -import { action } from '@ember/object'; -import { tracked } from "@glimmer/tracking"; - - -export default class IndexController extends Controller { - -} diff --git a/app/routes/authenticated/index.js b/app/routes/authenticated/index.js index a0d65ff..148b80c 100644 --- a/app/routes/authenticated/index.js +++ b/app/routes/authenticated/index.js @@ -1,26 +1,20 @@ +import Route from '@ember/routing/route'; import { inject as service } from '@ember/service'; -import BaseRoute from 'papermerge/base/routing'; -export default class IndexRoute extends BaseRoute { +export default class IndexRoute extends Route { @service store; + @service session; @service currentUser; - async model(params) { - let adapter; + async beforeModel(transition) { + let that = this; + this.session.requireAuthentication(transition, 'login'); await this.currentUser.loadCurrentUser(); - adapter = this.store.adapterFor('node'); - - if (!params.node_id) { - // when node_id is not provided, use as default - // user's home folder ID. - return this.currentUser.user.home_folder.then((home_folder) => { - return adapter.findNode(home_folder.id); - }); - } - - return adapter.findNode(params.node_id); + this.currentUser.user.home_folder.then((home_folder) => { + that.replaceWith("authenticated.nodes", home_folder.id); + }); } } diff --git a/app/templates/authenticated/index.hbs b/app/templates/authenticated/index.hbs deleted file mode 100644 index fce3648..0000000 --- a/app/templates/authenticated/index.hbs +++ /dev/null @@ -1,5 +0,0 @@ -<div class="panels d-flex"> - <Commander - @node={{@model}} - @nodes={{@model.children}} /> -</div> -- GitLab