diff --git a/app/models/agendaitem.js b/app/models/agendaitem.js
index 3ed687396a..b023911f37 100644
--- a/app/models/agendaitem.js
+++ b/app/models/agendaitem.js
@@ -162,40 +162,6 @@ export default ModelWithModifier.extend({
return documentContainers && documentContainers.some((documentContainers) => documentContainers.checkAdded);
}),
- case: computed('treatments.firstObject.subcase.case', async function() {
- const agendaItemTreatments = await this.get('treatments');
- const agendaItemTreatment = agendaItemTreatments.firstObject; // TODO: Agendaitem can have many treatments (decisions)
- const subcase = await agendaItemTreatment.get('subcase');
- if (!subcase) {
- return false;
- }
- const _case = await subcase.get('case');
- if (!_case) {
- return false;
- }
- return _case;
- }),
-
- publicationFlow: computed('treatments.firstObject.subcase.case.publicationFlow', async function() {
- const _case = await this.get('case');
- if (!_case) {
- return false;
- }
- const publicationFlow = await _case.get('publicationFlow');
- // Preload case.
- await publicationFlow.get('case');
- await publicationFlow.reload();
- if (!publicationFlow) {
- return false;
- }
- return publicationFlow;
- }),
-
- publicationFlowId: computed('treatments.firstObject.subcase.case.publicationFlow', async function() {
- const publicationFlow = await this.get('publicationFlow');
- return publicationFlow.id;
- }),
-
sortedApprovals: computed('approvals.@each', async function() {
return PromiseArray.create({
promise: this.store.query('approval', {
diff --git a/app/pods/styleguide/avatar/route.js b/app/pods/styleguide/avatar/route.js
new file mode 100644
index 0000000000..662fc3e739
--- /dev/null
+++ b/app/pods/styleguide/avatar/route.js
@@ -0,0 +1,9 @@
+import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
+import Route from '@ember/routing/route';
+
+export default class AvatarRoute extends Route.extend(AuthenticatedRouteMixin) {
+ model() {
+ // Normally we would query store here, but for now, we get the mocks
+ return null;
+ }
+}
diff --git a/app/pods/styleguide/avatar/template.hbs b/app/pods/styleguide/avatar/template.hbs
new file mode 100644
index 0000000000..6023f6f09a
--- /dev/null
+++ b/app/pods/styleguide/avatar/template.hbs
@@ -0,0 +1,51 @@
+{{!-- template-lint-disable --}}
+
+
+
+ {{!-- BEGIN-SNIPPET avatar-small --}}
+
+
+
+ {{!-- END-SNIPPET --}}
+
+
+
+ {{!-- BEGIN-SNIPPET avatar-regular --}}
+
+
+
+ {{!-- END-SNIPPET --}}
+
+
+
+ {{!-- BEGIN-SNIPPET avatar-image --}}
+
+
+
+ -
+ Avatar
+
-
Pagination
diff --git a/app/router.js b/app/router.js
index 83e98ac761..ac73c00f93 100644
--- a/app/router.js
+++ b/app/router.js
@@ -104,6 +104,7 @@ Router.map(function() {
this.route('alert-skins');
this.route('alert-types');
this.route('alert-stack');
+ this.route('avatar');
this.route('brand');
this.route('badge');
this.route('button-loading');
diff --git a/app/services/current-session.js b/app/services/current-session.js
index 7bdb7347a7..8681b49133 100644
--- a/app/services/current-session.js
+++ b/app/services/current-session.js
@@ -81,9 +81,9 @@ export default Service.extend({
userRoleId,
} = this;
const {
- priviligedId,
+ overheidId,
} = CONFIG;
- const roles = [priviligedId];
+ const roles = [overheidId];
return roles.includes(userRoleId);
},
@@ -92,9 +92,9 @@ export default Service.extend({
userRoleId,
} = this;
const {
- adminId, kanselarijId, priviligedId, ministerId, usersId, kabinetId,
+ adminId, kanselarijId, overheidId, ministerId, usersId, kabinetId,
} = CONFIG;
- const roles = [adminId, kanselarijId, priviligedId, ministerId, usersId, kabinetId];
+ const roles = [adminId, kanselarijId, overheidId, ministerId, usersId, kabinetId];
return roles.includes(userRoleId);
},
@@ -103,9 +103,9 @@ export default Service.extend({
userRoleId,
} = this;
const {
- adminId, kanselarijId, priviligedId, ministerId, kabinetId,
+ adminId, kanselarijId, overheidId, ministerId, kabinetId,
} = CONFIG;
- const roles = [adminId, kanselarijId, priviligedId, ministerId, kabinetId];
+ const roles = [adminId, kanselarijId, overheidId, ministerId, kabinetId];
return roles.includes(userRoleId);
},
diff --git a/app/utils/config.js b/app/utils/config.js
index 6aa565b49f..832be7a2d1 100644
--- a/app/utils/config.js
+++ b/app/utils/config.js
@@ -167,7 +167,7 @@ export default EmberObject.create({
numbersBylatinAdverbialNumberals,
adminId: '71c068e6-d2f0-43de-93ab-cd1e7156ac4b',
kanselarijId: '50f4c79c-902d-4ad2-bca1-0f37a69f0c13',
- priviligedId: '3e824494-bbe7-45cf-aed8-5828970a10dc', // TODO: Rename to overheidId?
+ overheidId: '3e824494-bbe7-45cf-aed8-5828970a10dc',
ministerId: '1cc0710c-1b28-4e23-b3ff-399c8089bc71',
kabinetId: '7e8c0c9c-05ec-49fd-9e96-fc54ebf3f9eb',
usersId: '450915b2-4c64-4b03-9caa-71180400f831',
diff --git a/package.json b/package.json
index 3cd3d27072..c8bfa39ebe 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "frontend-kaleidos",
- "version": "5.9.0",
+ "version": "5.10.0",
"private": true,
"description": "Small description for frontend-kaleidos goes here",
"repository": "",
@@ -39,7 +39,7 @@
"@ember/render-modifiers": "^1.0.2",
"@glimmer/component": "^1.0.0",
"@glimmer/tracking": "^1.0.0",
- "@kanselarij-vlaanderen/au-kaleidos-css": "^1.20.0",
+ "@kanselarij-vlaanderen/au-kaleidos-css": "^1.20.1",
"@kanselarij-vlaanderen/au-kaleidos-icons": "^1.3.2",
"@lblod/ember-acmidm-login": "^1.1.1",
"@lblod/ember-mock-login": "^0.4.8",