Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to ember 5.12 #807

Merged
merged 6 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/clever-ways-look.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'frontend-gelinkt-notuleren': minor
---

Update to Ember 5.8
5 changes: 5 additions & 0 deletions .changeset/kind-mangos-confess.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'frontend-gelinkt-notuleren': minor
---

Upgrade to Ember 5.12
11 changes: 11 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,17 @@ module.exports = {
'getter-return': ['error', { allowImplicit: true }],
},
overrides: [
{
files: ['**/*.gjs'],
parser: 'ember-eslint-parser',
plugins: ['ember'],
extends: [
'eslint:recommended',
'plugin:ember/recommended',
'plugin:ember/recommended-gts',
'plugin:prettier/recommended',
],
},
// node files
{
files: [
Expand Down
4 changes: 4 additions & 0 deletions .template-lintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,9 @@ module.exports = {
allow: ['unique-id'],
},
'no-bare-strings': true,
// FIXME We should migrate away from using did-insert and did-update
'no-at-ember-render-modifiers': false,
// FIXME We only use Input in table-menu, we should refactor to use <input>
'no-builtin-form-components': false,
},
};
2 changes: 1 addition & 1 deletion app/components/agenda-manager/agenda-table/body.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<SortableObjects
@tagName={{'tbody'}}
@tagName='tbody'
@sortEndAction={{@onSort}}
@sortableObjectList={{@items}}
@enableSort={{true}}
Expand Down
4 changes: 2 additions & 2 deletions app/components/decision-copy-parts.gjs
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default class DecisionCopyParts extends Component {
{{part.translatedLabel}}
</div>
<div class='gn-meeting-copy--structure-content'>
{{(htmlSafer part.content)}}
{{htmlSafer part.content}}
</div>
</div>
<div class='gn-meeting-copy--section-button'>
Expand All @@ -189,7 +189,7 @@ export default class DecisionCopyParts extends Component {
</div>
{{else}}
<div class='gn-meeting-copy--structure-content'>
{{(htmlSafer section.content)}}
{{htmlSafer section.content}}
</div>
{{/each}}
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/components/document-attachments.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<AuFileUpload
@title={{t 'attachments.attach'}}
@helpTextDragDrop={{t 'attachments.drag'}}
@modelName={{'file'}}
@endPoint={{'/files'}}
@modelName='file'
@endPoint='/files'
@onFinishUpload={{perform this.uploadedAttachement}}
@maxFileSizeMB='1024'
@multiple={{true}}
Expand Down
6 changes: 0 additions & 6 deletions app/controllers/inbox/imported.js

This file was deleted.

1 change: 1 addition & 0 deletions app/controllers/inbox/meetings/new-inauguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export default class InboxMeetingsNewInaugurationController extends Controller {
// TODO use the router service once the bug is fixed:
//this.router.replaceWith('inbox.meetings');
// still relevant as of 15/10/2024
// eslint-disable-next-line ember/no-deprecated-router-transition-methods
this.replaceRoute('inbox.meetings');
};
}
1 change: 1 addition & 0 deletions app/controllers/inbox/meetings/new.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export default class InboxMeetingsNewController extends Controller {
// TODO use the router service once the bug is fixed:
//this.router.replaceWith('inbox.meetings');
// still relevant as of 15/10/2024
// eslint-disable-next-line ember/no-deprecated-router-transition-methods
this.replaceRoute('inbox.meetings');
}
}
2 changes: 1 addition & 1 deletion app/controllers/regulatory-statements/edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ export default class RegulatoryStatementsRoute extends Controller {
},
autofilledVariable: {
autofilledValues: {
administrativeUnit: `${this.currentSession.classificatie.label} ${this.currentSession.group.naam}`,
administrativeUnit: `${this.currentSession.classificatie?.label} ${this.currentSession.group?.naam}`,
},
},
};
Expand Down
3 changes: 0 additions & 3 deletions app/routes/inbox/imported.js

This file was deleted.

3 changes: 2 additions & 1 deletion app/routes/inbox/regulatory-statements.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { service } from '@ember/service';
export default class InboxRegulatoryStatementsRoute extends Route {
@service store;
@service features;
@service router;

queryParams = {
pageSize: { refreshModel: true },
Expand All @@ -15,7 +16,7 @@ export default class InboxRegulatoryStatementsRoute extends Route {

beforeModel(/*transition*/) {
if (!this.features.isEnabled('regulatoryStatements')) {
this.replaceWith('inbox.agendapoints');
this.router.replaceWith('inbox.agendapoints');
}
}

Expand Down
3 changes: 2 additions & 1 deletion app/routes/regulatory-statements.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { service } from '@ember/service';
export default class RegulatoryStatementsRoute extends Route {
@service session;
@service features;
@service router;

beforeModel(transition) {
this.session.requireAuthentication(transition, 'login');
if (!this.features.isEnabled('regulatoryStatements')) {
this.replaceWith('agendapoints');
this.router.replaceWith('inbox.agendapoints');
}
}
}
63 changes: 0 additions & 63 deletions app/templates/inbox/imported.hbs

This file was deleted.

7 changes: 4 additions & 3 deletions app/templates/meetings/download/index.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@
/></td>
<td><AuLink
@route='meetings.download.copy'
@models={{(array
this.zitting agendapoint.behandeling.documentContainer.id
)}}
@models={{array
this.zitting
agendapoint.behandeling.documentContainer.id
}}
>
{{t 'download.table.copy-options'}}
</AuLink></td>
Expand Down
2 changes: 0 additions & 2 deletions config/ember-intl.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/*jshint node:true*/

module.exports = function (/* environment */) {
return {
/**
Expand Down
1 change: 0 additions & 1 deletion config/release.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
/* jshint node:true */
// var RSVP = require('rsvp');

// For details on each option run `ember help release`
Expand Down
Loading