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

Feature/ember upgrade attempt v5.12 #2258

Merged
merged 6 commits into from
Nov 28, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ module.exports = {
{ argsIgnorePattern: '^_' },
],
'no-dupe-class-members': 'off',
'ember/no-runloop': 'off',
'ember/no-tracked-properties-from-args': 'off',
},
overrides: [
// node files
Expand Down
47 changes: 0 additions & 47 deletions .github/workflows/ci.yml

This file was deleted.

1 change: 1 addition & 0 deletions .template-lintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ module.exports = {
// We like to handle the most common branch in the first clause, which is
// why the first clause has a negated condition some times.
'no-negated-condition': 'off',
'no-at-ember-render-modifiers': 'off',
},
};
2 changes: 1 addition & 1 deletion app/components/agenda/formally-ok-edit.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
@disabled={{this.onSave.isRunning}}
as |option|>
{{#if option.svg }}
<AuIcon @icon={{option.svg.icon}} class={{(concat "au-u-" option.svg.color)}} />
<AuIcon @icon={{option.svg.icon}} class={{concat "au-u-" option.svg.color}} />
{{/if}}
{{option.label}}
</PowerSelect>
Expand Down
2 changes: 1 addition & 1 deletion app/components/agenda/side-nav/agenda.hbs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Auk::TabExpanded
data-test-agenda-side-nav-agenda
@route="agenda.agendaitems"
@current-when={{(eq @currentAgenda.id @agenda.id)}} {{!-- as by LinkTo specs, @current-when can also be a boolean, which is needed here --}}
@current-when={{eq @currentAgenda.id @agenda.id}} {{!-- as by LinkTo specs, @current-when can also be a boolean, which is needed here --}}
@models={{array @meeting.id @agenda.id}}
>
{{#if @isOpen}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
data-test-document-preview-download-link
@icon="download"
@iconAlignment="left"
@hideText={{(responsive "isMobile")}}
@hideText={{responsive "isMobile"}}
href={{this.downloadLink}}
class="auk-u-mr-2"
download
Expand Down
2 changes: 1 addition & 1 deletion app/components/utils/formally-ok-selector.hbs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
class="auk-u-min-width-medium"
as |option|>
{{#if option.svg }}
<AuIcon @icon={{option.svg.icon}} class={{(concat "au-u-" option.svg.color)}} />
<AuIcon @icon={{option.svg.icon}} class={{concat "au-u-" option.svg.color}} />
{{/if}}
{{option.label}}
</PowerSelect>
Expand Down
5 changes: 3 additions & 2 deletions config/ember-cli-update.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
"packages": [
{
"name": "ember-cli",
"version": "5.8.0",
"version": "5.12.0",
"blueprints": [
{
"name": "app",
"outputRepo": "https://github.com/ember-cli/ember-new-output",
"codemodsSource": "ember-app-codemods-manifest@1",
"isBaseBlueprint": true,
"options": [
"--no-welcome"
"--no-welcome",
"--ci-provider=none"
]
}
]
Expand Down
8 changes: 4 additions & 4 deletions cypress/support/commands/case-commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,21 +135,21 @@ function addSubcaseViaModal(subcase) {
const randomInt = Math.floor(Math.random() * Math.floor(10000));

cy.log('addSubcaseViaModal');
cy.intercept('GET', '/government-bodies**').as(`getGovernmentBodies${randomInt}`);
cy.intercept('GET', '/mandatees**').as(`getMandatees${randomInt}`);
cy.intercept('POST', '/subcases').as(`createNewSubcase${randomInt}`);
cy.intercept('POST', '/meetings/*/submit').as(`submitToMeeting${randomInt}`);
cy.intercept('POST', '/submission-activities').as(`postSubmissionActivities${randomInt}`);
cy.intercept('GET', '/mandatees**').as(`getMandatees${randomInt}`);
cy.intercept('GET', '/government-bodies**').as(`getGovernmentBodies${randomInt}`);

// after creating a case we are already on the page to add a subcase
if (!subcase.newCase) {
cy.get(cases.subcaseOverviewHeader.openAddSubcase).click();
}

cy.wait(`@getMandatees${randomInt}`, {
cy.wait(`@getGovernmentBodies${randomInt}`, {
timeout: 60000,
});
cy.wait(`@getGovernmentBodies${randomInt}`, {
cy.wait(`@getMandatees${randomInt}`, {
timeout: 60000,
});

Expand Down
Loading