Merge branch 'release/23.11.0'

.eslintignore

@@ -18,6 +18,7 @@
 # misc
 /coverage/
 !.*
+.*/
 .eslintcache
 
 # ember-try

.eslintrc.js

@@ -282,52 +282,60 @@ module.exports = {
  },
  },
  {
- files: ['app/locales/*/translations.ts'],
+ files: ['./app/locales/*/translations.ts'],
  rules: {
  'max-len': 'off',
  },
  },
  {
- files: ['tests/**/*'],
+ files: ['./tests/**/*'],
  rules: {
  'no-await-in-loop': 'off',
  'ember/avoid-leaking-state-in-components': 'off',
  'ember/avoid-leaking-state-in-ember-objects': 'off',
  },
  },
  {
- files: ['mirage/**/*'],
+ // Test files:
+ files: ['tests/**/*-test.{js,ts}'],
+ extends: ['plugin:qunit/recommended'],
+ rules: {
+ 'qunit/require-expect': 'off',
+ },
+ },
+ {
+ files: ['./mirage/**/*'],
  rules: {
  'ember/avoid-leaking-state-in-ember-objects': 'off',
  },
  },
  {
- files: ['lib/*/index.js'],
+ files: ['./lib/*/index.js'],
  rules: {
  'ember/avoid-leaking-state-in-ember-objects': 'off',
  '@typescript-eslint/no-var-requires': 'off',
  },
  },
  {
- files: ['lib/*/addon/engine.js'],
+ files: ['./lib/*/addon/engine.js'],
  rules: {
  'ember/avoid-leaking-state-in-ember-objects': 'off',
  },
  },
  {
  files: [
- '.eslintrc.js',
- '.prettierrc.js',
- '.template-lintrc.js',
- 'ember-cli-build.js',
- 'testem.js',
- 'run-node-test.js',
- 'lib/**/environment.js',
- 'lib/**/index.js',
- 'blueprints/*/index.js',
- 'blueprints/**/*.js',
- 'node-tests/**/*.js',
- 'config/**/*.js',
+ './.eslintrc.js',
+ './.prettierrc.js',
+ './.template-lintrc.js',
+ './ember-cli-build.js',
+ './testem.js',
+ './run-node-test.js',
+ './lib/**/environment.js',
+ './lib/**/index.js',
+ './blueprints/*/index.js',
+ './blueprints/**/*.js',
+ './node-tests/**/*.js',
+ './config/**/*.js',
  ],
  parserOptions: {
  sourceType: 'script',

.template-lintrc.js

@@ -3,7 +3,7 @@
 'use strict';
 
 module.exports = {
- extends: 'octane',
+ extends: 'recommended',
 
  rules: {
  'block-indentation': 4,

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [23.11.0] - 2023-09-27
+### Changed
+- Upgrade to Ember 3.28
+
+
 ## [23.10.0] - 2023-08-28
 ### Added
 - Added search improvement routes and related components
@@ -1940,6 +1945,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[23.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.11.0
 [23.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.2
 [23.10.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.1
 [23.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.10.0

app/adapters/crossref-adapter.ts

@@ -1,7 +1,7 @@
 import JSONAPIAdapter from '@ember-data/adapter/json-api';
 import DS from 'ember-data';
 import ModelRegistry from 'ember-data/types/registries/model';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const { support: { supportEmail } } = config;
 

app/adapters/node.ts

@@ -4,7 +4,7 @@ import OsfAdapter from './osf-adapter';
 export default class NodeAdapter extends OsfAdapter {
  buildURL(modelName?: string | number, id?: string, snapshot?: DS.Snapshot | null, requestType?: string): string {
  if (snapshot && requestType === 'createRecord') {
- const parent: any = snapshot.record.belongsTo('parent').belongsToRelationship.members.list[0];
+ const parent: any = snapshot.record.belongsTo('parent').belongsToRelationship.members?.list[0];
 
  if (parent) {
  return this.buildRelationshipURL(parent.createSnapshot(), 'children');

app/adapters/osf-adapter.ts

@@ -4,7 +4,7 @@ import { inject as service } from '@ember/service';
 import { underscore } from '@ember/string';
 import DS from 'ember-data';
 import ModelRegistry from 'ember-data/types/registries/model';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import { pluralize } from 'ember-inflector';
 import Session from 'ember-simple-auth/services/session';
 

app/adapters/user-password.ts

@@ -1,4 +1,4 @@
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 import OsfAdapter from './osf-adapter';
 

app/adapters/user-registration.ts

@@ -1,6 +1,6 @@
 import RESTAdapter from '@ember-data/adapter/rest';
 import ModelRegistry from 'ember-data/types/registries/model';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 export default class UserRegistrationAdapter extends RESTAdapter {
  host = config.OSF.url.replace(/\/$/, '');

app/app.ts

@@ -1,5 +1,5 @@
 import Application from '@ember/application';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import loadInitializers from 'ember-load-initializers';
 import Resolver from './resolver';
 

app/application/controller.ts

@@ -4,7 +4,7 @@ import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
 import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 import Theme from 'ember-osf-web/services/theme';
 import OsfModalState from 'osf-components/services/osf-modal-state';

app/authenticators/osf-cookie.ts

@@ -3,7 +3,7 @@ import { warn } from '@ember/debug';
 import { inject as service } from '@ember/service';
 import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import Base from 'ember-simple-auth/authenticators/base';
 import Session from 'ember-simple-auth/services/session';
 

app/const/service-links.ts

@@ -1,4 +1,4 @@
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const osfUrl = config.OSF.url;
 const serviceLinks = {

app/dashboard/controller.ts

@@ -7,7 +7,7 @@ import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
 import { all, restartableTask, task, timeout } from 'ember-concurrency';
 import { taskFor } from 'ember-concurrency-ts';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import $ from 'jquery';
 import Media from 'ember-responsive';
 

app/decorators/check-auth.ts

@@ -1,6 +1,6 @@
 import Route from '@ember/routing/route';
 import { inject as service, Registry as ServiceRegistry } from '@ember/service';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 import { NotLoggedIn } from 'ember-osf-web/errors';
 import CurrentUser from 'ember-osf-web/services/current-user';

app/error-no-api/controller.ts

@@ -1,5 +1,5 @@
 import Controller from '@ember/controller';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 export default class NoAPI extends Controller {
  supportEmail = config.support.supportEmail;

app/guid-file/route.ts

@@ -1,11 +1,12 @@
 import Route from '@ember/routing/route';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
+import Store from '@ember-data/store';
 import HeadTagsService from 'ember-cli-meta-tags/services/head-tags';
 import { task } from 'ember-concurrency';
 import { taskFor } from 'ember-concurrency-ts';
 import Intl from 'ember-intl/services/intl';
-import moment from 'moment';
+import moment from 'moment-timezone';
 
 import Institution from 'ember-osf-web/models/institution';
 import MetaTags, { HeadTagDef } from 'ember-osf-web/services/meta-tags';
@@ -32,6 +33,7 @@ export default class GuidFile extends Route {
  @service metaTags!: MetaTags;
  @service ready!: Ready;
  @service currentUser!: CurrentUserService;
+ @service store!: Store;
 
  headTags?: HeadTagDef[];
  metadata!: CustomFileMetadataRecordModel;

app/guid-node/registrations/controller.ts

@@ -6,7 +6,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
 import { task } from 'ember-concurrency';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 import Media from 'ember-responsive';
 
 import Node from 'ember-osf-web/models/node';

app/home/-components/hero-banner/component.ts

@@ -6,7 +6,7 @@ import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
 import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 import { layout } from 'ember-osf-web/decorators/component';
 

app/home/-components/integrations-section/component.ts

@@ -4,7 +4,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const { featureFlagNames: { ABTesting } } = config;
 

app/home/-components/support-section/learn-more-button/component.ts

@@ -1,6 +1,6 @@
 import Component from '@ember/component';
 
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const {
  OSF: {

app/home/controller.ts

@@ -3,7 +3,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { camelize } from '@ember/string';
 import Features from 'ember-feature-flags/services/features';
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const { featureFlagNames: { ABTesting } } = config;
 

app/index.html

@@ -38,7 +38,6 @@
  <script src="{{content-for "assetsPrefix"}}assets/ember-osf-web.js"></script>
 
  {{content-for "raven"}}
- {{content-for "zxcvbn"}}
  {{content-for "body-footer"}}
  </body>
 </html>

app/instance-initializers/router.ts

@@ -7,7 +7,7 @@ import Features from 'ember-feature-flags/services/features';
 import { Blocker } from 'ember-osf-web/services/ready';
 import transitionTargetURL from 'ember-osf-web/utils/transition-target-url';
 
-import config from 'ember-get-config';
+import config from 'ember-osf-web/config/environment';
 
 const {
  featureFlagNames: {

app/institutions/dashboard/-components/institutional-users-list/component.ts

@@ -23,7 +23,7 @@ export default class InstitutionalUsersList extends Component {
 
  // Private properties
  modelTaskInstance!: TaskInstance<InstitutionsDashboardModel>;
- department?: string;
+ department = this.intl.t('institutions.dashboard.select_default');
  sort = 'user_name';
 
  reloadUserList?: () => void;
@@ -41,12 +41,6 @@ export default class InstitutionalUsersList extends Component {
  const institutionDepartments = this.departmentMetrics.map((x: InstitutionDepartmentsModel) => x.name);
  departments = departments.concat(institutionDepartments);
  }
-
- if (!this.department) {
- // eslint-disable-next-line ember/no-side-effects
- this.set('department', departments[0]);
- }
-
  return departments;
  }
 

app/institutions/dashboard/route.ts

@@ -2,6 +2,7 @@ import Route from '@ember/routing/route';
 import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
+import Store from '@ember-data/store';
 import { task } from 'ember-concurrency';
 import { taskFor } from 'ember-concurrency-ts';
 
@@ -18,6 +19,7 @@ export interface InstitutionsDashboardModel {
 }
 export default class InstitutionsDashboardRoute extends Route {
  @service router!: RouterService;
+ @service store!: Store;
 
  @task
  @waitFor

app/institutions/index/template.hbs

@@ -49,11 +49,11 @@
  <Input
  data-test-institutions-filter='filter'
  aria-label={{t 'institutions.search_placeholder'}}
+ placeholder={{t 'institutions.search_placeholder'}}
+ class='form-control'
  @value={{this.textValue}}
  @type='text'
- @class='form-control'
- @placeholder={{t 'institutions.search_placeholder'}}
- @keyPress={{perform this.trackFilter}}
+ {{on 'keypress' (perform this.trackFilter)}}
  />
  </div>
  </div>

app/meetings/detail/-components/meeting-submissions-list/template.hbs

@@ -1,10 +1,10 @@
 <div data-test-submissions-list-search local-class='search-container'>
  <Input
  local-class='search {{if this.isMobile 'mobile'}}'
- @type='text'
- @placeholder={{t 'meetings.index.meetings-list.search'}}
- @key-up={{perform this.searchSubmissions}}
+ placeholder={{t 'meetings.index.meetings-list.search'}}
  aria-label={{t 'meetings.index.meetings-list.search'}}
+ @type='text'
+ {{on 'keyup' (perform this.searchSubmissions value='target.value')}}
  />
 </div>
 

app/meetings/detail/route.ts

@@ -2,11 +2,13 @@ import Route from '@ember/routing/route';
 import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
+import Store from '@ember-data/store';
 import { task } from 'ember-concurrency';
 import { taskFor } from 'ember-concurrency-ts';
 
 export default class MeetingsDetail extends Route {
  @service router!: RouterService;
+ @service store!: Store;
 
  @task
  @waitFor

app/meetings/index/-components/meetings-list/template.hbs

@@ -7,9 +7,9 @@
  <Input
  local-class='search-input'
  aria-label={{t 'meetings.index.meetings-list.search'}}
+ placeholder={{t 'meetings.index.meetings-list.search'}}
  @type='text'
- @placeholder={{t 'meetings.index.meetings-list.search'}}
- @key-up={{perform this.searchMeetings}}
+ {{on 'keyup' (perform this.searchMeetings value='target.value')}}
  />
  </div>
 </div>

app/models/abstract-node.ts

@@ -7,7 +7,7 @@ import FileProviderModel from 'ember-osf-web/models/file-provider';
 import { Permission } from './osf-model';
 
 export default class AbstractNodeModel extends BaseFileItem {
- @hasMany('file-provider', { inverse: 'target' })
+ @hasMany('file-provider', { inverse: 'target', polymorphic: true })
  files!: AsyncHasMany<FileProviderModel> & FileProviderModel[];
 
  @hasMany('draft-registration', { inverse: 'branchedFrom' })