Back merge branch 'release/21.2.0' into develop

fabmiz · fabmiz · commit 14bbdde17759 · 2021-04-19T16:09:06.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,23 @@ 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
+    - Make it so the draft page doesn't break when a contributor on the draft doesn't have access to the `branched_from` node.
+
 ## [21.1.0] - 2021-03-30
 ### Added
 - no-project registrations
@@ -1692,7 +1709,9 @@ 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.0...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
 [20.12.1]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/20.12.1
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/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/template.hbs b/lib/collections/addon/components/discover-page/template.hbs
@@ -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/osf-components/addon/components/file-browser/template.hbs b/lib/osf-components/addon/components/file-browser/template.hbs
@@ -441,7 +441,7 @@
     <div class='file-browser-list' local-class='file-browser-list'>
         <div local-class='shade {{unless this.dropping 'transparent'}}'>
             <div local-class='upload-drop'>
-                <div local-class='upload-text'>{{fa-icon 'upload' size=5}}</div>
+                <div local-class='upload-text'>{{fa-icon 'upload' size='5x'}}</div>
                 <div local-class='upload-text'>{{t 'file_browser.drop_reminder'}}</div>
             </div>
         </div>
@@ -480,7 +480,7 @@
             <div local-class='file-placeholder'>
                 {{#if this.canEdit}}
                     <div local-class='file-placeholder-content'>
-                        <div>{{fa-icon 'upload' size=5}}</div>
+                        <div>{{fa-icon 'upload' size='5x'}}</div>
                         <div local-class='file-placeholder-text'>{{t 'file_browser.drop_placeholder'}}</div>
                     </div>
                 {{else}}
diff --git a/lib/osf-components/addon/components/files/list/template.hbs b/lib/osf-components/addon/components/files/list/template.hbs
@@ -8,7 +8,7 @@
     {{else}}
         {{#if @filesManager.canEdit}}
             <div data-test-no-files-placeholder local-class='placeholder'>
-                <FaIcon @icon='upload' @size='4' />
+                <FaIcon @icon='upload' @size='4x' />
                 {{t 'osf-components.files-widget.drag_drop_files'}}
             </div>
         {{/if}}
diff --git a/lib/osf-components/addon/components/files/manager/component.ts b/lib/osf-components/addon/components/files/manager/component.ts
@@ -1,6 +1,5 @@
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
-import { assert } from '@ember/debug';
 import { action, computed } from '@ember/object';
 import { alias, or } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
@@ -130,19 +129,19 @@ export default class FilesManagerComponent extends Component {
 
     @task({ withTestWaiter: true, restartable: true, on: 'didReceiveAttrs' })
     getRootItems = task(function *(this: FilesManagerComponent) {
-        assert('@node is required', Boolean(this.node));
-
-        const fileProviders = yield this.node.files;
-        const fileProvider = fileProviders.findBy('name', 'osfstorage') as FileProvider;
-        const rootFolder = yield fileProvider.rootFolder;
-
-        yield rootFolder.files;
-
-        this.setProperties({
-            fileProvider,
-            rootFolder,
-            currentFolder: rootFolder,
-        });
+        if (this.node) {
+            const fileProviders = yield this.node.files;
+            const fileProvider = fileProviders.findBy('name', 'osfstorage') as FileProvider;
+            const rootFolder = yield fileProvider.rootFolder;
+
+            yield rootFolder.files;
+
+            this.setProperties({
+                fileProvider,
+                rootFolder,
+                currentFolder: rootFolder,
+            });
+        }
     });
 
     @task({ withTestWaiter: true })
diff --git a/lib/osf-components/addon/components/files/menu/template.hbs b/lib/osf-components/addon/components/files/menu/template.hbs
@@ -11,7 +11,7 @@
             @onClick={{action dropdownMenu.toggle}}
             @type='success'
         >
-            <FaIcon @icon='plus' @size='2' @fixedWidth={{true}} />
+            <FaIcon @icon='plus' @size='2x' @fixedWidth={{true}} />
         </OsfButton>
     </div>
     <dropdownMenu.content>
diff --git a/lib/osf-components/addon/components/node-doi-create/template.hbs b/lib/osf-components/addon/components/node-doi-create/template.hbs
@@ -1,5 +1,5 @@
 <div local-class='CreateMessage'>
-    <FaIcon @icon='info-circle' @size='4' @fixedWidth={{true}} />
+    <FaIcon @icon='info-circle' @size='4x' @fixedWidth={{true}} />
     <div>
         <p>{{t 'registries.registration_metadata.mint_doi.header'}}</p>
         <p>{{t 'registries.registration_metadata.mint_doi.text'}}</p>
diff --git a/lib/osf-components/addon/components/registries/registration-list/card/template.hbs b/lib/osf-components/addon/components/registries/registration-list/card/template.hbs
@@ -6,7 +6,7 @@
     <FaIcon
         data-test-registration-list-card-icon='{{@state}}'
         @icon={{this.icon}}
-        @size={{2}}
+        @size='2x'
         local-class='filterIcon {{@state}}'
     />
     <div local-class='cardInfo'>
diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/component.ts b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/component.ts
@@ -42,7 +42,7 @@ export default class Files extends Component {
 
     @computed('node')
     get nodeUrl() {
-        return this.node && pathJoin(baseURL, this.node.id);
+        return pathJoin(baseURL, this.draftRegistration.belongsTo('branchedFrom').id());
     }
 
     didReceiveAttrs() {
diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/styles.scss b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/styles.scss
@@ -14,4 +14,9 @@
 
 .FilesWidget {
     composes: Element from '../../styles';
+
+    &[disabled] {
+        opacity: 0.5;
+        pointer-events: none;
+    }
 }
diff --git a/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/template.hbs b/lib/osf-components/addon/components/registries/schema-block-renderer/editable/files/template.hbs
@@ -3,11 +3,18 @@
     local-class='FilesInstructions'
 >
     {{#if @draftRegistration.hasProject}}
-        {{t 'osf-components.registries.schema-block-renderer/editable/files.instructions'
-            projectOrComponent=(if this.node.isRoot 'project' 'component')
-            nodeUrl=this.nodeUrl
-            htmlSafe=true
-        }}
+        {{#if this.node}}
+            {{t 'osf-components.registries.schema-block-renderer/editable/files.instructions'
+                projectOrComponent=(if this.node.isRoot 'project' 'component')
+                nodeUrl=this.nodeUrl
+                htmlSafe=true
+            }}
+        {{else}}
+            {{t 'osf-components.registries.schema-block-renderer/editable/files.instructionsNoPermissions'
+                nodeUrl=this.nodeUrl
+                htmlSafe=true
+            }}
+        {{/if}}
     {{else}}
         {{t 'osf-components.registries.schema-block-renderer/editable/files.instructionsNoProject'
             htmlSafe=true
@@ -32,6 +39,7 @@
     @onSelectFile={{action this.onSelectFile}}
     @onAddFile={{action this.onAddFile}}
     @onDeleteFile={{this.onDeleteFile}}
-    @canEdit={{not this.currentUserIsReadOnly}}
+    @canEdit={{and this.node (not this.currentUserIsReadOnly)}}
+    disabled={{not this.node}}
     ...attributes
 />
diff --git a/lib/registries/addon/components/registries-header/styles.scss b/lib/registries/addon/components/registries-header/styles.scss
@@ -6,6 +6,100 @@
     position: relative;
     margin: 0 65px;
     padding-top: 10px;
+
+    :global(.ColorBlack) {
+        color: $color-text-black;
+    }
+
+    :global(.ColorPureBlack) {
+        color: $color-black;
+    }
+
+    :global(.ColorBlue) {
+        color: $color-blue;
+    }
+
+    :global(.ColorPureBlue) {
+        color: $color-pure-blue;
+    }
+
+    :global(.ColorGrey) {
+        color: $color-text-gray;
+    }
+
+    :global(.ColorRed) {
+        color: $color-red;
+    }
+
+    :global(.ColorGreen) {
+        color: $color-green;
+    }
+
+    :global(.ColorYellow) {
+        color: $color-yellow;
+    }
+
+    :global(.ColorTurquoise) {
+        color: $color-turquoise;
+    }
+
+    :global(.ColorPurple) {
+        color: $color-purple;
+    }
+
+    :global(.LinkColorBlack) {
+        a {
+            color: $color-link-black;
+        }
+    }
+
+    :global(.LinkColorBlue) {
+        a {
+            color: $color-link-blue;
+        }
+    }
+
+    :global(.LinkColorPureBlue) {
+        a {
+            color: $color-pure-blue;
+        }
+    }
+
+    :global(.LinkColorGrey) {
+        a {
+            color: $color-grey;
+        }
+    }
+
+    :global(.LinkColorRed) {
+        a {
+            color: $color-red;
+        }
+    }
+
+    :global(.LinkColorGreen) {
+        a {
+            color: $color-green;
+        }
+    }
+
+    :global(.LinkColorYellow) {
+        a {
+            color: $color-yellow;
+        }
+    }
+
+    :global(.LinkColorTurquoise) {
+        a {
+            color: $color-turquoise;
+        }
+    }
+
+    :global(.LinkColorPurple) {
+        a {
+            color: $color-purple;
+        }
+    }
 }
 
 .RegistriesHeader {
@@ -72,3 +166,4 @@
         color: var(--secondary-color);
     }
 }
+
diff --git a/lib/registries/addon/components/registries-states/template.hbs b/lib/registries/addon/components/registries-states/template.hbs
@@ -16,7 +16,7 @@
     >
         {{#if this.stateText}}
             <div local-class='DescriptionContainer'>
-                <FaIcon data-test-state-icon @icon={{this.stateIcon}} @size='4' />
+                <FaIcon data-test-state-icon @icon={{this.stateIcon}} @size='4x' />
                 <div local-class='DescriptionText'>
                     <h4 data-test-state-description-short>{{this.stateText.short}}</h4>
                     <p
diff --git a/lib/registries/addon/drafts/draft/draft-registration-manager.ts b/lib/registries/addon/drafts/draft/draft-registration-manager.ts
@@ -25,13 +25,12 @@ import buildChangeset from 'ember-osf-web/utils/build-changeset';
 
 type LoadDraftModelTask = TaskInstance<{
     draftRegistration: DraftRegistration,
-    node?: NodeModel,
     provider: ProviderModel,
 }>;
 
 export default class DraftRegistrationManager {
     // Required
-    draftRegistrationAndNodeTask!: LoadDraftModelTask;
+    draftRegistrationTask!: LoadDraftModelTask;
 
     // Private
     @service intl!: Intl;
@@ -79,10 +78,16 @@ export default class DraftRegistrationManager {
 
     @task({ withTestWaiter: true })
     initializePageManagers = task(function *(this: DraftRegistrationManager) {
-        const { draftRegistration, node, provider } = yield this.draftRegistrationAndNodeTask;
+        const { draftRegistration, provider } = yield this.draftRegistrationTask;
         set(this, 'draftRegistration', draftRegistration);
-        set(this, 'node', node);
         set(this, 'provider', provider);
+        try {
+            const node = yield this.draftRegistration.branchedFrom;
+            set(this, 'node', node);
+        } catch (e) {
+            captureException(e);
+            set(this, 'node', undefined);
+        }
         const registrationSchema = yield this.draftRegistration.registrationSchema;
         const schemaBlocks: SchemaBlock[] = yield registrationSchema.loadAll('schemaBlocks');
         set(this, 'schemaBlocks', schemaBlocks);
@@ -104,7 +109,7 @@ export default class DraftRegistrationManager {
 
     @task({ withTestWaiter: true })
     initializeMetadataChangeset = task(function *(this: DraftRegistrationManager) {
-        const { draftRegistration } = yield this.draftRegistrationAndNodeTask;
+        const { draftRegistration } = yield this.draftRegistrationTask;
         const metadataValidations = buildMetadataValidations();
         const metadataChangeset = buildChangeset(draftRegistration, metadataValidations);
         set(this, 'metadataChangeset', metadataChangeset);
@@ -167,8 +172,8 @@ export default class DraftRegistrationManager {
         }
     });
 
-    constructor(draftRegistrationAndNodeTask: LoadDraftModelTask) {
-        set(this, 'draftRegistrationAndNodeTask', draftRegistrationAndNodeTask);
+    constructor(draftRegistrationTask: LoadDraftModelTask) {
+        set(this, 'draftRegistrationTask', draftRegistrationTask);
         this.initializePageManagers.perform();
         this.initializeMetadataChangeset.perform();
     }
diff --git a/lib/registries/addon/drafts/draft/route.ts b/lib/registries/addon/drafts/draft/route.ts
diff --git a/lib/registries/addon/drafts/draft/template.hbs b/lib/registries/addon/drafts/draft/template.hbs
diff --git a/package.json b/package.json
diff --git a/translations/en-us.yml b/translations/en-us.yml

Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,7 @@`
`169`	`169`	`class='text-center p-v-md'`
`170`	`170`	`aria-label={{t 'collections.discover_page.searchLoading'}}`
`171`	`171`	`>`
`172`		`- <FaIcon @icon='spinner' @pulse={{true}} @size={{3}} />`
	`172`	`+ <FaIcon @icon='spinner' @pulse={{true}} @size='3x' />`
`173`	`173`	`</div>`
`174`	`174`	`{{else}}`
`175`	`175`	`{{#if this.numberOfResults}}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`@onClick={{action dropdownMenu.toggle}}`
`12`	`12`	`@type='success'`
`13`	`13`	`>`
`14`		`- <FaIcon @icon='plus' @size='2' @fixedWidth={{true}} />`
	`14`	`+ <FaIcon @icon='plus' @size='2x' @fixedWidth={{true}} />`
`15`	`15`	`</OsfButton>`
`16`	`16`	`</div>`
`17`	`17`	`<dropdownMenu.content>`