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 ember 5.2 #7380

Closed
wants to merge 6 commits into from
Closed
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
12 changes: 0 additions & 12 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.*/
.eslintcache

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -54,6 +54,9 @@ module.exports = {
// test files
files: ['tests/**/*-test.{js,ts}'],
extends: ['plugin:qunit/recommended'],
rules: {
'qunit/require-expect': [2, 'except-simple'],
},
},
],
};
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@ jobs:
- name: Install Node
uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18
cache: npm
- name: Install Dependencies
run: npm ci
@@ -41,7 +41,7 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [16, 18]

steps:
- uses: actions/checkout@v3
@@ -61,7 +61,7 @@ jobs:
timeout-minutes: 10
strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [16, 18]
steps:
- uses: actions/checkout@v3
- name: Install Node
@@ -83,7 +83,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18
cache: npm
- name: install dependencies
run: npm ci
@@ -102,7 +102,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18
cache: npm
- run: npm ci
- run: npm test
@@ -117,7 +117,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16.x
node-version: 18
cache: npm
- run: npm ci
- run: npm run build
9 changes: 1 addition & 8 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist/
/tmp/
/declarations/

# dependencies
/bower_components/
/node_modules/

# misc
/.env*
/.pnp*
/.sass-cache
/.eslintcache
/connect.lock
/coverage/
/libpeerconnection.log
/npm-debug.log*
/testem.log
/yarn-error.log
@@ -25,7 +19,6 @@ sauce-example.log

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
14 changes: 1 addition & 13 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,25 +1,13 @@
# unconventional js
/blueprints/*/files/
/vendor/

# compiled output
/dist/
/tmp/

# dependencies
/bower_components/
/node_modules/

# misc
/coverage/
!.*
.eslintcache
.lint-todo/
.*/

# ember-try
/.node_modules.ember-try/
/bower.json.ember-try
/npm-shrinkwrap.json.ember-try
/package.json.ember-try
/package-lock.json.ember-try
/yarn.lock.ember-try
2 changes: 1 addition & 1 deletion .watchmanconfig
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"ignore_dirs": ["tmp", "dist"]
"ignore_dirs": ["dist"]
}
6 changes: 3 additions & 3 deletions app/components/bulk-new-users.js
Original file line number Diff line number Diff line change
@@ -133,7 +133,7 @@ export default class BulkNewUsersComponent extends Component {
const notHeaderRow = proposedUsers.filter(
(obj) =>
String(obj.firstName).toLowerCase() !== 'first' ||
String(obj.lastName).toLowerCase() !== 'last'
String(obj.lastName).toLowerCase() !== 'last',
);
resolve(notHeaderRow);
};
@@ -253,7 +253,7 @@ export default class BulkNewUsersComponent extends Component {
(obj) =>
!userErrors.includes(obj) &&
isPresent(obj.authentication) &&
obj.authentication.get('isError')
obj.authentication.get('isError'),
);
this.savingUserErrors = [...this.savingUserErrors, ...userErrors];
this.savingAuthenticationErrors = [
@@ -309,7 +309,7 @@ export default class BulkNewUsersComponent extends Component {
obj.duration = program.duration;

return obj;
})
}),
);

const lastYear = parseInt(moment().subtract(1, 'year').format('YYYY'), 10);
4 changes: 2 additions & 2 deletions app/components/connection-status.js
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ export default class ConnectionStatusComponent extends Component {
{
passive: true,
capture: false,
}
},
);
this.offlineListener = window.addEventListener(
'offline',
@@ -35,7 +35,7 @@ export default class ConnectionStatusComponent extends Component {
{
passive: true,
capture: false,
}
},
);
}

