Merge branch 'release/0.107.0'

Author: brianjgeiger

.ember-cli

@@ -5,5 +5,8 @@
 
     Setting `disableAnalytics` to true will prevent any data from being sent.
   */
-  "disableAnalytics": true
+  "disableAnalytics": true,
+  "port": 4200,
+
+  "liveReloadPort": 41953 /* Needed for the TouchBar on the new MacBook Pros */
 }

.eslintignore

@@ -0,0 +1,4 @@
+coverage
+dist
+docs
+tmp

.eslintrc.js

@@ -0,0 +1,16 @@
+module.exports = {
+    root: true,
+    parserOptions: {
+        ecmaVersion: 6,
+        sourceType: 'module'
+    },
+    extends: 'eslint:recommended',
+    env: {
+        browser: true,
+        es6: true
+    },
+    globals: {
+        MathJax: true
+    },
+    rules: {}
+};

.jshintrc

@@ -35,6 +35,10 @@ For local development, this is designed to run alongside (and from within) the f
 to your `website/settings/local.py` file. Uncomment `'/preprints/': 'http://localhost:4200',` and restart your flask app.
 4. Visit your app at http://localhost:5000/preprints/
 
+### Provider Domains
+1. Run `sudo ./scripts/add-domains.js`. This will add the domains to your `/etc/hosts`.
+2. Visit your app at one of the provider domains with `https://local.<domain>:4200` (e.g. `http://local.socarxiv.org:4200`)
+
 If you encounter problems, make sure that your version of ember-osf is up to date. If login fails, try logging in from 
 any other OSF page, then returning to the preprints app.
 

README.md

@@ -0,0 +1,12 @@
+import Ember from 'ember';
+import Analytics from '../mixins/analytics';
+
+export default Ember.Component.extend(Analytics, {
+    theme: Ember.inject.service(),
+    classNames: ['preprint-error-page'],
+    label: '',
+    translationKey: '',
+    supportEmail: Ember.computed('theme.isProvider', 'theme.provider.emailSupport', function() {
+        return this.get('theme.isProvider') ? this.get('theme.provider.emailSupport') : '[email protected]';
+    })
+});

app/components/error-page.js

