Merge branch 'release/21.2.0'

CenterForOpenScience · Apr 19, 2021 · 89b8d74 · 89b8d74
2 parents 155545c + 28eb4c3
commit 89b8d74
Show file tree

Hide file tree

Showing 82 changed files with 794 additions and 221 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ 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.2.0] - 2021-04-19
+### Added
+- field and relationship for custom metadata field and its schema to registration providers
+- a link to the registration metadata to the Internet Archive copy
+
+### Removed
+- "powered by Share" logo on discover pages
+
+### Changed
+- show provider description on provider's discover page
+    - allow branded provider descriptions to have color options
+
 ## [21.1.1] - 2021-04-12
 ### Fixed
 - `draftRegistration.branchedFrom` node permission errors
@@ -1697,7 +1709,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.1.1...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.2.0...develop
+[21.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.2.0
 [21.1.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.1
 [21.1.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/21.1.0
 [20.13.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.13.0

diff --git a/app/dashboard/template.hbs b/app/dashboard/template.hbs
@@ -134,14 +134,14 @@
                                                             @class='col-sm-12'
                                                             @onClick={{action this.more}}
                                                         >
-                                                            {{fa-icon
-                                                                'caret-down'
-                                                                class=(
+                                                            <FaIcon
+                                                                @icon='caret-down'
+                                                                class={{
                                                                     concat
                                                                     (local-class 'load-nodes')
                                                                     ' text-muted m-b-xl'
-                                                                )
-                                                            }}
+                                                                }}
+                                                            />
                                                         </OsfButton>
                                                     </div>
                                                 {{/if}}

diff --git a/app/guid-node/registrations/controller.ts b/app/guid-node/registrations/controller.ts
@@ -40,6 +40,7 @@ export default class GuidNodeRegistrations extends Controller {
         let schemas = yield this.store.query('registration-schema',
             {
                 'filter[active]': true,
+                'page[size]': 100,
             });
         schemas = schemas.toArray();
         schemas.sort((a: RegistrationSchema, b: RegistrationSchema) => a.name.length - b.name.length);

diff --git a/app/meetings/index/-components/meetings-footer/template.hbs b/app/meetings/index/-components/meetings-footer/template.hbs
@@ -1,11 +1,13 @@
 <div class='row icon-bar m-v-lg' ...attributes>
     <div class='col-md-4 col-sm-4 text-center '>
         <div class='p-v-md m-t-xl m-h-md'>
-            <FaIcon
-                data-test-eye-icon
-                @icon='eye'
-                local-class='blue-icon icon-circle'
-            />
+            <div local-class='icon-circle'>
+                <FaIcon
+                    data-test-eye-icon
+                    @icon='eye'
+                    local-class='blue-icon'
+                />
+            </div>
             <h3>
                 {{t 'meetings.index.meetings-footer.discover'}}
             </h3>
@@ -18,11 +20,13 @@
     </div>
     <div class='col-md-4 col-sm-4 text-center'>
         <div class=' p-v-md  m-t-xl m-h-md'>
-            <FaIcon
-                data-test-share-alt-icon
-                @icon='share-alt'
-                local-class='blue-icon icon-circle'
-            />
+            <div local-class='icon-circle'>
+                <FaIcon
+                    data-test-share-alt-icon
+                    @icon='share-alt'
+                    local-class='blue-icon'
+                />
+            </div>
             <h3>
                 {{t 'meetings.index.meetings-footer.share'}}
             </h3>
@@ -35,11 +39,13 @@
     </div>
     <div class='col-md-4 col-sm-4 text-center'>
         <div class='p-v-md  m-t-xl m-h-md'>
-            <FaIcon
-                data-test-magic-icon
-                @icon='magic'
-                local-class='blue-icon icon-circle'
-            />
+            <div local-class='icon-circle'>
+                <FaIcon
+                    data-test-magic-icon
+                    @icon='magic'
+                    local-class='blue-icon'
+                />
+            </div>
             <h3>
                 {{t 'meetings.index.meetings-footer.enhance'}}
             </h3>

diff --git a/app/meetings/index/-components/meetings-hero-banner/styles.scss b/app/meetings/index/-components/meetings-hero-banner/styles.scss
@@ -29,6 +29,8 @@
     box-shadow: 0 0 10px #e0e7ec;
     width: 140px;
     height: 140px;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 .osf-meeting-header {

diff --git a/app/meetings/index/-components/meetings-hero-banner/template.hbs b/app/meetings/index/-components/meetings-hero-banner/template.hbs
@@ -16,12 +16,14 @@
             <div local-class='network-img'> </div>
             <div class='row'>
                 <div class='col-md-6 col-lg-5 col-xl-4 text-center m-b-lg'>
-                    <FaIcon
-                        data-test-fa-icon-users
-                        @icon='users'
-                        class='m-v-sm'
-                        local-class='user-icon icon-circle'
-                    />
+                    <div local-class='icon-circle'>
+                        <FaIcon
+                            data-test-fa-icon-users
+                            @icon='users'
+                            class='m-v-sm'
+                            local-class='user-icon'
+                        />
+                    </div>
                     <h3 class='f-w-xl'>
                         {{t 'meetings.index.meetings-hero-banner.conference_organizers_h3'}}
                     </h3>
@@ -48,12 +50,14 @@
                     </CpPanel>
                 </div>
                 <div class='col-md-6 col-lg-5 col-lg-offset-2 col-xl-4 col-xl-offset-4 text-center m-b-lg'>
-                    <FaIcon
-                        data-test-fa-icon-cloud-upload
-                        @icon='cloud-upload'
-                        class='m-v-sm'
-                        local-class='user-icon icon-circle'
-                    />
+                    <div local-class='icon-circle'>
+                        <FaIcon
+                            data-test-fa-icon-cloud-upload
+                            @icon='cloud-upload-alt'
+                            class='m-v-sm'
+                            local-class='user-icon'
+                        />
+                    </div>
                     <h3 class='f-w-xl'>
                         {{t 'meetings.index.meetings-hero-banner.conference_participants_h3'}}
                     </h3>

diff --git a/app/models/registration-provider.ts b/app/models/registration-provider.ts
@@ -1,3 +1,4 @@
+import { htmlSafe } from '@ember/string';
 import DS from 'ember-data';
 import ReviewActionModel from 'ember-osf-web/models/review-action';
 
@@ -42,6 +43,14 @@ export default class RegistrationProviderModel extends ProviderModel {
         }
         return false;
     }
+
+    @computed('description')
+    get htmlSafeDescription() {
+        if (this.description) {
+            return htmlSafe(this.description);
+        }
+        return '';
+    }
 }
 
 declare module 'ember-data/types/registries/model' {

diff --git a/app/models/registration.ts b/app/models/registration.ts
@@ -58,6 +58,13 @@ const Validations = buildValidations({
     ],
 });
 
+export interface ProviderMetadata {
+    // eslint-disable-next-line camelcase
+    field_name: string;
+    // eslint-disable-next-line camelcase
+    field_value: string;
+}
+
 export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('date') dateRegistered!: Date;
     @attr('boolean') pendingRegistrationApproval!: boolean;
@@ -75,6 +82,8 @@ export default class RegistrationModel extends NodeModel.extend(Validations) {
     @attr('object') registeredMeta!: RegistrationMetadata;
     @attr('registration-responses') registrationResponses!: RegistrationResponse;
     @attr('fixstring') reviewsState!: RegistrationReviewStates;
+    @attr('fixstring') iaUrl?: string;
+    @attr('array') providerSpecificMetadata!: ProviderMetadata[];
 
     // Write-only attributes
     @attr('array') includedNodeIds?: string[];

diff --git a/app/styles/_variables.scss b/app/styles/_variables.scss
@@ -120,6 +120,12 @@ $color-alt: #c7ffc7;
 $color-select: #337ab7;
 $color-grey: #333;
 $color-filter-bg: #a4b3bd;
+$color-red: #f00;
+$color-green: #090;
+$color-yellow: #ff0;
+$color-turquoise: rgb(64, 224, 211);
+$color-purple: rgb(154, 0, 192);
+$color-black: #000;
 
 .bg-color-blue {
     background-color: $color-blue;

diff --git a/app/support/template.hbs b/app/support/template.hbs
@@ -26,7 +26,7 @@
                         @href={{this.faqPageUrl}}
                     >
                         {{t 'support.faq_button'}}
-                        <i class='fa fa-angle-right'></i>
+                        <FaIcon @icon='angle-right' />
                     </OsfLink>
                 </div>
             </div>
@@ -51,7 +51,7 @@
                         @href={{this.helpUrl}}
                     >
                         {{t 'support.guides_button'}}
-                        <i class='fa fa-angle-right'></i>
+                        <FaIcon @icon='angle-right' />
                     </OsfLink>
                 </div>
             </div>
@@ -104,28 +104,28 @@
                 class='btn btn-link'
                 @href={{this.twitterUrl}}
             >
-                <i class='fa fa-twitter'></i>{{t 'support.social_twitter'}}
+                <FaIcon @icon='twitter' @prefix='fab' />{{t 'support.social_twitter'}}
             </OsfLink>
             <OsfLink
                 data-analytics-name='social_email'
                 class='btn btn-link'
                 @href={{this.mailingUrl}}
             >
-                <i class='fa fa-users'></i> {{t 'support.social_mailing'}}
+                <FaIcon @icon='users' /> {{t 'support.social_mailing'}}
             </OsfLink>
             <OsfLink
                 data-analytics-name='social_facebook'
                 class='btn btn-link'
                 @href={{this.facebookUrl}}
             >
-                <i class='fa fa-facebook'></i> {{t 'support.social_facebook'}}
+                <FaIcon @icon='facebook' @prefix='fab' /> {{t 'support.social_facebook'}}
             </OsfLink>
             <OsfLink
                 data-analytics-name='social_github'
                 class='btn btn-link'
                 @href={{this.githubUrl}}
             >
-                <i class='fa fa-github'></i> {{t 'support.social_github'}}
+                <FaIcon @icon='github' @prefix='fab' /> {{t 'support.social_github'}}
             </OsfLink>
         </div>
     </div>

diff --git a/lib/analytics-page/addon/application/styles.scss b/lib/analytics-page/addon/application/styles.scss
@@ -29,7 +29,7 @@
     margin: 15px 0;
 
     .DateRangeButton {
-        i {
+        svg {
             margin-left: 5px;
         }
     }

diff --git a/lib/analytics-page/package.json b/lib/analytics-page/package.json
@@ -5,6 +5,10 @@
     "ember-engine"
   ],
   "dependencies": {
+    "@fortawesome/free-regular-svg-icons": "*",
+    "@fortawesome/free-solid-svg-icons": "*",
+    "@fortawesome/ember-fontawesome": "*",
+    "@fortawesome/free-brands-svg-icons": "*",
     "ember-bootstrap": "*",
     "ember-truth-helpers": "*",
     "ember-component-attributes": "*",
@@ -19,7 +23,6 @@
     "ember-css-modules": "*",
     "ember-css-modules-sass": "*",
     "ember-intl": "*",
-    "ember-font-awesome": "*",
     "ember-moment": "*",
     "ember-page-title": "*"
   },

diff --git a/lib/app-components/addon/components/project-contributors/list/item/template.hbs b/lib/app-components/addon/components/project-contributors/list/item/template.hbs
@@ -4,7 +4,7 @@
 >
     {{! Handle }}
     <div class='col-xs-2 col-sm-1 text-nowrap'>
-        <span class='fa fa-bars sortable-bars handle small'></span>
+        <span class='sortable-bars handle small'><FaIcon @icon='bars' /></span>
     </div>
 
     {{! Profile image}}

diff --git a/lib/app-components/addon/components/project-contributors/search/template.hbs b/lib/app-components/addon/components/project-contributors/search/template.hbs
@@ -47,7 +47,7 @@
     </h3>
     {{#if this.search.isRunning}}
         <div class='text-center'>
-            <FaIcon @icon='spinner' @pulse={{true}} @size={{2}} />
+            <FaIcon @icon='spinner' @pulse={{true}} @size='2x' />
         </div>
     {{else if this.results.length}}
         <table class='table'>

diff --git a/lib/collections/addon/components/collections-submission/template.hbs b/lib/collections/addon/components/collections-submission/template.hbs
@@ -61,7 +61,7 @@
                         <FaIcon
                             @icon='spinner'
                             @pulse={{true}}
-                            @size={{2}}
+                            @size='2x'
                         />
                     </div>
                 {{/if}}

diff --git a/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs b/lib/collections/addon/components/discover-page/active-filters/filter/template.hbs
@@ -9,10 +9,11 @@
             <button
                 data-test-active-filter-remove-button
                 type='button'
-                class='fa fa-times-circle'
                 local-class='removeActiveFilter'
                 {{on 'click' this.removeFilterItem}}
-            ></button>
+            >
+                <FaIcon @icon='times-circle' />
+            </button>
         </span>
     {{/unless}}
 </span>
diff --git a/lib/collections/addon/components/discover-page/active-filters/template.hbs b/lib/collections/addon/components/discover-page/active-filters/template.hbs
@@ -12,7 +12,7 @@
                 {{action @clearFilters}}
             >
                 {{t 'collections.discover_page.active_filters.button'}}
-                <FaIcon @icon='remove' />
+                <FaIcon @icon='times' />
             </button>
         </span>
     </div>

diff --git a/lib/collections/addon/components/discover-page/template.hbs b/lib/collections/addon/components/discover-page/template.hbs
@@ -71,7 +71,7 @@
                             aria-label={{t 'collections.discover_page.luceneHelp'}}
                             {{action this.toggleShowLuceneHelp}}
                         >
-                            <FaIcon @icon='fa-question' @class='text-muted' />
+                            <FaIcon @icon='question' @class='text-muted' />
                         </button>
                         {{!SEARCH BUTTON}}
                         <button
@@ -169,7 +169,7 @@
                         class='text-center p-v-md'
                         aria-label={{t 'collections.discover_page.searchLoading'}}
                     >
-                        <FaIcon @icon='spinner' @pulse={{true}} @size={{3}} />
+                        <FaIcon @icon='spinner' @pulse={{true}} @size='3x' />
                     </div>
                 {{else}}
                     {{#if this.numberOfResults}}

diff --git a/lib/collections/package.json b/lib/collections/package.json
@@ -5,6 +5,10 @@
     "ember-engine"
   ],
   "dependencies": {
+    "@fortawesome/free-regular-svg-icons": "*",
+    "@fortawesome/free-solid-svg-icons": "*",
+    "@fortawesome/ember-fontawesome": "*",
+    "@fortawesome/free-brands-svg-icons": "*",
     "ember-angle-bracket-invocation-polyfill": "*",
     "ember-bootstrap": "*",
     "ember-cli-babel": "*",
@@ -19,7 +23,6 @@
     "ember-css-modules": "*",
     "ember-css-modules-sass": "*",
     "ember-intl": "*",
-    "ember-font-awesome": "*",
     "ember-moment": "*",
     "ember-page-title": "*",
     "ember-power-select": "*",