Merge branch 'release/21.5.0'

Author: fabmiz

CHANGELOG.md

@@ -4,6 +4,19 @@ 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
@@ -1728,7 +1741,8 @@ 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.1...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

app/dashboard/controller.ts

@@ -15,6 +15,8 @@ import User from 'ember-osf-web/models/user';
 import Analytics from 'ember-osf-web/services/analytics';
 import CurrentUser from 'ember-osf-web/services/current-user';
 
+import $ from 'jquery';
+
 // TODO pull these from the database
 const {
     dashboard: {
@@ -80,7 +82,6 @@ export default class Dashboard extends Controller {
 
         const nodes: QueryHasManyResult<Node> = yield user.queryHasMany('sparseNodes', {
             embed: ['bibliographic_contributors', 'parent', 'root'],
-            // eslint-disable-next-line ember/no-global-jquery
             filter: this.filter ? { title: $('<div>').text(this.filter).html() } : undefined,
             page: more ? this.incrementProperty('page') : this.set('page', 1),
             sort: this.sort || undefined,

app/guid-node/registrations/controller.ts

@@ -5,8 +5,10 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { task } from 'ember-concurrency-decorators';
 import DS from 'ember-data';
+import config from 'ember-get-config';
 
 import Node from 'ember-osf-web/models/node';
+import RegistrationProviderModel from 'ember-osf-web/models/registration-provider';
 import RegistrationSchema from 'ember-osf-web/models/registration-schema';
 import Analytics from 'ember-osf-web/services/analytics';
 
@@ -37,11 +39,12 @@ export default class GuidNodeRegistrations extends Controller {
 
     @task({ withTestWaiter: true })
     getRegistrationSchemas = task(function *(this: GuidNodeRegistrations) {
-        let schemas = yield this.store.query('registration-schema',
-            {
-                'filter[active]': true,
-                'page[size]': 100,
-            });
+        const { defaultProvider } = config;
+        const provider: RegistrationProviderModel = yield this.store.findRecord(
+            'registration-provider',
+            defaultProvider,
+        );
+        let schemas: RegistrationSchema[] = yield provider.loadAll('schemas');
         schemas = schemas.toArray();
         schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => a.name.length - b.name.length);
         this.set('defaultSchema', schemas.firstObject);

app/models/review-action.ts

@@ -35,7 +35,7 @@ export default class ReviewActionModel extends OsfModel {
     @service intl!: Intl;
 
     @attr('string') actionTrigger!: ReviewActionTrigger;
-    @attr('string') comment!: string;
+    @attr('fixstring') comment!: string;
     @attr('string') fromState!: string;
     @attr('string') toState!: string;
     @attr('date') dateCreated!: Date;

app/services/current-user.ts

@@ -10,6 +10,8 @@ import RSVP from 'rsvp';
 import User from 'ember-osf-web/models/user';
 import { addQueryParam } from 'ember-osf-web/utils/url-parts';
 
+import $ from 'jquery';
+
 const {
     OSF: {
         url: osfUrl,

config/optional-features.json

@@ -1,3 +1,4 @@
 {
+  "jquery-integration": true,
   "template-only-glimmer-components": true
 }

lib/app-components/addon/helpers/fix-string.ts

@@ -0,0 +1,8 @@
+import Helper from '@ember/component/helper';
+import fixSpecialChars from 'ember-osf-web/utils/fix-special-char';
+
+export default class FixString extends Helper {
+    compute([textToFix]: [string]): string {
+        return fixSpecialChars(textToFix);
+    }
+}

lib/app-components/app/helpers/fix-string.js

@@ -0,0 +1 @@
+export { default } from 'app-components/helpers/fix-string';

lib/osf-components/addon/components/file-share-button/component.ts

@@ -9,6 +9,8 @@ import File from 'ember-osf-web/models/file';
 import Analytics from 'ember-osf-web/services/analytics';
 import pathJoin from 'ember-osf-web/utils/path-join';
 
+import $ from 'jquery';
+
 import styles from './styles';
 import template from './template';
 
@@ -130,7 +132,7 @@ export default class FileShareButton extends Component {
                 function renderMfr() {
                     var mfrRender = new mfr.Render("mfrIframe", "${this.mfrUrl}");
                 }
-                if (window.jQuery) {
+                if (window.$) {
                     renderMfr();
                 } else {
                     var jq = document.createElement('script');

lib/osf-components/addon/components/provider-metadata-display/template.hbs

@@ -12,6 +12,6 @@
         data-test-registration-provider-metadata-field-value={{@field.field_name}}
         local-class='ProviderMetadataValue'
     >
-        {{@field.field_value}}
+        {{fix-string @field.field_value}}
     </span>
 </div>