@@ -36,6 +36,7 @@ import Analytics from '../mixins/analytics';
  * @class preprint-form-authors
  */
 export default CpPanelBodyComponent.extend(Analytics, {
+    i18n: Ember.inject.service(),
     valid: Ember.computed.alias('newContributorId'),
     authorModification: false,
     currentPage: 1,
@@ -94,9 +95,10 @@ export default CpPanelBodyComponent.extend(Analytics, {
             this.attrs.addContributor(user.id, 'write', true, this.get('sendEmail'), undefined, undefined, true).then((res) => {
                 this.toggleAuthorModification();
                 this.get('contributors').pushObject(res);
+                this.get('toast').success(this.get('i18n').t('submit.preprint_author_added'));
                 this.highlightSuccessOrFailure(res.id, this, 'success');
             }, () => {
-                this.get('toast').error('Could not add contributor.');
+                this.get('toast').error(this.get('i18n').t('submit.error_adding_author'));
                 this.highlightSuccessOrFailure(user.id, this, 'error');
                 user.rollbackAttributes();
             });
@@ -142,12 +144,13 @@ export default CpPanelBodyComponent.extend(Analytics, {
                     this.set('addState', 'searchView');
                     this.set('fullName', '');
                     this.set('email', '');
+                    this.get('toast').success(this.get('i18n').t('submit.preprint_unregistered_author_added'));
                     this.highlightSuccessOrFailure(contributor.id, this, 'success');
                 }, (error) => {
                     if (error.errors[0] && error.errors[0].detail && error.errors[0].detail.indexOf('is already a contributor') > -1) {
                         this.get('toast').error(error.errors[0].detail);
                     } else {
-                        this.get('toast').error('Could not add unregistered contributor.');
+                        this.get('toast').error(this.get('i18n').t('submit.error_adding_unregistered_author'));
                     }
                     this.highlightSuccessOrFailure('add-unregistered-contributor-form', this, 'error');
                 });
@@ -178,8 +181,9 @@ export default CpPanelBodyComponent.extend(Analytics, {
                 this.toggleAuthorModification();
                 this.removedSelfAsAdmin(contrib, contrib.get('permission'));
                 this.get('contributors').removeObject(contrib);
+                this.get('toast').success(this.get('i18n').t('submit.preprint_author_removed'));
             }, () => {
-                this.get('toast').error('Could not remove author');
+                this.get('toast').error(this.get('i18n').t('submit.error_adding_author'));
                 this.highlightSuccessOrFailure(contrib.id, this, 'error');
                 contrib.rollbackAttributes();
             });

app/components/preprint-form-authors.js

@@ -1,6 +1,8 @@
 import Ember from 'ember';
 import OSFAgnosticAuthControllerMixin from 'ember-osf/mixins/osf-agnostic-auth-controller';
 import Analytics from '../mixins/analytics';
+import config from 'ember-get-config';
+
 /**
  * @module ember-preprints
  * @submodule components
@@ -22,5 +24,6 @@ export default Ember.Component.extend(OSFAgnosticAuthControllerMixin, Analytics,
     session: Ember.inject.service(),
     theme: Ember.inject.service(),
     tagName: 'nav',
-    classNames: ['navbar', 'branded-navbar', 'preprint-navbar']
+    classNames: ['navbar', 'branded-navbar', 'preprint-navbar'],
+    host: config.OSF.url,
 });

app/components/preprint-navbar-branded.js

@@ -56,9 +56,32 @@ export default Ember.Component.extend(Analytics, {
                 this.set('primaryFile', pf);
                 this.set('selectedFile', this.get('primaryFile'));
                 this.set('files', [this.get('primaryFile')].concat(this.get('files')));
+                this.set('indexes', this.get('files').map(each => each.id));
             });
     }.observes('preprint'),
-
+    _chosenFile: Ember.observer('chosenFile', 'indexes', function() {
+        let fid = this.get('chosenFile');
+        let index = this.get('indexes').indexOf(fid);
+        if (fid && index !== -1) {
+            this.set('selectedFile', this.get('files')[index]);
+        }
+    }),
+    _moveIfNeeded: Ember.observer('selectedFile', function() {
+        let index = this.get('files').indexOf(this.get('selectedFile'));
+        if (index < 0) {
+            return;
+        }
+        if (index >= this.get('endIndex') || index < this.get('startIndex')) {
+            let max = this.get('files').length - 6;
+            if (index > max) {
+                this.set('startIndex', max);
+                this.set('endIndex', this.get('files').length);
+            } else {
+                this.set('startIndex', index);
+                this.set('endIndex', index + 6);
+            }
+        }
+    }),
     fileDownloadURL: Ember.computed('selectedFile', function() {
         return fileDownloadPath(this.get('selectedFile'), this.get('node'));
     }),
@@ -90,12 +113,17 @@ export default Ember.Component.extend(Analytics, {
                     action: 'click',
                     label: 'Preprints - Content - Prev'
                 });
-
-            if (this.get('startIndex') <= 0) return;
+            let start = this.get('startIndex');
+            if (start <= 0) return;
 
             this.set('scrollAnim', `to${direction}`);
-            this.set('endIndex', this.get('endIndex') - 5);
-            this.set('startIndex', this.get('startIndex') - 5);
+            if ((start - 5) < 0) {
+                this.set('startIndex', 0);
+                this.set('endIndex', 6);
+            } else {
+                this.set('startIndex', start - 5);
+                this.set('endIndex', this.get('endIndex') - 5);
+            }
         },
         changeFile(file) {
             Ember.get(this, 'metrics')
@@ -106,7 +134,6 @@ export default Ember.Component.extend(Analytics, {
                 });
 
             this.set('selectedFile', file);
-
             if (this.attrs.chooseFile) {
                 this.sendAction('chooseFile', file);
             }

app/components/supplementary-file-browser.js

@@ -1,9 +1,9 @@
 import Ember from 'ember';
 import loadAll from 'ember-osf/utils/load-relationship';
 import config from 'ember-get-config';
-import Analytics from '../mixins/analytics';
+import Analytics from '../../mixins/analytics';
 import permissions from 'ember-osf/const/permissions';
-import fileDownloadPath from '../utils/file-download-path';
+import fileDownloadPath from '../../utils/file-download-path';
 
 /**
  * Takes an object with query parameter name as the key and value, or [value, maxLength] as the values.
@@ -57,6 +57,9 @@ export default Ember.Controller.extend(Analytics, {
     showLicenseText: false,
     fileDownloadURL: '',
     expandedAbstract: navigator.userAgent.includes('Prerender'),
+    queryParams: {
+        chosenFile: 'file'
+    },
     isAdmin: Ember.computed('node', function() {
         // True if the current user has admin permissions for the node that contains the preprint
         return (this.get('node.currentUserPermissions') || []).includes(permissions.ADMIN);
@@ -67,7 +70,6 @@ export default Ember.Controller.extend(Analytics, {
             text: this.get('node.title'),
             via: 'OSFramework'
         };
-
         return `https://twitter.com/intent/tweet?${queryStringify(queryParams)}`;
     }),
     /* TODO: Update this with new Facebook Share Dialog, but an App ID is required
@@ -105,6 +107,7 @@ export default Ember.Controller.extend(Analytics, {
     }),
     // The currently selected file (defaults to primary)
     activeFile: null,
+    chosenFile: null,
 
     disciplineReduced: Ember.computed('model.subjects', function() {
         // Preprint disciplines are displayed in collapsed form on content page
@@ -193,6 +196,7 @@ export default Ember.Controller.extend(Analytics, {
         },
         // Metrics are handled in the component
         chooseFile(fileItem) {
+            this.set('chosenFile', fileItem.get('id'));
             this.set('activeFile', fileItem);
         },
         shareLink(href, category, action, label) {