[ENG-3423] Version metadata updates (#1361)

* sOnly show approved revisions on overview page

* Only show version metadata box when multiple versions have been approved

* Update mirage for tests

* Hide update button on node-card for non-admin

* Remove unneeded computed decorator

* Check if latestResponse is not defined. Fix test

* Update showMetadata condition for single response registrations

* Filter out first time submissions from pending-updates of moderation app

* Make how filters are being populated a bit more meaningful

* Wording changes

Author: futa-ikeda

lib/osf-components/addon/components/node-card/component.ts

@@ -87,7 +87,7 @@ export default class NodeCard extends Component {
     }
 
     get shouldShowUpdateButton() {
-        if (this.node instanceof RegistrationModel) {
+        if (this.node instanceof RegistrationModel && this.node.userHasAdminPermission) {
             return this.node.revisionState === RevisionReviewStates.Approved &&
                 (
                     this.node.reviewsState === RegistrationReviewStates.Accepted ||

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

@@ -32,6 +32,10 @@ export default class RegistrationFormViewSchemaBlocks extends Component {
     schemaBlockGroups?: SchemaBlockGroup[];
     responses?: { [key: string]: string };
 
+    get showMetadata() {
+        return this.registration.latestResponse.content && !this.registration.latestResponse.get('isOriginalResponse');
+    }
+
     @restartableTask({ on: 'didReceiveAttrs' })
     @waitFor
     async fetchSchemaBlocks() {

lib/osf-components/addon/components/registries/overview-form-renderer/template.hbs

@@ -1,7 +1,7 @@
 {{#if this.fetchSchemaBlocks.isRunning}}
     <LoadingIndicator @dark={{true}}/>
 {{else}}
-    {{#if (gt this.registration.schemaResponses.length 1)}}
+    {{#if this.showMetadata}}
         <Registries::VersionMetadata @revision={{@revision}} />
     {{/if}}
     <Registries::RegistrationFormNavigationDropdown

lib/osf-components/addon/components/registries/registration-list/manager/component.ts

@@ -17,11 +17,11 @@ export default class RegistrationListManager extends Component {
         const filter: Record<string, string | undefined> = { reviews_state: this.state, revision_state: undefined };
         if (this.state === RegistrationReviewStates.Embargo) {
             filter.reviews_state =
-                [RegistrationReviewStates.Embargo, RegistrationReviewStates.PendingEmbargoTermination].toString();
+                [RegistrationReviewStates.Embargo, RegistrationReviewStates.PendingEmbargoTermination].join();
         }
         if (this.state === RevisionReviewStates.RevisionPendingModeration) {
-            filter.revision_state = [RevisionReviewStates.RevisionPendingModeration].toString();
-            filter.reviews_state = undefined;
+            filter.revision_state = [RevisionReviewStates.RevisionPendingModeration].join();
+            filter.reviews_state = [RegistrationReviewStates.Embargo, RegistrationReviewStates.Accepted].join();
         }
         const query: Record<string, string | Record<string, string | undefined>> = {
             filter,

lib/registries/addon/overview/-components/diff-manager/component.ts

@@ -53,15 +53,17 @@ export default class DiffManager extends Component<Args> {
         } else {
             this.baseRevision = await registration.originalResponse;
         }
-        const revisions = await registration.queryHasMany('schemaResponses');
         if (headRevisionId) {
             let headRevision = this.store.peekRecord('schema-response', headRevisionId);
             if (!headRevision) {
                 headRevision = await this.store.findRecord('schema-response', headRevisionId);
             }
             this.headRevision = headRevision;
         } else {
-            this.headRevision = revisions.firstObject;
+            this.headRevision = await registration.latestResponse;
+            if (!this.headRevision) {
+                this.headRevision = await registration.originalResponse;
+            }
         }
         this.getDiff();
     }

mirage/factories/registration.ts

@@ -153,6 +153,7 @@ export default NodeFactory.extend<MirageRegistration & RegistrationTraits>({
             revisionResponses: newReg.registrationResponses,
         });
         newReg.update({ originalResponse: baseResponse });
+        newReg.update({ latestResponse: baseResponse });
     },
 
     dateRegistered() {

mirage/serializers/registration.ts

@@ -274,7 +274,7 @@ export default class RegistrationSerializer extends ApplicationSerializer<Mirage
         }
         if (model.attrs.latestResponseId !== null) {
             const { latestResponseId } = model.attrs;
-            relationships.originalResponse = {
+            relationships.latestResponse = {
                 data: {
                     id: latestResponseId as string,
                     type: 'schema-responses',

mirage/views/registration.ts

@@ -93,6 +93,7 @@ export function createRegistration(this: HandlerContext, schema: Schema) {
         registration: newReg, reviewsState: RevisionReviewStates.Unapproved,
     });
     newReg.update({ originalResponse: baseResponse });
+    newReg.update({ latestResponse: baseResponse });
     return newReg;
 }
 

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

@@ -25,7 +25,7 @@ module('Integration | Component | node-card', hooks => {
             tags: ['a', 'b', 'c'],
             description: 'Through the night',
             revisionState: RevisionReviewStates.Approved,
-        });
+        }, 'currentUserAdmin');
         server.create('contributor', { node: registration, index: 0, bibliographic: true });
         server.create('contributor', { node: registration, index: 1, bibliographic: true });
         server.create('contributor', { node: registration, index: 2, bibliographic: true });

translations/en-us.yml

@@ -1608,7 +1608,7 @@ registries:
         modalHeaderNoUpdates: 'Updates not allowed'
         modalBodyFirst: 'Updates to registration responses can be updated by clicking “Next”.<br>Edits to metadata including Description, Category, License, Publication DOI, and Tags are done on the registration by clicking the '
         modalBodySecond: ' icon.'
-        modalBodyNoUpdates: 'The {registryName} does not allow updates for this registration template.<br>Contact their registy if you have any questions.'
+        modalBodyNoUpdates: '{registryName} does not allow updates.<br>Contact their registry if you have any questions.'
         learnMore: 'Click <a href="https://help.osf.io/hc/en-us/articles/360035806634-Edit-Registration-Metadata" target="_blank">here</a>  to learn more.'
         next: Next
         cancel_update: 'Cancel update'