[ENG-467] Upgrade dependencies

app/guid-user/quickfiles/controller.ts

@@ -44,7 +44,7 @@ export default class UserQuickfiles extends Controller {
         }
     });
 
-    flash = task(function *(item: File, message: string, type = 'success', duration = 2000) {
+    flash = task(function *(item: File, message: string, type: string = 'success', duration: number = 2000) {
         item.set('flash', { message, type });
         yield timeout(duration);
         item.set('flash', null);

app/home/styles.scss

@@ -156,7 +156,7 @@
     background: url('/assets/images/home/Ana_transparent_gradient.png') no-repeat center bottom;
     background-size: contain;
     position: relative;
-    margin: -80px 0 -65px 0;
+    margin: -80px 0 -65px;
 
     .quote {
         position: absolute;

app/models/node.ts

@@ -227,7 +227,7 @@ export default class NodeModel extends BaseFileItem.extend(Validations, Collecta
 
     @computed('root')
     get isRoot() {
-        const rootId = this.belongsTo('root').id();
+        const rootId = (this as NodeModel).belongsTo('root').id();
         return !rootId || rootId === this.id;
     }
 

app/models/osf-model.ts

@@ -94,7 +94,7 @@ export default class OsfModel extends Model {
 
         // HACK: ember-data discards/ignores the link if an object on the belongsTo side
         // came first. In that case, grab the link where we expect it from OSF's API
-        const url = reference.link() || getRelatedHref(this.relationshipLinks[relationshipName]);
+        const url = reference.link() || getRelatedHref(this.relationshipLinks[relationshipName as string]);
         if (!url) {
             throw new Error(`Could not find a link for '${relationshipName}' relationship`);
         }

config/environment.d.ts

@@ -196,6 +196,10 @@ declare const config: {
     };
 
     defaultProvider: string;
+
+    pageTitle: {
+        prepend: boolean;
+    };
 };
 
 export default config;

config/environment.js

@@ -297,6 +297,9 @@ module.exports = function(environment) {
         mirageScenarios: MIRAGE_SCENARIOS,
 
         defaultProvider: 'osf',
+        pageTitle: {
+            prepend: false,
+        },
     };
 
     if (environment === 'development') {

lib/app-components/addon/components/subject-picker/component.ts

@@ -51,20 +51,26 @@ export default class SubjectPicker extends Component.extend({
         this.get('querySubjects').perform();
     },
 
-    querySubjects: task(function *(this: SubjectPicker, parents = 'null', tier = 0): IterableIterator<any> {
-        const column: Column = this.columns.objectAt(tier)!;
-
-        const taxonomies: Taxonomy[] = yield this.provider.queryHasMany('taxonomies', {
-            filter: {
-                parents,
-            },
-            page: {
-                size: 150, // Law category has 117 (Jan 2018)
-            },
-        });
+    querySubjects: task(
+        function *(
+            this: SubjectPicker,
+            parents: string = 'null',
+            tier: number = 0,
+        ): IterableIterator<any> {
+            const column: Column = this.columns.objectAt(tier)!;
+
+            const taxonomies: Taxonomy[] = yield this.provider.queryHasMany('taxonomies', {
+                filter: {
+                    parents,
+                },
+                page: {
+                    size: 150, // Law category has 117 (Jan 2018)
+                },
+            });
 
-        column.set('subjects', taxonomies ? taxonomies.toArray() : []);
-    }),
+            column.set('subjects', taxonomies ? taxonomies.toArray() : []);
+        },
+    ),
 }) {
     @service analytics!: Analytics;
     @service store!: DS.Store;

lib/osf-components/addon/components/editable-field/institutions-manager/component.ts

@@ -1,6 +1,6 @@
 import { tagName } from '@ember-decorators/component';
 import { action, computed } from '@ember-decorators/object';
-import { alias } from '@ember-decorators/object/computed';
+import { alias, and } from '@ember-decorators/object/computed';
 import { service } from '@ember-decorators/service';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
@@ -40,7 +40,7 @@ export default class InstitutionsManager extends Component.extend({
         yield this.node.updateM2MRelationship('affiliatedInstitutions', this.affiliatedList);
         this.setProperties({
             currentAffiliatedList: [...this.affiliatedList],
-            inEditMode: false,
+            requestedEditMode: false,
         });
         this.reloadList();
     }),
@@ -52,13 +52,15 @@ export default class InstitutionsManager extends Component.extend({
     @service i18n!: I18N;
     @service toast!: Toast;
 
-    inEditMode: boolean = false;
     affiliatedList!: QueryHasManyResult<Institution>;
     currentAffiliatedList!: QueryHasManyResult<Institution>;
     reloadList!: (page?: number) => void;
+    requestedEditMode: boolean = false;
 
     @alias('node.userHasAdminPermission') userCanEdit!: boolean;
 
+    @and('userCanEdit', 'requestedEditMode') inEditMode!: boolean;
+
     @computed('currentAffiliatedList.[]', 'loadNodeAffiliatedInstitutions.isRunning')
     get fieldIsEmpty() {
         if (this.loadNodeAffiliatedInstitutions.isRunning) {
@@ -82,7 +84,7 @@ export default class InstitutionsManager extends Component.extend({
 
     @action
     startEditing() {
-        this.set('inEditMode', true);
+        this.set('requestedEditMode', true);
     }
 
     @action
@@ -97,6 +99,6 @@ export default class InstitutionsManager extends Component.extend({
 
     @action
     cancel() {
-        this.set('inEditMode', false);
+        this.set('requestedEditMode', false);
     }
 }

lib/osf-components/addon/components/editable-field/tags-manager/component.ts

@@ -1,6 +1,6 @@
 import { tagName } from '@ember-decorators/component';
 import { action, computed } from '@ember-decorators/object';
-import { alias } from '@ember-decorators/object/computed';
+import { alias, and } from '@ember-decorators/object/computed';
 import Component from '@ember/component';
 import { task } from 'ember-concurrency';
 import config from 'ember-get-config';
@@ -18,18 +18,20 @@ export default class TagsManager extends Component.extend({
     save: task(function *(this: TagsManager) {
         this.registration.set('tags', [...this.currentTags]);
         yield this.registration.save();
-        this.set('inEditMode', false);
+        this.set('requestedEditMode', false);
     }),
 }) {
     // required
     registration!: Registration;
 
     // private
-    inEditMode: boolean = false;
+    requestedEditMode: boolean = false;
     currentTags: string[] = [];
 
     @alias('registration.userHasAdminPermission') userCanEdit!: boolean;
 
+    @and('userCanEdit', 'requestedEditMode') inEditMode!: boolean;
+
     didReceiveAttrs() {
         if (this.registration) {
             this.setProperties({ currentTags: [...this.registration.tags] });
@@ -48,7 +50,7 @@ export default class TagsManager extends Component.extend({
 
     @action
     startEditing() {
-        this.set('inEditMode', true);
+        this.set('requestedEditMode', true);
     }
 
     @action
@@ -68,6 +70,6 @@ export default class TagsManager extends Component.extend({
 
     @action
     cancel() {
-        this.set('inEditMode', false);
+        this.set('requestedEditMode', false);
     }
 }

lib/osf-components/addon/components/paginated-list/layout/component.ts

@@ -8,7 +8,7 @@ import template from './template';
 @layout(template)
 export default class PaginatedList extends Component {
     // Required arguments
-    items?: Array<unknown>;
+    items?: unknown[];
     page!: number;
     pageSize!: number;
     @requiredAction next!: () => void;

lib/osf-components/addon/components/validated-input/base-component.ts

@@ -12,7 +12,7 @@ import {
 import { isEmpty } from '@ember/utils';
 import { ChangesetDef } from 'ember-changeset/types';
 import { ResultCollection } from 'ember-cp-validations';
-import DS from 'ember-data';
+import DS, { AttributesFor, RelationshipsFor } from 'ember-data';
 import I18n from 'ember-i18n/services/i18n';
 
 import defaultTo from 'ember-osf-web/utils/default-to';
@@ -24,9 +24,9 @@ export enum ValidationStatus {
     HasWarning,
 }
 
-export default abstract class BaseValidatedInput extends Component {
+export default abstract class BaseValidatedInput<M extends DS.Model> extends Component {
     // Required arguments
-    valuePath!: keyof DS.Model;
+    valuePath!: AttributesFor<M> | RelationshipsFor<M>;
 
     // Optional arguments
     changeset?: ChangesetDef & DS.Model;
@@ -35,7 +35,7 @@ export default abstract class BaseValidatedInput extends Component {
     placeholder?: string;
     disabled: boolean = defaultTo(this.disabled, false);
     shouldShowMessages: boolean = defaultTo(this.shouldShowMessages, true);
-    model?: DS.Model;
+    model?: M;
 
     // Private properties
     @service i18n!: I18n;

lib/osf-components/addon/components/validated-input/checkbox/component.ts

@@ -1,7 +1,11 @@
+import DS, { AttributesFor } from 'ember-data';
+
 import { layout } from 'ember-osf-web/decorators/component';
+
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedCheckbox extends BaseValidatedComponent {
+export default class ValidatedCheckbox<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
 }

lib/osf-components/addon/components/validated-input/checkboxes/component.ts

@@ -1,4 +1,5 @@
 import { assert } from '@ember/debug';
+import DS, { RelationshipsFor } from 'ember-data';
 
 import { layout } from 'ember-osf-web/decorators/component';
 
@@ -7,7 +8,9 @@ import styles from './styles';
 import template from './template';
 
 @layout(template, styles)
-export default class ValidatedCheckboxes extends BaseValidatedComponent {
+export default class ValidatedCheckboxes<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: RelationshipsFor<M>;
+
     // Additional required arguments
     options!: any[]; // Model instances that could be added to the hasMany
 

lib/osf-components/addon/components/validated-input/custom/component.ts

@@ -1,7 +1,11 @@
+import DS, { AttributesFor, RelationshipsFor } from 'ember-data';
+
 import { layout } from 'ember-osf-web/decorators/component';
+
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedCheckbox extends BaseValidatedComponent {
+export default class ValidatedCheckbox<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M> | RelationshipsFor<M>;
 }

lib/osf-components/addon/components/validated-input/date/component.ts

@@ -1,12 +1,15 @@
 import { action } from '@ember-decorators/object';
+import DS, { AttributesFor } from 'ember-data';
 
 import { layout } from 'ember-osf-web/decorators/component';
 
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedDatePicker extends BaseValidatedComponent {
+export default class ValidatedDatePicker<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
+
     @action
     forceParse(component: any) {
         component._forceParse();

lib/osf-components/addon/components/validated-input/power-select/component.ts

@@ -1,12 +1,15 @@
 import { action } from '@ember-decorators/object';
+import DS, { AttributesFor } from 'ember-data';
 
 import { layout } from 'ember-osf-web/decorators/component';
 
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedPowerSelect extends BaseValidatedComponent {
+export default class ValidatedPowerSelect<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
+
     onchange?: (value: string) => void;
 
     search: () => any = this.search;
@@ -16,7 +19,7 @@ export default class ValidatedPowerSelect extends BaseValidatedComponent {
     placeholder?: string = this.placeholder;
 
     @action
-    powerSelectChanged(this: ValidatedPowerSelect, value: string) {
+    powerSelectChanged(value: string) {
         if (this.model && this.valuePath) {
             this.model.set(this.valuePath, value);
         }

lib/osf-components/addon/components/validated-input/recaptcha/component.ts

@@ -1,5 +1,6 @@
 import { action, computed } from '@ember-decorators/object';
 import Ember from 'ember';
+import DS, { AttributesFor } from 'ember-data';
 
 import { layout } from 'ember-osf-web/decorators/component';
 import BaseValidatedComponent from '../base-component';
@@ -10,7 +11,9 @@ export interface GRecaptcha {
 }
 
 @layout(template)
-export default class ValidatedRecaptcha extends BaseValidatedComponent {
+export default class ValidatedRecaptcha<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
+
     // Exposes a reset action the the parent scope.
     // Usage: `bindReset=(action (mut this.resetRecaptcha))`, then call `this.resetRecaptcha()` to trigger a reset
     bindReset?: (action: () => void) => void;
@@ -38,12 +41,12 @@ export default class ValidatedRecaptcha extends BaseValidatedComponent {
     }
 
     @action
-    onCaptchaResolved(this: ValidatedRecaptcha, reCaptchaResponse: string) {
+    onCaptchaResolved(reCaptchaResponse: string) {
         this.set('value', reCaptchaResponse);
     }
 
     @action
-    onCaptchaExpired(this: ValidatedRecaptcha) {
+    onCaptchaExpired() {
         this.set('value', '');
     }
 }

lib/osf-components/addon/components/validated-input/text/component.ts

@@ -1,11 +1,15 @@
+import DS, { AttributesFor } from 'ember-data';
+
 import { layout } from 'ember-osf-web/decorators/component';
 import defaultTo from 'ember-osf-web/utils/default-to';
 
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedText extends BaseValidatedComponent {
+export default class ValidatedText<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
+
     // Additional arguments
     password: boolean = defaultTo(this.password, false);
     onKeyUp?: () => void; // Action

lib/osf-components/addon/components/validated-input/textarea/component.ts

@@ -1,7 +1,11 @@
+import DS, { AttributesFor } from 'ember-data';
+
 import { layout } from 'ember-osf-web/decorators/component';
+
 import BaseValidatedComponent from '../base-component';
 import template from './template';
 
 @layout(template)
-export default class ValidatedTextArea extends BaseValidatedComponent {
+export default class ValidatedTextArea<M extends DS.Model> extends BaseValidatedComponent<M> {
+    valuePath!: AttributesFor<M>;
 }

lib/osf-components/addon/styles/headers.scss

@@ -1 +1 @@
-@import 'variables';
+@import 'app/styles/variables';

lib/registries/addon/components/comment-card/component.ts

@@ -59,7 +59,7 @@ export default class CommentCard extends Component.extend({
 
         this.toast.success(this.i18n.t('registries.overview.comments.retract_report.success'));
     }),
-    loadReplies: task(function *(this: CommentCard, more = false) {
+    loadReplies: task(function *(this: CommentCard, more: boolean = false) {
         if (!more) {
             const replies = yield this.comment.replies;
             if (!this.replies) {