Merge branch 'release/23.01.0'

Author: adlius

CHANGELOG.md

@@ -4,6 +4,11 @@ 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).
 
+## [23.01.0] - 2023-01-25
+### Changed
+- Collections Moderation bug and improvements
+### Added
+- User profile settings page institutional affiliation management
 
 ## [22.11.0] - 2022-12-19
 ### Changed
@@ -1884,6 +1889,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[23.01.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/23.01.0
+[22.11.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.11.0
+[22.10.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.10.0
+[22.9.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.9.0
 [22.8.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.8.0
 [22.7.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.7.0
 [22.6.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.6.0

app/meetings/detail/-components/meeting-detail-header/template.hbs

@@ -55,7 +55,7 @@
         <ul data-test-meeting-email-address-line>
             {{#if this.meeting.isAcceptingTypeOne}}
                 <li>
-                    {{t 'meetings.detail.meeting-detail-header.email_text'
+                    {{t 'meetings.detail.meeting-detail-header.email_text_mail_to'
                         typeName=this.meeting.fieldNames.submission1_plural
                         emailAddress=this.meeting.typeOneSubmissionEmail
                         htmlSafe=true
@@ -65,7 +65,7 @@
 
             {{#if this.meeting.isAcceptingTypeTwo}}
                 <li>
-                    {{t 'meetings.detail.meeting-detail-header.email_text'
+                    {{t 'meetings.detail.meeting-detail-header.email_text_mail_to'
                         typeName=this.meeting.fieldNames.submission2_plural
                         emailAddress=this.meeting.typeTwoSubmissionEmail
                         htmlSafe=true

app/packages/registration-schema/validations.ts

@@ -12,6 +12,8 @@ import { SchemaBlockGroup } from 'ember-osf-web/packages/registration-schema/sch
 import { validateFileList } from 'ember-osf-web/validators/validate-response-format';
 import SchemaResponseModel from 'ember-osf-web/models/schema-response';
 
+type LicensedContent = DraftRegistration | NodeModel;
+
 export const NodeLicenseFields: Record<keyof NodeLicense, string> = {
     copyrightHolders: 'Copyright Holders',
     year: 'Year',
@@ -78,7 +80,7 @@ export function buildValidation(groups: SchemaBlockGroup[], node?: NodeModel | D
 }
 
 export function validateNodeLicense() {
-    return async (_: unknown, __: unknown, ___: unknown, changes: DraftRegistration, content: DraftRegistration) => {
+    return async (_: unknown, __: unknown, ___: unknown, changes: LicensedContent, content: LicensedContent) => {
         let validateLicenseTarget = await content.license;
         let validateNodeLicenseTarget = content.nodeLicense;
         if (changes?.license && Object.keys(changes.license).length
@@ -93,6 +95,19 @@ export function validateNodeLicense() {
         if (!validateLicenseTarget || validateLicenseTarget?.requiredFields?.length === 0) {
             return true;
         }
+
+        if (validateLicenseTarget.requiredFields?.includes('year')) {
+            const year = validateNodeLicenseTarget?.year;
+            const regex = /^((?!(0))[0-9]{4})$/;
+            if (year && !regex.test(year)) {
+                return {
+                    context: {
+                        type: 'year_format',
+                    },
+                };
+            }
+        }
+
         const missingFieldsList: Array<keyof NodeLicense> = [];
         for (const item of validateLicenseTarget.requiredFields) {
             if (!validateNodeLicenseTarget || !validateNodeLicenseTarget[item]) {
@@ -115,27 +130,6 @@ export function validateNodeLicense() {
     };
 }
 
-export function validateNodeLicenseYear() {
-    return (_: unknown, __: unknown, ___: unknown, changes: any, content: DraftRegistration) => {
-        let validateYearTarget;
-        if (content.nodeLicense && 'year' in content.nodeLicense) {
-            validateYearTarget = content.nodeLicense.year;
-        }
-        if (changes?.nodeLicense && 'year' in changes.nodeLicense) {
-            validateYearTarget = changes.nodeLicense.year;
-        }
-        const regex = /^((?!(0))[0-9]{4})$/;
-        if (typeof validateYearTarget !== 'undefined' && !regex.test(validateYearTarget)) {
-            return {
-                context: {
-                    type: 'year_format',
-                },
-            };
-        }
-        return true;
-    };
-}
-
 export function validateSubjects() {
     return (_: unknown, __: unknown, ___: unknown, ____: unknown, content: DraftRegistration) => {
         const subjects = content.hasMany('subjects').value();

app/settings/account/-components/affiliated-institutions/component.ts

@@ -0,0 +1,40 @@
+import Component from '@glimmer/component';
+import { inject as service } from '@ember/service';
+import CurrentUserService from 'ember-osf-web/services/current-user';
+import { task } from 'ember-concurrency';
+import { waitFor } from '@ember/test-waiters';
+import { taskFor } from 'ember-concurrency-ts';
+import InstitutionModel from 'ember-osf-web/models/institution';
+import config from 'ember-get-config';
+import IntlService from 'ember-intl/services/intl';
+import captureException, { getApiErrorMessage } from 'ember-osf-web/utils/capture-exception';
+
+const { support: { supportEmail } } = config;
+
+export default class AffiliatedInstitutionsComponent extends Component {
+    @service currentUser!: CurrentUserService;
+    @service intl!: IntlService;
+    @service toast!: Toastr;
+
+    reloadAffiliations: any;
+
+    @task
+    @waitFor
+    async removeAffiliationTask(institution: InstitutionModel) {
+        try {
+            await this.currentUser.user?.deleteM2MRelationship('institutions', institution);
+        } catch (e) {
+            const errorMessage = this.intl.t(
+                'settings.account.connected_identities.remove_fail',
+                { supportEmail, htmlSafe: true },
+            );
+            captureException(e, { errorMessage: errorMessage.toString() });
+            this.toast.error(getApiErrorMessage(e), errorMessage as string);
+        }
+        this.reloadAffiliations();
+    }
+
+    removeAffiliation(institution: InstitutionModel) {
+        taskFor(this.removeAffiliationTask).perform(institution);
+    }
+}

app/settings/account/-components/affiliated-institutions/styles.scss

@@ -0,0 +1,26 @@
+.institutions-list ul {
+    margin: 0;
+
+    & > li {
+        border: 0;
+        padding: 10px;
+
+        &:hover {
+            background-color: #e6e6e6;
+        }
+    }
+}
+
+.delete-button {
+    margin-top: -2px;
+    float: right;
+    clear: right;
+
+    & > button {
+        padding: 0;
+    }
+}
+
+.description-list-separator {
+    margin-bottom: 10px;
+}

app/settings/account/-components/affiliated-institutions/template.hbs

@@ -0,0 +1,40 @@
+<Panel
+    data-test-connected-identities-panel
+    data-analytics-scope='Connected identities panel'
+    as |panel|
+>
+    <panel.heading @title={{t 'settings.account.affiliatedInstitutions.affiliatedInstitutions'}} />
+    <panel.body>
+        <p data-test-affiliated-institutions-help-text>
+            {{t 'settings.account.affiliatedInstitutions.helpText' htmlSafe=true}}
+        </p>
+        <hr local-class='description-list-separator'>
+        <PaginatedList::HasMany
+            data-analytics-scope='User Affiliated Institutions'
+            local-class='institutions-list'
+            @model={{this.currentUser.user}}
+            @relationshipName='institutions'
+            @bindReload={{action (mut this.reloadAffiliations)}}
+            as |list|
+        >
+            <list.item as |item|>
+                <span data-test-affiliated-institutions-item='{{item.id}}'>
+                    {{item.name}}
+                    <DeleteButton
+                        data-test-affiliated-institutions-delete
+                        local-class='delete-button'
+                        @small={{true}}
+                        @noBackground={{true}}
+                        @delete={{action this.removeAffiliation item}}
+                        @modalTitle={{t 'settings.account.affiliatedInstitutions.deleteModalTitle'}}
+                        @modalBody={{t 'settings.account.affiliatedInstitutions.deleteModalBody' institutionName=item.name htmlSafe=true}}
+                    />
+                </span>
+            </list.item>
+
+            <list.empty>
+                {{t 'settings.account.affiliatedInstitutions.noAffiliations'}}
+            </list.empty>
+        </PaginatedList::HasMany>
+    </panel.body>
+</Panel>

app/settings/account/template.hbs

@@ -2,6 +2,7 @@
 <Settings::Account::-Components::ConnectedEmails />
 <Settings::Account::-Components::DefaultRegion />
 <Settings::Account::-Components::ConnectedIdentities />
+<Settings::Account::-Components::AffiliatedInstitutions />
 <Settings::Account::-Components::ChangePassword />
 <Settings::Account::-Components::Security />
 <Settings::Account::-Components::RequestDeactivation />

lib/app-components/addon/components/branded-navbar/template.hbs

@@ -34,6 +34,8 @@
                     {{#if @displayModerationButton}}
                         <li>
                             <OsfLink
+                                data-analytics-name='Collection moderation'
+                                data-test-branded-navbar-moderation
                                 @route='collections.provider.moderation'
                                 @models={{array this.providerId}}
                             >

lib/app-components/addon/components/project-metadata/component.ts

@@ -4,13 +4,20 @@ import Component from '@ember/component';
 import { action } from '@ember/object';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
+import { validatePresence } from 'ember-changeset-validations/validators';
 import { task } from 'ember-concurrency';
 import Intl from 'ember-intl/services/intl';
 import Toast from 'ember-toastr/services/toast';
+import { BufferedChangeset } from 'validated-changeset';
 
 import { layout, requiredAction } from 'ember-osf-web/decorators/component';
+import CollectionProviderModel from 'ember-osf-web/models/collection-provider';
+import LicenseModel from 'ember-osf-web/models/license';
 import Node from 'ember-osf-web/models/node';
+import { validateNodeLicense } from 'ember-osf-web/packages/registration-schema/validations';
 import Analytics from 'ember-osf-web/services/analytics';
+import buildChangeset from 'ember-osf-web/utils/build-changeset';
+import captureException from 'ember-osf-web/utils/capture-exception';
 import styles from './styles';
 import template from './template';
 
@@ -22,17 +29,88 @@ export default class ProjectMetadata extends Component {
     @service store!: Store;
     @service toast!: Toast;
 
+    provider!: CollectionProviderModel;
     node!: Node;
+    changeset!: BufferedChangeset;
+
+    nodeValidations = {
+        title: [
+            validatePresence({ presence: true, ignoreBlank: true, type: 'empty' }),
+        ],
+        description: [
+            validatePresence({ presence: true, ignoreBlank: true, type: 'empty' }),
+        ],
+        license: [
+            this.validateCollectionLicense(),
+        ],
+        nodeLicense: [
+            validateNodeLicense(),
+        ],
+    };
 
     @requiredAction continue!: () => void;
 
+    init() {
+        super.init();
+        this.changeset = buildChangeset(this.node, this.nodeValidations);
+    }
+
     @task
     @waitFor
     async reset() {
         this.node.rollbackAttributes();
         await this.node.reload();
     }
 
+    @task
+    @waitFor
+    async save() {
+        await this.changeset.validate();
+        if (this.changeset.isValid) {
+            try {
+                await this.changeset.save();
+                this.onSave();
+            } catch (e) {
+                this.onError(e);
+            }
+        } else {
+            this.toast.error(this.intl.t('app_components.project_metadata.invalid_metadata'));
+        }
+    }
+
+    validateCollectionLicense() {
+        return async (_: unknown, newValue: LicenseModel, oldValue: Promise<LicenseModel>, changes: Partial<Node>) => {
+            // if the license has not changed, use the old value to validate
+            // changes.license may exist even if the license has not changed
+            let currentLicense = newValue;
+            if (!changes.license?.id) {
+                currentLicense = await oldValue;
+            }
+            if (!currentLicense) {
+                return {
+                    context: {
+                        type: 'mustSelect',
+                    },
+                };
+            }
+
+            const licensesAcceptable = await this.provider.queryHasMany('licensesAcceptable', {
+                filter: {
+                    name: currentLicense.name,
+                },
+            });
+
+            if (!licensesAcceptable.includes(currentLicense)) {
+                return {
+                    context: {
+                        type: 'license_not_accepted',
+                    },
+                };
+            }
+            return true;
+        };
+    }
+
     @action
     addTag(tag: string) {
         this.analytics.click('button', 'Collection - Submit - Add tag');
@@ -52,7 +130,8 @@ export default class ProjectMetadata extends Component {
     }
 
     @action
-    onError() {
+    onError(e: Error) {
+        captureException(e);
         this.toast.error(this.intl.t('app_components.project_metadata.save_error'));
     }
 }

lib/app-components/addon/components/project-metadata/template.hbs

@@ -1,7 +1,5 @@
-<ValidatedModelForm
-    @onSave={{action this.onSave}}
-    @onError={{action this.onError}}
-    @model={{this.node}}
+<FormControls
+    @changeset={{this.changeset}}
     as |form|
 >
     <div class='col-md-6'>
@@ -73,10 +71,11 @@
             data-test-project-metadata-save-button
             data-analytics-name='Save metadata'
             disabled={{form.submitting}}
+            @onClick={{perform this.save}}
             @buttonType='submit'
             @type='primary'
         >
             {{t 'app_components.submit_section.save'}}
         </BsButton>
     </div>
-</ValidatedModelForm>
+</FormControls>