Merge branch 'release/22.2.0'

Author: adlius

CHANGELOG.md

@@ -4,6 +4,10 @@ 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).
 
+## [22.2.0] - 2022-2-22
+### Changed
+- Misc bug fixes
+
 ## [22.1.0] - 2022-1-19
 ### Changed
 - Upgraded dependencies
@@ -1823,6 +1827,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[22.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.2.0
 [22.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.1.0
 [21.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.11.0
 [21.10.2]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.10.2

lib/collections/addon/index/template.hbs

@@ -101,7 +101,7 @@
                                 {{t 'collections.index.service_bottom.div.line1'}}
                                 <a
                                     local-class='source-code-link'
-                                    href='https://github.com/CenterForOpenScience/ember-osf-registries'
+                                    href='https://github.com/CenterForOpenScience/ember-osf-web'
                                     onclick={{action 'click' 'link' 'Index - GitHub Repo' target=this.analytics}}
                                 >
                                     {{t 'collections.index.service_bottom.div.linkText1'}}

lib/osf-components/addon/components/node-card/template.hbs

@@ -123,15 +123,22 @@
                     <dd data-test-registration-registry-name>
                         {{@node.provider.name}}
                     </dd><br />
+                    <dt data-test-created-timestamp-label>
+                        {{t (concat 'node_card.registration.timestamp_label')}}
+                    </dt>
+                    <dd data-test-created-timestamp-value>
+                        {{moment @node.dateRegistered}}
+                    </dd><br />
+                {{else}}
+                    <dt data-test-created-timestamp-label>
+                        {{t (concat 'node_card.' @node.nodeType '.timestamp_label')}}
+                    </dt>
+                    <dd data-test-created-timestamp-value>
+                        {{moment @node.dateCreated}}
+                    </dd><br />
                 {{/if}}
-                <dt data-test-created-timestamp-label>
-                    {{t (concat 'node_card.' @node.nodeType '.timestamp_label')}}        
-                </dt>
-                <dd data-test-created-timestamp-value>
-                    {{moment @node.dateCreated}}
-                </dd><br />
                 <dt data-test-updated-timestamp-label>
-                    {{t 'node_card.last_updated'}}        
+                    {{t 'node_card.last_updated'}}
                 </dt>
                 <dd data-test-updated-timestamp-value>
                     {{moment @node.dateModified}}

lib/osf-components/addon/components/registries/overview-form-renderer/component.ts

@@ -3,14 +3,20 @@ import Store from '@ember-data/store';
 import { inject as service } from '@ember/service';
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 import { waitFor } from '@ember/test-waiters';
-import { restartableTask } from 'ember-concurrency';
+import { tracked } from '@glimmer/tracking';
+import { restartableTask, task } from 'ember-concurrency';
+import { taskFor } from 'ember-concurrency-ts';
+import Intl from 'ember-intl/services/intl';
 import Toast from 'ember-toastr/services/toast';
 
 import { layout } from 'ember-osf-web/decorators/component';
+import ModeratorModel from 'ember-osf-web/models/moderator';
 import Registration from 'ember-osf-web/models/registration';
 import SchemaResponseModel from 'ember-osf-web/models/schema-response';
 import { getSchemaBlockGroups, SchemaBlock, SchemaBlockGroup } from 'ember-osf-web/packages/registration-schema';
+import CurrentUserService from 'ember-osf-web/services/current-user';
 import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
 
 import template from './template';
@@ -20,20 +26,27 @@ import template from './template';
 export default class RegistrationFormViewSchemaBlocks extends Component {
     @service store!: Store;
     @service toast!: Toast;
+    @service currentUser!: CurrentUserService;
+    @service intl!: Intl;
     // Required parameter
     registration!: Registration;
     revision!: SchemaResponseModel;
 
     // Optional parameters
     updatedResponseIds?: string[];
+    mode?: string;
 
     // Private properties
     schemaBlocks?: SchemaBlock[];
     schemaBlockGroups?: SchemaBlockGroup[];
     responses?: { [key: string]: string };
 
+    @tracked currentModerator?: ModeratorModel;
+
+    @computed('currentModerator', 'registration.{latestResponse.content,schemaResponses.length}')
     get showMetadata() {
-        return this.registration.latestResponse.content && !this.registration.latestResponse.get('isOriginalResponse');
+        return this.registration.latestResponse.content && !this.registration.latestResponse.get('isOriginalResponse')
+            || (Boolean(this.currentModerator) && this.registration.schemaResponses.length > 1);
     }
 
     @restartableTask({ on: 'didReceiveAttrs' })
@@ -55,7 +68,26 @@ export default class RegistrationFormViewSchemaBlocks extends Component {
         }
     }
 
+    @task
+    @waitFor
+    async loadCurrentModerator() {
+        try {
+            this.currentModerator = await this.store.findRecord('moderator', this.currentUser.currentUserId!,
+                {
+                    adapterOptions: {
+                        providerId: this.registration.provider.get('id'),
+                    },
+                });
+        } catch (e) {
+            captureException(e);
+            this.toast.error(this.intl.t('registries.overviewHeader.needModeratorPermission'));
+        }
+    }
+
     didReceiveAttrs() {
-        assert('OverviewFormRenderer needs a registration',Boolean(this.registration));
+        assert('OverviewFormRenderer needs a registration', Boolean(this.registration));
+        if (this.mode === 'moderator') {
+            taskFor(this.loadCurrentModerator).perform();
+        }
     }
 }

lib/registries/addon/components/registries-metadata/template.hbs

@@ -65,7 +65,7 @@
     </div>
 
     <div local-class='Field'>
-        <h4>{{t 'registries.registration_metadata.registered_from'}}</h4>
+        <h4>{{t 'registries.registration_metadata.associated_project'}}</h4>
         <div>
             <OsfLink
                 data-analytics-name='Registered from'

lib/registries/addon/components/registries-services-list/template.hbs

@@ -27,7 +27,7 @@
                     {{t 'registries.index.services.bottom.div.line1'}}
                     <a
                         local-class='ServicesList__ExternalLink'
-                        href='https://github.com/CenterForOpenScience/ember-osf-registries'
+                        href='https://github.com/CenterForOpenScience/ember-osf-web'
                         onclick={{action 'click' 'link' 'Index - GitHub Repo' 'https://github.com/CenterForOpenScience/ember-osf-web'
                             target=this.analytics}}
                     >

lib/registries/addon/overview/index/template.hbs

@@ -17,6 +17,7 @@
     as |diffManager|>
         {{#if diffManager.headRevision}}
             <Registries::OverviewFormRenderer
+                @mode={{this.overview.mode}}
                 @registration={{this.registration}}
                 @revision={{diffManager.headRevision}}
                 @updatedResponseIds={{diffManager.updatedKeys}}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "22.1.0",
+  "version": "22.2.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/integration/index/index-test.ts

@@ -96,7 +96,7 @@ module('Registries | Integration | index', hooks => {
                     expected: [
                         'link',
                         'Index - GitHub Repo',
-                        'https://github.com/CenterForOpenScience/ember-osf-registries',
+                        'https://github.com/CenterForOpenScience/ember-osf-web',
                         sinon.match.any,
                     ],
                 },

tests/integration/components/node-card/component-test.ts

@@ -68,7 +68,7 @@ module('Integration | Component | node-card', hooks => {
         );
         assert.dom('[data-test-created-timestamp-value]').exists('Created timestamp value exists');
         assert.dom('[data-test-created-timestamp-value]').hasText(
-            `${moment(registration.dateCreated)}`,
+            `${moment(registration.dateRegistered)}`,
             'Created timestamp value is correct',
         );
         assert.dom('[data-test-updated-timestamp-value]').exists('Updated timestamp value exists');