Merge branch 'release/20.1.0'

Author: jamescdavis

.nvmrc

@@ -1 +1 @@
-8
+10

CHANGELOG.md

@@ -4,6 +4,67 @@ 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).
 
+## [20.1.0] - 2020-01-21
+### Added
+- Components
+ - `registries/schema-block-renderer/read-only/multi-select`
+ - `registries/registration-form-navigation-dropdown`
+ - `registries/overview-form-renderer`
+
+### Fixed
+- Transforms
+ - registration-responses
+ - handle case where registration_responses is null
+- Componenets
+ - `registries/schema-block-renderer/read-only/mapper`
+ - use `registries/schema-block-renderer/read-only/multi-select`
+ - `registries/draft-registration-manager`
+ - use set to set registration responses
+ - `registries/schema-block-renderer/read-only/response`
+ - preserve whitespace formatting in read-only response
+ - `files/menu`
+ - use responsive-dropdown without trigger div
+ - prevent outside click from interrupting upload
+ - `files/upload-zone`
+ - do not show toast error for ongoing "canceled" uploads
+ - `registries/schema-block-renderer/label/label-content`
+ - add links to questions for review page
+- Engines
+ - `registries`
+ - Components
+ - `registries-metadata`
+ - make contributors a link only for users with read access
+
+### Changed
+- Models
+ - `registration`
+ - apply `registration-responses` transform to `registrationResponses`
+- Serializers
+ - `registration`
+ - normalize `registration_responses`
+- Components
+ - `registries/review-form-renderer`
+ - invoke `Registries::RegistrationFormNavigationDropdown`
+ - `registries/schema-block-renderer/label/label-content`
+ - only render link to question when `@draftManager` is provided
+ - `registries/schema-block-renderer/read-only/files`
+ - only attempt to show validation when `@changeset` is provided
+- Routes
+ - `developer-apps`
+ - Components
+ - `client-secret`
+ - PATCH to API when resetting client secret for developer app
+- Engines
+ - `registries`
+ - Routes
+ - `overview/index`
+ - invoke `Registries::OverviewFormRenderer` instead of `RegistrationFormView`
+- Tests
+ - add percy snapshots for osf-navbar and registries-navbar
+- DX
+ - use Node 10 and pin with Volta
+ - set EMBER_ENV=test when running tests
+
 ## [19.11.0] - 2019-12-16
 ### Added
 - Components
