From 783635b4b31ab3bedcc1aec34829c379bc35970e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Dierick?= Date: Tue, 27 Apr 2021 13:36:11 +0200 Subject: [PATCH 1/8] fix: revert font change of editor content --- app/styles/fixes/_fix-ember-rdfa-editor.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/styles/fixes/_fix-ember-rdfa-editor.scss b/app/styles/fixes/_fix-ember-rdfa-editor.scss index 4dfc52474d..dda186ad38 100644 --- a/app/styles/fixes/_fix-ember-rdfa-editor.scss +++ b/app/styles/fixes/_fix-ember-rdfa-editor.scss @@ -3,4 +3,4 @@ $say-paper-sidebar: false; $say-editor-background: white; $say-toolbar-background: white; $say-editor-padding: 1rem; -$say-font: $base-font; +// $say-font: $base-font; // Currently the default editor fonts. https://github.com/lblod/ember-rdfa-editor/blob/039156d2f4d4933551fbc31939bd8893a7d01211/app/styles/ember-rdfa-editor/_s-settings.scss#L26 From a30b75b7ad983b9529324365665d54a60c9ea275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Dierick?= Date: Mon, 3 May 2021 22:20:56 +0200 Subject: [PATCH 2/8] Release 5.9.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 9552e56bc7..5488601100 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frontend-kaleidos", - "version": "5.9.0", + "version": "5.9.1", "private": true, "description": "Small description for frontend-kaleidos goes here", "repository": "", From 7d002771260f142dfc1e015015e071cba6d30171 Mon Sep 17 00:00:00 2001 From: ValenberghsSven Date: Wed, 5 May 2021 09:59:43 +0200 Subject: [PATCH 3/8] release v5.10.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 85382b2d12..f66716ef30 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "frontend-kaleidos", - "version": "5.9.1", + "version": "5.10.0", "private": true, "description": "Small description for frontend-kaleidos goes here", "repository": "", From 35a3d6dab62f8fecaf988ef55c4573068f1a6781 Mon Sep 17 00:00:00 2001 From: Karel Persoons Date: Wed, 5 May 2021 13:14:51 +0200 Subject: [PATCH 4/8] Add avatar element to styleguide --- app/pods/styleguide/avatar/route.js | 9 +++++ app/pods/styleguide/avatar/template.hbs | 51 +++++++++++++++++++++++++ app/pods/styleguide/template.hbs | 3 ++ app/router.js | 1 + 4 files changed, 64 insertions(+) create mode 100644 app/pods/styleguide/avatar/route.js create mode 100644 app/pods/styleguide/avatar/template.hbs 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 +
+ {{!-- END-SNIPPET --}} + + + + {{!-- BEGIN-SNIPPET avatar-avatar-and-text --}} +
+
+ +
+
+

Jan Jambon

+
+
+ {{!-- END-SNIPPET --}} + \ No newline at end of file diff --git a/app/pods/styleguide/template.hbs b/app/pods/styleguide/template.hbs index c7cd2788bb..7202caf077 100644 --- a/app/pods/styleguide/template.hbs +++ b/app/pods/styleguide/template.hbs @@ -109,6 +109,9 @@

{{t "style-guide-static-html-components"}}

    +
  • + 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'); From 8ff09081ed37fc6a1fa970ce1e0c40cf7143fe74 Mon Sep 17 00:00:00 2001 From: Karel Persoons Date: Wed, 5 May 2021 13:15:15 +0200 Subject: [PATCH 5/8] Update au-kaleidos-css package --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3cd3d27072..e41c2f009d 100644 --- a/package.json +++ b/package.json @@ -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", From 362cc17a06b48775a06bf55750607934b90e1523 Mon Sep 17 00:00:00 2001 From: ValenberghsSven Date: Wed, 5 May 2021 15:19:33 +0200 Subject: [PATCH 6/8] solve TODO, privileged renamed to government --- app/services/current-session.js | 12 ++++++------ app/utils/config.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/services/current-session.js b/app/services/current-session.js index 7bdb7347a7..dac537e394 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, + governmentId, } = CONFIG; - const roles = [priviligedId]; + const roles = [governmentId]; return roles.includes(userRoleId); }, @@ -92,9 +92,9 @@ export default Service.extend({ userRoleId, } = this; const { - adminId, kanselarijId, priviligedId, ministerId, usersId, kabinetId, + adminId, kanselarijId, governmentId, ministerId, usersId, kabinetId, } = CONFIG; - const roles = [adminId, kanselarijId, priviligedId, ministerId, usersId, kabinetId]; + const roles = [adminId, kanselarijId, governmentId, 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, governmentId, ministerId, kabinetId, } = CONFIG; - const roles = [adminId, kanselarijId, priviligedId, ministerId, kabinetId]; + const roles = [adminId, kanselarijId, governmentId, ministerId, kabinetId]; return roles.includes(userRoleId); }, diff --git a/app/utils/config.js b/app/utils/config.js index 6aa565b49f..7134c8fdeb 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? + governmentId: '3e824494-bbe7-45cf-aed8-5828970a10dc', // TODO: Rename to overheidId? ministerId: '1cc0710c-1b28-4e23-b3ff-399c8089bc71', kabinetId: '7e8c0c9c-05ec-49fd-9e96-fc54ebf3f9eb', usersId: '450915b2-4c64-4b03-9caa-71180400f831', From 0a2741139c74d1a2d50923b35cfd34fa48b7f774 Mon Sep 17 00:00:00 2001 From: ValenberghsSven Date: Wed, 5 May 2021 15:22:17 +0200 Subject: [PATCH 7/8] solve TODO, government renamed to overheid fits better in the context --- app/services/current-session.js | 12 ++++++------ app/utils/config.js | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/services/current-session.js b/app/services/current-session.js index dac537e394..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 { - governmentId, + overheidId, } = CONFIG; - const roles = [governmentId]; + const roles = [overheidId]; return roles.includes(userRoleId); }, @@ -92,9 +92,9 @@ export default Service.extend({ userRoleId, } = this; const { - adminId, kanselarijId, governmentId, ministerId, usersId, kabinetId, + adminId, kanselarijId, overheidId, ministerId, usersId, kabinetId, } = CONFIG; - const roles = [adminId, kanselarijId, governmentId, 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, governmentId, ministerId, kabinetId, + adminId, kanselarijId, overheidId, ministerId, kabinetId, } = CONFIG; - const roles = [adminId, kanselarijId, governmentId, 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 7134c8fdeb..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', - governmentId: '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', From 2f46a1a75b3d075e70cd771aef2cb0ef9597b79d Mon Sep 17 00:00:00 2001 From: ValenberghsSven Date: Wed, 5 May 2021 16:16:57 +0200 Subject: [PATCH 8/8] cleanup of unused load heavy computeds from old via MR code --- app/models/agendaitem.js | 34 ---------------------------------- 1 file changed, 34 deletions(-) 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', {