Merge branch 'release/22.5.0'

adlius · adlius · commit 7cea5bcdfda9 · 2022-05-02T13:47:24.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,16 @@ 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).
 
+## [22.5.0] - 2022-5-02
+### Changed
+- Misc bug fixes
+- Update more help links
+
+### Added
+- Files page redesign phase 1
+- Use helpscout links for support pages
+
+
 ## [22.4.0] - 2022-3-31
 ### Added
 - Files page redesign phase 1
@@ -1836,6 +1846,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Added
 - Quick Files
 
+[22.5.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.5.0
 [22.4.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.4.0
 [22.3.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.3.0
 [22.2.0]: https://github.com/CenterForOpenScience/ember-osf-web/releases/tag/22.2.0
diff --git a/app/const/service-links.ts b/app/const/service-links.ts
@@ -10,11 +10,11 @@ const serviceLinks = {
     preprintsDiscover: `${osfUrl}preprints/discover/`,
     preprintsHome: `${osfUrl}preprints/`,
     preprintsSubmit: `${osfUrl}preprints/submit/`,
-    preprintsSupport: 'https://openscience.zendesk.com/hc/en-us/categories/360001530554',
+    preprintsSupport: 'https://help.osf.io/article/376-preprints-home-page',
     profile: `${osfUrl}profile/`,
     registriesDiscover: `${osfUrl}registries/discover/`,
     registriesHome: `${osfUrl}registries/`,
-    registriesSupport: 'https://openscience.zendesk.com/hc/en-us/categories/360001550953',
+    registriesSupport: 'https://help.osf.io/article/330-welcome-to-registrations',
     search: `${osfUrl}search/`,
     settings: `${osfUrl}settings/`,
     reviewsHome: `${osfUrl}reviews/`,
diff --git a/app/guid-file/-components/file-detail-layout/styles.scss b/app/guid-file/-components/file-detail-layout/styles.scss
@@ -6,6 +6,13 @@
 
 .MainColumn {
     flex-grow: 3;
+
+    h3 {
+        text-overflow: ellipsis;
+        overflow: hidden;
+        white-space: nowrap;
+        max-width: 70vw;
+    }
 }
 
 .RightColumn {
diff --git a/app/guid-file/styles.scss b/app/guid-file/styles.scss
@@ -19,6 +19,13 @@
     padding: 0 20px 20px;
 }
 
+.FlexContainerRow > h2 {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+    max-width: 70vw;
+}
+
 .ProjectLink {
     margin: 20px;
 }
diff --git a/app/guid-node/registrations/template.hbs b/app/guid-node/registrations/template.hbs
@@ -46,7 +46,7 @@
                                 {{/if}}
                                 <p>
                                     {{t 'node.registrations.learn_more'
-                                        learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
+                                        learnMoreLink='https://help.osf.io/'
                                         htmlSafe=true
                                     }}
                                 </p>
@@ -79,7 +79,7 @@
                                     {{/if}}
                                     <p>
                                         {{t 'node.registrations.learn_more'
-                                          learnMoreLink='https://help.osf.io/hc/en-us/categories/360001550953-Registrations'
+                                          learnMoreLink='https://help.osf.io/'
                                           htmlSafe=true
                                         }}
                                     </p>
diff --git a/app/support/template.hbs b/app/support/template.hbs
@@ -65,7 +65,7 @@
                         <OsfLink
                             data-analytics-name='contact_form'
                             class='text-bigger'
-                            @href='https://openscience.zendesk.com/hc/en-us'
+                            @href='https://help.osf.io/'
                         >
                             {{t 'support.contact_form'}}
                         </OsfLink>
diff --git a/lib/osf-components/addon/components/dropzone-widget/component.ts b/lib/osf-components/addon/components/dropzone-widget/component.ts
@@ -143,6 +143,7 @@ export default class DropzoneWidget extends Component.extend({
             autoQueue: false,
             clickable: this.clickable.length ? this.clickable : '',
             dictDefaultMessage: this.defaultMessage,
+            previewsContainer: false,
             sending(file: any, xhr: XMLHttpRequest) {
                 authorizeXHR(xhr);
 
diff --git a/lib/osf-components/addon/components/file-renderer/component.ts b/lib/osf-components/addon/components/file-renderer/component.ts
@@ -3,7 +3,6 @@ import Component from '@ember/component';
 import { action, computed } from '@ember/object';
 import { next } from '@ember/runloop';
 import config from 'ember-get-config';
-import $ from 'jquery';
 
 import { layout } from 'ember-osf-web/decorators/component';
 
@@ -52,15 +51,25 @@ export default class FileRenderer extends Component {
     @computed('download', 'params', 'version')
     get downloadUrl(): string {
         const { download, params, version } = this;
-
-        return `${download}?${$.param({ ...params, ...(version ? { version } : {}) })}`;
+        if (!download) {
+            return '';
+        }
+        const downloadLink = new URL(download);
+        downloadLink.searchParams.set('direct', params.direct || '');
+        downloadLink.searchParams.set('mode', params.mode);
+        if (version) {
+            downloadLink.searchParams.set('version', version.toString());
+        }
+        return downloadLink.toString();
     }
 
     @computed('downloadUrl', 'isLoading')
     get mfrUrl(): string {
         // Waiting until the iframe is loaded then changing the URL avoids a race condition in the MFR iframe
         // This is most apparent in 3D files
-        return this.isLoading ? '' : `${renderUrl}?url=${encodeURIComponent(this.downloadUrl)}`;
+        const urlWithParams = new URL(renderUrl);
+        urlWithParams.searchParams.set('url', this.downloadUrl);
+        return this.isLoading ? '' : urlWithParams.toString();
     }
 
     didReceiveAttrs(): void {
diff --git a/lib/osf-components/addon/components/files/manager/component.ts b/lib/osf-components/addon/components/files/manager/component.ts
@@ -202,7 +202,7 @@ export default class FilesManagerComponent extends Component {
 
         this.lastUploaded.pushObject(file);
 
-        this.toast.success(this.intl.t('file_browser.file_added_toast'));
+        this.toast.success(this.intl.t('osf-components.files-widget.file_add_success'));
         if (this.onAddFile) {
             this.onAddFile(file);
         }
diff --git a/lib/osf-components/addon/components/join-osf-banner/template.hbs b/lib/osf-components/addon/components/join-osf-banner/template.hbs
@@ -30,7 +30,7 @@
                                     data-analytics-name='learn_more'
                                     target='_blank'
                                     rel='noreferrer'
-                                    @href='https://openscience.zendesk.com/hc/en-us'
+                                    @href='https://help.osf.io/'
                                 >
                                     {{t 'join_osf.learn_more'}}
                                 </OsfLink>
diff --git a/lib/osf-components/addon/components/license-picker/component.ts b/lib/osf-components/addon/components/license-picker/component.ts
@@ -33,7 +33,7 @@ export default class LicensePicker extends Component {
 
     showText = false;
     licensesAcceptable!: QueryHasManyResult<License>;
-    helpLink = 'https://openscience.zendesk.com/hc/en-us/articles/360019739014';
+    helpLink = 'https://help.osf.io/';
 
     @alias('theme.provider') provider!: Provider;
     @alias('node.license') selected!: License;
diff --git a/lib/osf-components/addon/components/osf-layout/registries-side-nav/component.ts b/lib/osf-components/addon/components/osf-layout/registries-side-nav/component.ts
@@ -1,7 +1,7 @@
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
 import { action } from '@ember/object';
-import { and, or } from '@ember/object/computed';
+import { and } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Media from 'ember-responsive';
 
@@ -21,8 +21,8 @@ export default class RegistriesSideNav extends Component {
     // Private properties
     shouldCollapse = false;
 
-    @or('media.{isDesktop,isJumbo}')
-    isCollapseAllowed!: boolean;
+    // remove collapse capability for now
+    isCollapseAllowed!: false;
 
     @and('isCollapseAllowed', 'shouldCollapse')
     isCollapsed!: boolean;
diff --git a/lib/osf-components/addon/components/side-nav/component.ts b/lib/osf-components/addon/components/side-nav/component.ts
@@ -1,7 +1,7 @@
 import { tagName } from '@ember-decorators/component';
 import Component from '@ember/component';
 import { action } from '@ember/object';
-import { and, or } from '@ember/object/computed';
+import { and } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import Media from 'ember-responsive';
 
@@ -21,8 +21,8 @@ export default class SideNav extends Component {
     // Private properties
     shouldCollapse = false;
 
-    @or('media.{isDesktop,isJumbo}')
-    isCollapseAllowed!: boolean;
+    // remove collapse functionality for now
+    isCollapseAllowed = false;
 
     @and('isCollapseAllowed', 'shouldCollapse')
     isCollapsed!: boolean;
diff --git a/lib/registries/addon/drafts/draft/draft-registration-manager.ts b/lib/registries/addon/drafts/draft/draft-registration-manager.ts
@@ -2,6 +2,7 @@ import { setOwner } from '@ember/application';
 import { action, computed, set } from '@ember/object';
 import { dependentKeyCompat } from '@ember/object/compat';
 import { alias, filterBy, not, notEmpty, or } from '@ember/object/computed';
+import RouterService from '@ember/routing/router-service';
 import { inject as service } from '@ember/service';
 import { waitFor } from '@ember/test-waiters';
 import { isEmpty } from '@ember/utils';
@@ -25,7 +26,7 @@ import {
     RegistrationResponse,
 } from 'ember-osf-web/packages/registration-schema';
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
-import RouterService from '@ember/routing/router-service';
+import { notFoundURL } from 'ember-osf-web/utils/clean-url';
 
 export type LoadDraftModelTask = TaskInstance<{
     draftRegistration: DraftRegistration,
@@ -142,7 +143,7 @@ export default class DraftRegistrationManager {
         set(this, 'draftRegistration', draftRegistration);
         set(this, 'provider', provider);
         if (!draftRegistration || !provider) {
-            return this.router.transitionTo('registries.page-not-found', window.location.href.slice(-1));
+            return this.router.transitionTo('registries.page-not-found', notFoundURL(this.router.currentURL));
         }
         try {
             const node = await this.draftRegistration.branchedFrom;
@@ -175,7 +176,7 @@ export default class DraftRegistrationManager {
     async initializeMetadataChangeset() {
         const { draftRegistration } = await this.draftRegistrationTask;
         if (!draftRegistration) {
-            return this.router.transitionTo('registries.page-not-found', window.location.href.slice(-1));
+            return this.router.transitionTo('registries.page-not-found', notFoundURL(this.router.currentURL));
         }
         const metadataValidations = buildMetadataValidations();
         const metadataChangeset = buildChangeset(draftRegistration, metadataValidations);
diff --git a/lib/registries/addon/drafts/draft/route.ts b/lib/registries/addon/drafts/draft/route.ts
@@ -14,6 +14,7 @@ import ProviderModel from 'ember-osf-web/models/provider';
 import SubjectModel from 'ember-osf-web/models/subject';
 import Analytics from 'ember-osf-web/services/analytics';
 import captureException from 'ember-osf-web/utils/capture-exception';
+import { notFoundURL } from 'ember-osf-web/utils/clean-url';
 import DraftRegistrationManager, { LoadDraftModelTask } from 'registries/drafts/draft/draft-registration-manager';
 import NavigationManager from 'registries/drafts/draft/navigation-manager';
 
@@ -39,6 +40,8 @@ export default class DraftRegistrationRoute extends Route {
             );
             if (draftRegistration.modelName === 'registration') {
                 this.transitionTo('overview', draftRegistration.id);
+            } else if (draftRegistration.currentUserIsReadOnly) {
+                this.replaceWith('drafts.draft.review', draftId);
             }
             const [subjects, provider]:
                 [SubjectModel[], ProviderModel] = await Promise.all([
@@ -47,13 +50,10 @@ export default class DraftRegistrationRoute extends Route {
                 ]);
 
             draftRegistration.setProperties({ subjects });
-            if (draftRegistration.currentUserIsReadOnly) {
-                this.replaceWith('drafts.draft.review', draftId);
-            }
             return { draftRegistration, provider };
         } catch (error) {
             captureException(error);
-            return this.transitionTo('page-not-found', window.location.href.slice(-1));
+            return this.transitionTo('page-not-found', notFoundURL(this.router.currentURL));
         }
     }
 
diff --git a/lib/registries/addon/edit-revision/revision-manager.ts b/lib/registries/addon/edit-revision/revision-manager.ts
@@ -27,6 +27,7 @@ import SchemaResponseModel, { RevisionReviewStates } from 'ember-osf-web/models/
 import NodeModel from 'ember-osf-web/models/node';
 import { Permission } from 'ember-osf-web/models/osf-model';
 import buildChangeset from 'ember-osf-web/utils/build-changeset';
+import { notFoundURL } from 'ember-osf-web/utils/clean-url';
 
 export type LoadModelsTask = TaskInstance<{
     revision: SchemaResponseModel,
@@ -193,7 +194,7 @@ export default class RevisionManager {
     async initializeRevisionChangeset() {
         const { revision } = await this.loadModelsTask;
         if (!revision) {
-            return this.router.transitionTo('registries.page-not-found', window.location.href.slice(-1));
+            return this.router.transitionTo('registries.page-not-found', notFoundURL(this.router.currentURL));
         }
         const revisionValidations = buildSchemaResponseValidations();
         const revisionChangeset = buildChangeset(revision, revisionValidations);
diff --git a/lib/registries/addon/edit-revision/route.ts b/lib/registries/addon/edit-revision/route.ts
@@ -12,6 +12,7 @@ import requireAuth from 'ember-osf-web/decorators/require-auth';
 import { RevisionReviewStates } from 'ember-osf-web/models/schema-response';
 import Analytics from 'ember-osf-web/services/analytics';
 import captureException from 'ember-osf-web/utils/capture-exception';
+import { notFoundURL } from 'ember-osf-web/utils/clean-url';
 import RevisionNavigationManager from 'registries/edit-revision/nav-manager';
 import RevisionManager, { LoadModelsTask } from 'registries/edit-revision/revision-manager';
 export interface EditRevisionRouteModel {
@@ -47,7 +48,7 @@ export default class EditRevisionRoute extends Route {
             };
         } catch (error) {
             captureException(error);
-            return this.transitionTo('page-not-found', window.location.href.slice(-1));
+            return this.transitionTo('page-not-found', notFoundURL(this.router.currentURL));
         }
     }
 
diff --git a/lib/registries/addon/overview/styles.scss b/lib/registries/addon/overview/styles.scss
@@ -46,6 +46,10 @@
     margin: 0 18px;
 }
 
+.FileProviderIcon {
+    font-size: 16px;
+}
+
 .Loading {
     height: 100vh;
     display: flex;
diff --git a/lib/registries/addon/overview/template.hbs b/lib/registries/addon/overview/template.hbs
@@ -88,6 +88,7 @@
                                     {{#if (eq provider.name 'osfstorage')}}
                                         <span>
                                             <FaIcon
+                                                local-class='FileProviderIcon'
                                                 @icon='globe'
                                             >
                                             </FaIcon>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ember-osf-web",
-  "version": "22.4.0",
+  "version": "22.5.0",
   "description": "Ember front-end for the Open Science Framework",
   "license": "Apache-2.0",
   "author": "Center for Open Science <support@cos.io>",
diff --git a/tests/integration/components/file-renderer/component-test.ts b/tests/integration/components/file-renderer/component-test.ts
@@ -10,7 +10,7 @@ module('Integration | Component | file-renderer', hooks => {
     setupRenderingTest(hooks);
 
     test('file rendering defaults', async function(assert) {
-        const download = this.set('download', 'someTruthyValue');
+        const download = this.set('download', 'http://cos.io/');
 
         await render(hbs`
             {{file-renderer download=download}}
diff --git a/translations/en-us.yml b/translations/en-us.yml
@@ -494,7 +494,7 @@ node_navbar:
     settings: Settings
     comments: Comments
 status:
-    welcome_message: '<h1>Welcome to OSF!</h1><p>Visit our <a href="https://openscience.zendesk.com/hc/en-us" target="_blank" rel="noreferrer">Guides</a> to learn about creating a project, or get inspiration from <a href="https://osf.io/explore/activity/#popularPublicProjects">popular public projects</a>.</p>'
+    welcome_message: '<h1>Welcome to OSF!</h1><p>Visit our <a href="https://help.osf.io/" target="_blank" rel="noreferrer">Guides</a> to learn about creating a project, or get inspiration from <a href="https://osf.io/explore/activity/#popularPublicProjects">popular public projects</a>.</p>'
     alternate_email_error: 'The email address has <b>NOT</b> been added to your account. Please log out and revisit the link in your email. Thank you.'
     # remove_addon: 'Because the GitHub add-on for {extra.category} "{extra.title}" was authenticated by {extra.user}, authentication information has been deleted.'
     project_deleted: 'Project has been successfully deleted.'
@@ -1071,7 +1071,7 @@ registries:
             delete_update: 'Delete update'
             confirm_delete: 'Please confirm deletion of update.'
     new:
-        provider_info: 'You are submitting to {provider}. <a href="https://help.osf.io/hc/en-us/categories/360001550953-Registrations">Click here</a> to learn more about other hosted registries.'
+        provider_info: 'You are submitting to {provider}. <a href="https://help.osf.io/">Click here</a> to learn more about other hosted registries.'
         required: 'required'
         page_title: 'New Registration'
         page_header: 'Add New Registration'
@@ -1797,7 +1797,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>.'
+            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/">help guides</a>.'
         schema-block-renderer/read-only/response:
             noResponse: 'No response'
         schema-block-renderer/read-only/files:
@@ -1813,6 +1813,7 @@ osf-components:
         folder_name_placeholder: 'New folder name'
         create_folder_failed: 'Failed to create folder'
         insufficient_storage_error: 'This file cannot be uploaded to this project/component because it has exceeded the storage limit for OSF Storage.'
+        file_add_success: 'File added successfully'
         delete_failed: 'Failed to delete {filename}'
         delete_success: 'Successfully deleted {filename}'
         delete: Delete
@@ -1947,7 +1948,7 @@ settings:
     account:
         deactivation:
             title: 'Deactivate account'
-            body: 'Deactivating your account will remove you from all public projects to which you are a contributor. Your account will no longer be associated with OSF projects, and your work on the OSF will be inaccessible. If this is a secondary account that you want to close, consider <a href="https://openscience.zendesk.com/hc/en-us/articles/360019738014">merging your accounts</a>.'
+            body: 'Deactivating your account will remove you from all public projects to which you are a contributor. Your account will no longer be associated with OSF projects, and your work on the OSF will be inaccessible. If this is a secondary account that you want to close, consider <a href="https://help.osf.io/">merging your accounts</a>.'
             warning: 'Warning:'
             warningText: 'Once your deactivation has been approved the effects are irreversible.'
             pending: 'Your account is currently pending deactivation.'

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,13 @@`
`19`	`19`	`padding: 0 20px 20px;`
`20`	`20`	`}`
`21`	`21`
	`22`	`+.FlexContainerRow > h2 {`
	`23`	`+ text-overflow: ellipsis;`
	`24`	`+ overflow: hidden;`
	`25`	`+ white-space: nowrap;`
	`26`	`+ max-width: 70vw;`
	`27`	`+}`
	`28`	`+`
`22`	`29`	`.ProjectLink {`
`23`	`30`	`margin: 20px;`
`24`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@`
`65`	`65`	`<OsfLink`
`66`	`66`	`data-analytics-name='contact_form'`
`67`	`67`	`class='text-bigger'`
`68`		`- @href='https://openscience.zendesk.com/hc/en-us'`
	`68`	`+ @href='https://help.osf.io/'`
`69`	`69`	`>`
`70`	`70`	`{{t 'support.contact_form'}}`
`71`	`71`	`</OsfLink>`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ export default class FilesManagerComponent extends Component {`
`202`	`202`
`203`	`203`	`this.lastUploaded.pushObject(file);`
`204`	`204`
`205`		`- this.toast.success(this.intl.t('file_browser.file_added_toast'));`
	`205`	`+ this.toast.success(this.intl.t('osf-components.files-widget.file_add_success'));`
`206`	`206`	`if (this.onAddFile) {`
`207`	`207`	`this.onAddFile(file);`
`208`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@`
`30`	`30`	`data-analytics-name='learn_more'`
`31`	`31`	`target='_blank'`
`32`	`32`	`rel='noreferrer'`
`33`		`- @href='https://openscience.zendesk.com/hc/en-us'`
	`33`	`+ @href='https://help.osf.io/'`
`34`	`34`	`>`
`35`	`35`	`{{t 'join_osf.learn_more'}}`
`36`	`36`	`</OsfLink>`