2 changes: 1 addition & 1 deletion app/components/courses/list.js
Original file line number Diff line number Diff line change
@@ -67,7 +67,7 @@ export default class CoursesListComponent extends Component {
@action
cancelRemove(course) {
this.coursesForRemovalConfirmation = this.coursesForRemovalConfirmation.filter(
(id) => id !== course.id
(id) => id !== course.id,
);
}

2 changes: 1 addition & 1 deletion app/components/courses/new.js
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ export default class CoursesNewComponent extends Component {
@restartableTask
*load() {
this.academicYearCrossesCalendarYearBoundaries = yield this.iliosConfig.itemFromConfig(
'academicYearCrossesCalendarYearBoundaries'
'academicYearCrossesCalendarYearBoundaries',
);
if (this.args.currentYear && this.years.includes(parseInt(this.args.currentYear.id, 10))) {
this.setYear(this.args.currentYear.id);
6 changes: 3 additions & 3 deletions app/components/courses/root.js
Original file line number Diff line number Diff line change
@@ -30,13 +30,13 @@ export default class CoursesRootComponent extends Component {
]);
userModelData = new TrackedAsyncData(this.currentUser.getModel());
crossesBoundaryConfig = new TrackedAsyncData(
this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries')
this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
);

@cached
get coursesInSelectedSchoolData() {
return new TrackedAsyncData(
this.preloadedCoursesInSelectedSchool ? this.selectedSchool?.courses : []
this.preloadedCoursesInSelectedSchool ? this.selectedSchool?.courses : [],
);
}

@@ -111,7 +111,7 @@ export default class CoursesRootComponent extends Component {
get filteredCourses() {
if (this.args.userCoursesOnly) {
return this.coursesFilteredByTitle.filter((course) =>
this.allRelatedCourses?.includes(course)
this.allRelatedCourses?.includes(course),
);
}
return this.coursesFilteredByTitle;
2 changes: 1 addition & 1 deletion app/components/curriculum-inventory/new-report.js
Original file line number Diff line number Diff line change
@@ -28,7 +28,7 @@ export default class CurriculumInventoryNewReportComponent extends Component {
const years = [];
const currentYear = new Date().getFullYear();
this.academicYearCrossesCalendarYearBoundaries = yield this.iliosConfig.itemFromConfig(
'academicYearCrossesCalendarYearBoundaries'
'academicYearCrossesCalendarYearBoundaries',
);
for (let id = currentYear - 5, n = currentYear + 5; id <= n; id++) {
let title = id.toString();
2 changes: 1 addition & 1 deletion app/components/curriculum-inventory/report-list-item.js
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ export default class CurriculumInventoryReportListItemComponent extends Componen
@tracked showConfirmRemoval;
isFinalized = this.args.report.belongsTo('export').id();
academicYearConfig = new TrackedAsyncData(
this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries')
this.iliosConfig.itemFromConfig('academicYearCrossesCalendarYearBoundaries'),
);

@use canDelete = new PermissionChecker(() => [
2 changes: 1 addition & 1 deletion app/components/curriculum-inventory/report-overview.js
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ export default class CurriculumInventoryReportOverviewComponent extends Componen
const program = yield this.args.report.program;
const school = yield program.school;
this.academicYearCrossesCalendarYearBoundaries = yield this.iliosConfig.itemFromConfig(
'academicYearCrossesCalendarYearBoundaries'
'academicYearCrossesCalendarYearBoundaries',
);
this.canRollover = yield this.permissionChecker.canCreateCurriculumInventoryReport(school);
const yearOptions = [];
2 changes: 1 addition & 1 deletion app/components/curriculum-inventory/report-rollover.js
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ export default class CurriculumInventoryReportRolloverComponent extends Componen
@restartableTask
*load() {
const academicYearCrossesCalendarYearBoundaries = yield this.iliosConfig.itemFromConfig(
'academicYearCrossesCalendarYearBoundaries'
'academicYearCrossesCalendarYearBoundaries',
);
const thisYear = new Date().getFullYear();
const reportYear = parseInt(this.args.report.year, 10);
2 changes: 1 addition & 1 deletion app/components/curriculum-inventory/reports.js
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ export default class CurriculumInventoryReportsComponent extends Component {

if (this.selectedSchool) {
this.canCreate = yield this.permissionChecker.canCreateCurriculumInventoryReport(
this.selectedSchool
this.selectedSchool,
);
const programs = yield this.selectedSchool.programs;
this.programs = sortBy(programs.slice(), 'title');
Original file line number Diff line number Diff line change
@@ -86,7 +86,7 @@ export default class SequenceBlockSessionManagerComponent extends Component {
changeSession(session) {
if (this.linkedSessions.includes(session)) {
this.linkedSessions = this.linkedSessions.filter(
(linkedSession) => linkedSession !== session
(linkedSession) => linkedSession !== session,
);
} else {
this.linkedSessions = [...this.linkedSessions, session];
@@ -97,7 +97,7 @@ export default class SequenceBlockSessionManagerComponent extends Component {
excludeSession(session) {
if (this.excludedSessions.includes(session)) {
this.excludedSessions = this.excludedSessions.filter(
(excludedSession) => excludedSession !== session
(excludedSession) => excludedSession !== session,
);
} else {
this.excludedSessions = [...this.excludedSessions, session];
6 changes: 3 additions & 3 deletions app/components/global-search.js
Original file line number Diff line number Diff line change
@@ -51,14 +51,14 @@ export default class GlobalSearchComponent extends Component {

get filteredResults() {
return this.yearFilteredResults.filter(
(course) => !this.ignoredSchoolTitles.includes(course.school)
(course) => !this.ignoredSchoolTitles.includes(course.school),
);
}

get paginatedResults() {
return this.filteredResults.slice(
this.args.page * this.size - this.size,
this.args.page * this.size
this.args.page * this.size,
);
}

@@ -72,7 +72,7 @@ export default class GlobalSearchComponent extends Component {
results: 0,
};
}),
'title'
'title',
);
const options = this.results.reduce((set, course) => {
const schoolOption = findBy(set, 'title', course.school);
2 changes: 1 addition & 1 deletion app/components/instructor-groups/list.js
Original file line number Diff line number Diff line change
@@ -25,7 +25,7 @@ export default class LearnerGroupListComponent extends Component {
return instructorGroups.sort((a, b) =>
a.title.localeCompare(b.title, locale, {
numeric: true,
})
}),
);
}
if (sortBy.includes('courses')) {
2 changes: 1 addition & 1 deletion app/components/instructor-groups/root.js
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@ export default class InstructorGroupsRootComponent extends Component {
school: schoolId,
},
}),
])
]),
);
}
const arr = await this.instructorGroupPromises.get(schoolId);
2 changes: 1 addition & 1 deletion app/components/learner-group/cohort-user-manager.js
Original file line number Diff line number Diff line change
@@ -51,7 +51,7 @@ export default class LearnerGroupCohortUserManagerComponent extends Component {
@action
toggleUserSelectionAllOrNone() {
const unselectedFilteredUsers = this.filteredUsers.filter(
(user) => !this.selectedUsers.includes(user)
(user) => !this.selectedUsers.includes(user),
);
if (this.filteredUsers && unselectedFilteredUsers.length) {
this.selectedUsers = [...this.selectedUsers, ...unselectedFilteredUsers];
2 changes: 1 addition & 1 deletion app/components/learner-group/members.js
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ export default class LearnerGroupUserMembersComponent extends Component {

get usersInGroup() {
return this.args.users.filter(
(user) => user.get('lowestGroupInTree').id === this.args.learnerGroupId
(user) => user.get('lowestGroupInTree').id === this.args.learnerGroupId,
);
}

2 changes: 1 addition & 1 deletion app/components/learner-group/root.js
Original file line number Diff line number Diff line change
@@ -290,7 +290,7 @@ export default class LearnerGroupRootComponent extends Component {
learnerGroup,
cohort,
withLearners,
parentGroup
parentGroup,
);
// indicate that the top group is a copy
newGroups[0].title = newGroups[0].title + ` (${this.intl.t('general.copy')})`;
Loading