Merge branch 'develop' into ember-24-lts

Author: fabmiz

CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+## [21.5.0] - 2021-05-27
+### Fixed
+- registration Detail Page: longer license types spill out of bounds
+- unencode special characters in Registries Moderator Comments and Registries Custom Metadata
+- (deprecations) use jQuery in lieu of Ember.$()
+- (deprecations) use ember-copy in lieu of copy method and Copyable mixin
+
+### Changed
+- (project-based registration) ensure only templates associated with OSF Registries is shown
+
+### Added
+- (my-registrations page) text explaining how submitted/draft registrations are sorted
+
+## [21.4.1] - 2021-05-26
+### Changed
+- hide registration state for anonymous VOLs
+- `reviewsState` to optional on the `registration` model
+
 ## [21.4.0] - 2021-04-11
 ### Added
 - user's `myRegistrations` page
@@ -1723,7 +1741,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/21.4.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.5.0...develop
+[21.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.5.0
+[21.4.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.1
 [21.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.4.0
 [21.3.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.3.0
 [21.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.2.0

app/models/registration.ts

@@ -79,7 +79,7 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('fixstring') articleDoi!: string | null;
     @attr('object') registeredMeta!: RegistrationMetadata;
     @attr('registration-responses') registrationResponses!: RegistrationResponse;
-    @attr('fixstring') reviewsState!: RegistrationReviewStates;
+    @attr('fixstring') reviewsState?: RegistrationReviewStates;
     @attr('fixstring') iaUrl?: string;
     @attr('array') providerSpecificMetadata!: ProviderMetadata[];
 

lib/registries/addon/components/make-decision-dropdown/component.ts

@@ -50,22 +50,30 @@ export default class MakeDecisionDropdown extends Component<Args> {
     };
 
     get commentTextArea() {
-        if ([RegistrationReviewStates.Pending, RegistrationReviewStates.PendingWithdraw]
-            .includes(this.args.registration.reviewsState)) {
+        if (this.args.registration.reviewsState) {
+            if ([RegistrationReviewStates.Pending, RegistrationReviewStates.PendingWithdraw]
+                .includes(this.args.registration.reviewsState)) {
+                return {
+                    label: this.intl.t('registries.makeDecisionDropdown.additionalComment'),
+                    placeholder: this.intl.t('registries.makeDecisionDropdown.additionalCommentPlaceholder'),
+                };
+            }
+
             return {
-                label: this.intl.t('registries.makeDecisionDropdown.additionalComment'),
-                placeholder: this.intl.t('registries.makeDecisionDropdown.additionalCommentPlaceholder'),
+                label: this.intl.t('registries.makeDecisionDropdown.justificationForWithdrawal'),
+                placeholder: this.intl.t('registries.makeDecisionDropdown.justificationForWithdrawalPlaceholder'),
             };
         }
-
+        // registration is viewed anonymously and this component should not be visible
         return {
-            label: this.intl.t('registries.makeDecisionDropdown.justificationForWithdrawal'),
-            placeholder: this.intl.t('registries.makeDecisionDropdown.justificationForWithdrawalPlaceholder'),
+            label: '',
+            placeholder: '',
         };
     }
 
     get hasModeratorActions() {
-        return ![
+        return this.args.registration.reviewsState
+        && ![
             RegistrationReviewStates.Initial,
             RegistrationReviewStates.Withdrawn,
             RegistrationReviewStates.Rejected,

lib/registries/addon/components/registries-states/component.ts

@@ -49,7 +49,7 @@ export default class RegistriesStates extends Component {
     )
     /* eslint-enable max-len */
     get stateText() {
-        if (!this.registration) {
+        if (!this.registration || !this.registration.reviewsState) {
             return undefined;
         }
         let stateKey;
@@ -75,6 +75,7 @@ export default class RegistriesStates extends Component {
     @computed('registration.{userHasAdminPermission,reviewsState}')
     get shouldOpenDropdownOnLoad() {
         return this.registration.userHasAdminPermission
+        && this.registration.reviewsState
         && ![
             RegistrationReviewStates.Embargo,
             RegistrationReviewStates.Accepted,
@@ -96,6 +97,7 @@ export default class RegistriesStates extends Component {
             !this.registration.isRoot
             || !this.registration.userHasAdminPermission
             || this.isModeratorMode
+            || !this.registration.reviewsState
             || !(
                 [RegistrationReviewStates.Accepted, RegistrationReviewStates.Embargo].includes(
                     this.registration.reviewsState,

lib/registries/addon/overview/-components/overview-topbar/template.hbs

@@ -1,10 +1,12 @@
-<div data-test-topbar-states>
-    <RegistriesStates
-        @registration={{@registration}}
-        @isModeratorMode={{@isModeratorMode}}
-    />
-</div>
-{{#if @isModeratorMode}}
+{{#unless @registration.isAnonymous}}
+    <div data-test-topbar-states>
+        <RegistriesStates
+            @registration={{@registration}}
+            @isModeratorMode={{@isModeratorMode}}
+        />
+    </div>
+{{/unless}}
+{{#if (and @isModeratorMode (not @registration.isAnonymous))}}
     <MakeDecisionDropdown @registration={{@registration}} />
 {{else}}
     <div data-test-topbar-share-bookmark-fork

mirage/serializers/application.ts

@@ -53,9 +53,9 @@ export default class ApplicationSerializer<T extends Model> extends JSONAPISeria
     serialize(model: ModelInstance<T>, request: Request) {
         const json = super.serialize(model, request);
         json.data.links = this.buildNormalLinks(model);
-        json.data.meta = {
+        json.meta = {
             ...this.buildApiMeta(model),
-            ...(json.data.meta || {}),
+            ...(json.meta || {}),
         };
         json.data.relationships = Object
             .entries(this.buildRelationships(model))

mirage/serializers/registration.ts

@@ -241,4 +241,11 @@ export default class RegistrationSerializer extends ApplicationSerializer<Mirage
         }
         return relationships;
     }
+
+    buildApiMeta(model: ModelInstance<MirageRegistration>) {
+        return {
+            ...super.buildApiMeta(model),
+            ...(model.attrs._anonymized ? { anonymous: true } : {}),
+        };
+    }
 }

mirage/views/registration.ts

@@ -33,10 +33,13 @@ export function registrationDetail(this: HandlerContext, schema: Schema, request
             errors: [{ detail: 'Not found.' }],
         });
     }
+    const serializedRegistration = this.serialize(registration);
+    const { data } = process(schema, request, this, [serializedRegistration.data]);
 
-    const { data } = process(schema, request, this, [this.serialize(registration).data]);
-
-    return { data: data[0] };
+    return {
+        data: data[0],
+        meta: serializedRegistration.meta,
+    };
 }
 
 export function createNodeFromDraftNode(

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "21.4.0",
+  "version": "21.5.0",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",

tests/engines/registries/acceptance/overview/topbar-test.ts

@@ -96,6 +96,18 @@ module('Registries | Acceptance | overview.topbar', hooks => {
         assert.dom('[data-test-topbar-states]').doesNotExist();
     });
 
+    test('registration state is not visible in topbar when viewing registrations anonymously', async assert => {
+        const anonymousReg = server.create('registration', {
+            registrationSchema: server.schema.registrationSchemas.find('prereg_challenge'),
+        }, 'anonymized');
+
+        await visit(`/${anonymousReg.id}/`);
+        await percySnapshot(assert);
+
+        assert.dom('[data-test-topbar-share-bookmark-fork]').exists();
+        assert.dom('[data-test-topbar-states]').doesNotExist();
+    });
+
     test('bookmarks work', async assert => {
         const reg = server.create('registration', {
             registrationSchema: server.schema.registrationSchemas.find('prereg_challenge'),