@@ -1491,7 +1552,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
-[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/19.10.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/20.1.0...develop
+[20.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.1.0
+[19.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.11.0
 [19.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.10.0
 [19.9.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.9.0
 [19.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/19.8.0

app/locales/en/translations.ts

@@ -1678,6 +1678,7 @@ export default {
  'schema-block-renderer/label': {
  showExample: 'Show example',
  hideExample: 'Hide example',
+ editButtonAriaLabel: 'Edit {{questionLabel}}',
  },
  'schema-block-renderer/editable/files': {
  instructions: 'You may attach up to 5 file(s) to this question. You may attach files that you already have in OSF Storage in this <a href={{nodeUrl}}>{{projectOrComponent}}</a> or upload (drag and drop) a new file from your computer. Uploaded files will automatically be added to this <a href={{nodeUrl}}>{{projectOrComponent}}</a> so that they can be registered. To attach files from other components or an add-on, first add them to this <a href={{nodeUrl}}>{{projectOrComponent}}</a>.',

app/models/developer-app.ts

@@ -2,10 +2,6 @@ import { attr } from '@ember-decorators/data';
 import { buildValidations, validator } from 'ember-cp-validations';
 import { Link } from 'jsonapi-typescript';
 
-import { Document as ApiResponseDocument } from 'osf-api';
-
-import getHref from 'ember-osf-web/utils/get-href';
-
 import OsfModel, { OsfLinks } from './osf-model';
 
 const Validations = buildValidations({
@@ -42,34 +38,6 @@ export default class DeveloperAppModel extends OsfModel.extend(Validations) {
  @attr() homeUrl!: string;
  @attr() name!: string;
  @attr() owner!: string;
-
- // TODO (EMB-407) When the API is updated, remove this method and reset the secret
- // by PATCHing `clientSecret` to `null`
- async resetSecret(): Promise<void> {
- const resetUrl = getHref(this.links.reset);
- const adapter = this.store.adapterFor('developer-app');
- const serializer = this.store.serializerFor('developer-app');
-
- // @ts-ignore -- Private API
- const snapshot = this._createSnapshot();
-
- const response: ApiResponseDocument = await adapter.ajax(resetUrl, 'POST', {
- data: serializer.serialize(snapshot, {
- includeId: true,
- osf: {
- includeCleanData: true,
- },
- }),
- });
-
- if ('data' in response && 'id' in response.data) {
- this.store.pushPayload('developer-app', response);
- } else if ('errors' in response) {
- throw new Error(response.errors.map(error => error.detail).join('\n'));
- } else {
- throw new Error('Unexpected response while resetting client secret for developer app');
- }
- }
 }
 
 declare module 'ember-data/types/registries/model' {

app/models/registration.ts

@@ -55,7 +55,7 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
  @attr('fixstring') registrationSupplement?: string;
  @attr('fixstring') articleDoi!: string | null;
  @attr('object') registeredMeta!: RegistrationMetadata;
- @attr('object') registrationResponses!: RegistrationResponse;
+ @attr('registration-responses') registrationResponses!: RegistrationResponse;
 
  // Write-only attributes
  @attr('array') includedNodeIds?: string[];

app/serializers/developer-app.ts

@@ -4,10 +4,6 @@ export default class DeveloperAppSerializer extends OsfSerializer {
  attrs: any = {
  // eslint-disable-next-line ember/no-attrs-in-components
  ...this.attrs, // from OsfSerializer
-
- clientSecret: {
- serialize: false,
- },
  clientId: {
  serialize: false,
  },

app/serializers/draft-registration.ts

@@ -20,7 +20,7 @@ function isObject(value: unknown) {
  return typeof value === 'object' && !isEmpty(value);
 }
 
-function normalizeRegistrationResponses(value: ResponseValue, store: DS.Store) {
+export function normalizeRegistrationResponses(value: ResponseValue, store: DS.Store) {
  if (Array.isArray(value) && !isEmpty(value) && isObject(value.firstObject) &&
  ('file_id' in value.firstObject)) {
  return (value as FileReference[]).map((fileRef: FileReference) => {

app/serializers/registration.ts

@@ -1,6 +1,34 @@
+import DS from 'ember-data';
+
+import {
+ NormalizedRegistrationResponse,
+ RegistrationResponse,
+} from 'ember-osf-web/packages/registration-schema';
+import { normalizeRegistrationResponses } from 'ember-osf-web/serializers/draft-registration';
+import { mapKeysAndValues } from 'ember-osf-web/utils/map-keys';
+import { SingleResourceDocument } from 'osf-api';
 import OsfSerializer from './osf-serializer';
 
 export default class RegistrationSerializer extends OsfSerializer {
+ normalizeResponse(
+ store: DS.Store,
+ primaryModelClass: any,
+ payload: SingleResourceDocument,
+ id: string,
+ requestType: string,
+ ) {
+ if (payload.data.attributes) {
+ const registrationResponses = payload.data.attributes.registration_responses as RegistrationResponse;
+ // @ts-ignore
+ // eslint-disable-next-line no-param-reassign
+ payload.data.attributes.registration_responses = mapKeysAndValues(
+ registrationResponses || {},
+ key => key,
+ value => normalizeRegistrationResponses(value, store),
+ ) as NormalizedRegistrationResponse;
+ }
+ return super.normalizeResponse(store, primaryModelClass, payload, id, requestType);
+ }
 }
 
 declare module 'ember-data/types/registries/serializer' {

app/settings/developer-apps/-components/client-secret/component.ts

@@ -31,8 +31,8 @@ export default class DeveloperAppClientSecret extends Component {
  async resetSecret() {
  if (this.developerApp) {
  this.set('shouldShowSecret', false);
- // TODO (EMB-407) When the API is updated, PATCH `clientSecret` to `null`
- await this.developerApp.resetSecret();
+ this.developerApp.set('clientSecret', null);
+ await this.developerApp.save();
  this.toast.success(this.i18n.t('settings.developer-apps.resetSecret.success'));
  }
  }

app/transforms/registration-responses.ts

@@ -5,8 +5,15 @@ import { deserializeResponseKey, serializeResponseKey } from './registration-res
 
 const { Transform } = DS;
 
+function isResponse(obj: unknown): obj is Record<string, unknown> {
+ return typeof obj === 'object' && obj !== null && Object.keys(obj).every(key => typeof key === 'string');
+}
+
 export default class RegistrationResponsesTransform extends Transform {
- deserialize(obj: any) {
+ deserialize(obj: unknown) {
+ if (!isResponse(obj)) {
+ return {};
+ }
  return mapKeysAndValues(
  obj,
  key => deserializeResponseKey(key),