Merge branch hotfix/21.1.1

Author: fabmiz

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).
 
+## [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 +1697,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.0...develop
+[Unreleased]: https://github.com/CenterForOpenScience/ember-osf-web/compare/21.1.1...develop
+[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

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 })

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() {

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;
+    }
 }

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
 />

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();
     }

lib/registries/addon/drafts/draft/route.ts

@@ -6,9 +6,7 @@ import { task } from 'ember-concurrency-decorators';
 import DS from 'ember-data';
 
 import requireAuth from 'ember-osf-web/decorators/require-auth';
-import DraftNode from 'ember-osf-web/models/draft-node';
 import DraftRegistration from 'ember-osf-web/models/draft-registration';
-import NodeModel from 'ember-osf-web/models/node';
 import ProviderModel from 'ember-osf-web/models/provider';
 import SubjectModel from 'ember-osf-web/models/subject';
 import Analytics from 'ember-osf-web/services/analytics';
@@ -27,35 +25,28 @@ export default class DraftRegistrationRoute extends Route {
     @service router!: RouterService;
 
     @task({ withTestWaiter: true })
-    loadDraftRegistrationAndNode = task(function *(this: DraftRegistrationRoute, draftId: string) {
-        try {
-            const draftRegistration: DraftRegistration = yield this.store.findRecord(
-                'draft-registration',
-                draftId,
-                { adapterOptions: { include: 'branched_from' } },
-            );
-            const [subjects, node, provider]:
-                [SubjectModel[], NodeModel | DraftNode, ProviderModel] = yield Promise.all([
-                    draftRegistration.loadAll('subjects'),
-                    draftRegistration.branchedFrom as NodeModel | DraftNode,
-                    draftRegistration.provider,
-                ]);
-
-            draftRegistration.setProperties({ subjects });
-            if (draftRegistration.currentUserIsReadOnly) {
-                this.replaceWith('drafts.draft.review', draftId);
-            }
-            return { draftRegistration, node, provider };
-        } catch (error) {
-            this.transitionTo('page-not-found', this.router.currentURL.slice(1));
-            return undefined;
+    loadDraftRegistration = task(function *(this: DraftRegistrationRoute, draftId: string) {
+        const draftRegistration: DraftRegistration = yield this.store.findRecord(
+            'draft-registration',
+            draftId,
+            { adapterOptions: { include: 'branched_from' } },
+        );
+        const [subjects, provider]:
+            [SubjectModel[], ProviderModel] = yield Promise.all([
+                draftRegistration.loadAll('subjects'),
+                draftRegistration.provider,
+            ]);
+        draftRegistration.setProperties({ subjects });
+        if (draftRegistration.currentUserIsReadOnly) {
+            this.replaceWith('drafts.draft.review', draftId);
         }
+        return { draftRegistration, provider };
     });
 
     model(params: { id: string }): DraftRouteModel {
         const { id: draftId } = params;
-        const draftRegistrationAndNodeTask = this.loadDraftRegistrationAndNode.perform(draftId);
-        const draftRegistrationManager = new DraftRegistrationManager(draftRegistrationAndNodeTask);
+        const draftRegistrationTask = this.loadDraftRegistration.perform(draftId);
+        const draftRegistrationManager = new DraftRegistrationManager(draftRegistrationTask);
         const navigationManager = new NavigationManager(draftRegistrationManager);
         return {
             navigationManager,

lib/registries/addon/drafts/draft/template.hbs

@@ -16,7 +16,7 @@
                 <layout.heading>
                     <HeroOverlay @align='left' local-class='DraftHeroOverlay'>
                         <div local-class='Title'>
-                            {{#if draftManager.hasProject}}
+                            {{#if (and draftManager.hasProject draftManager.node)}}
                                 <OsfLink
                                     data-test-link-back-to-project
                                     data-analytics-name='Go to project'

translations/en-us.yml

@@ -1592,6 +1592,7 @@ osf-components:
         schema-block-renderer/editable/files:
             instructions: 'You may attach up to 5 file(s) to this question. You may attach files that you already have in OSF Storage in this <a href={nodeUrl}>{projectOrComponent}</a> or upload (drag and drop) a new file from your computer. Uploaded files will automatically be added to this <a href={nodeUrl}>{projectOrComponent}</a> so that they can be registered. To attach files from other components or an add-on, first add them to this <a href={nodeUrl}>{projectOrComponent}</a>.'
             instructionsNoProject: 'You may attach up to 5 file(s) to this question. Files cannot total over 5GB in size.<br><br>Uploaded files will automatically be archived in this registration. They will also be added to a related project that will be created for this registration.'
+            instructionsNoPermissions: 'This registration is branched from <a href={nodeUrl}>an OSF Project</a>, and only contributors added to it can upload and edit files. Contact one of the registration''s administrative contributors to be added to the project. Learn more about OSF Projects by visiting our <a href="https://help.osf.io/hc/en-us/categories/360001495973-Creating-and-Managing-Projects">help guides</a>.'
         schema-block-renderer/read-only/response:
             noResponse: 'No response'
         schema-block-renderer/read-only/files: