From 164047dfbc0a768e1d947226a040c2b14b5db9c6 Mon Sep 17 00:00:00 2001
From: Sergio Fenoll <sergio@fenoll.be>
Date: Sat, 16 Apr 2022 13:27:50 +0200
Subject: [PATCH] Tweak default sorting of agendas table & QP error

The session-kind test expects the PVV Ministerraad to come after the
normal Ministerraad in a filtered agendas table. With this new
default filtering, we explicitly apply this ordering.

An agendaitem delete call was causing errors which might be related to
these Ember bugs:

- https://github.com/emberjs/ember.js/issues/20051
- https://github.com/emberjs/ember.js/pull/19971

Leaving out setting anchor to null in hope that it might fix it.
---
 app/pods/agenda/agendaitems/agendaitem/index/controller.js | 2 +-
 app/pods/agendas/controller.js                             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/pods/agenda/agendaitems/agendaitem/index/controller.js b/app/pods/agenda/agendaitems/agendaitem/index/controller.js
index 7f3f09f2fb..af35f659c0 100644
--- a/app/pods/agenda/agendaitems/agendaitem/index/controller.js
+++ b/app/pods/agenda/agendaitems/agendaitem/index/controller.js
@@ -37,7 +37,7 @@ export default class IndexAgendaitemAgendaitemsAgendaController extends Controll
     if (neighbouringItem) {
       this.router.transitionTo('agenda.agendaitems.agendaitem', this.meeting.id, this.agenda.id, neighbouringItem.id);
     } else {
-      this.router.transitionTo('agenda.agendaitems', this.meeting.id, this.agenda.id,{ queryParams: { anchor: null }});
+      this.router.transitionTo('agenda.agendaitems', this.meeting.id, this.agenda.id);
     }
   }
 
diff --git a/app/pods/agendas/controller.js b/app/pods/agendas/controller.js
index c62614a678..16113e4fa0 100644
--- a/app/pods/agendas/controller.js
+++ b/app/pods/agendas/controller.js
@@ -16,7 +16,7 @@ export default class AgendasController extends Controller {
   @tracked filter = null;
   @tracked page = 0;
   @tracked size = 10;
-  @tracked sort = '-status,created-for.planned-start';
+  @tracked sort = '-status,created-for.planned-start,created-for.kind.label';
 
   dateRegex = /^(?:\d{1,2}\/)??(?:\d{1,2}\/)?\d{4}$/;