Merge branch 'release/0.126.0'

Author: sloria

CHANGELOG

@@ -2,6 +2,90 @@
 Changelog
 *********
 
+0.126.0 (2017-12-14)
+====================
+- Citation Widget: Some Journal Styles Missing
+- Display registration status of DraftRegistrations (if any) in Prereg
+- Subsequent files do not receive a modal when copied over to a folder
+- Unable to authorize figshare accounts with unicode in name
+- fix incorrect method name in oauth node config js
+- In Fangorn, Github's [Open] button only points to the default branch
+- Popular Public and New & Noteworthy -- making a project private causes error
+- Admin app: accessing list of user's permissions 502s
+- Unable to mark node as Ham
+- Templating a registration breaks and creates a malformed registration
+- Withdrawn registration pages cause sentry errors
+- Registration created both with and w/o prereg review -- case where user selects "register w/out review" first
+- OwnCloud incorrectly logs folder deletions as "file" in logs
+- Should not show "Add important information..." in wiki widget for registrations
+- Admin app, check group permissions (not system tag)
+- Remove urls for folder in api
+- Download URLs 404 for Box file revisions
+- Multi-field filtering is broken on staging and production
+- Citations preview should show the full name field if the individual name sections are blank
+- Incorrect error message is shown for Dataverse 500 error
+- File checked out to Alex DeHaven after Prereg Challenge submission is approved.
+- Don't use {} as a attribute default value
+- [admin app] Searching for user names that contain periods or commas returns 502
+- Forks total includes registrations
+- Fix spelling for new VOL section in project settings
+- Special characters do not render on registration forms
+- "Sign In -->" for Institutions with custom domains goes to wrong url -- incorrectly routes already-logged-in users to their dashboard
+- Add unregistered contributor modal doesn't strip leading/trailing spaces from email address
+- Failing email validation in 'add unreg contrib' modal permanently disables 'Add' button
+- Add loading indicator when authorizing Dataverse or importing auth from profile to project settings
+- Prevent SendGrid from sending emails to randomly generated users locally
+- Make support email address configurable
+- Project titles on the Project Overview page wrap in undesirable way
+- API: View-only parameter needs to be added to all WB links
+- Username not displaying properly in activity logs of My Projects page
+- Error sending Keen data to pageviews: <An error occurred!>
+- Iterative 0.126.0 Fixes
+- "Add-ons" and "Settings" tabs display on public projects for non-contributors
+- Increase registration test failure allowance
+- Project navigation breaks, 'settings' shifts strangely, sometimes shows 'comments'
+- The GitHub Fangorn interface lacks a Download-as-zip button for folders
+- Add Arabixiv logo for sign up page
+- Clean up gravatar specific methods
+- Search in 'add link' should show all your projects by default
+- Incorrect grammar in My Projects slow load error text
+- Clear Deactivate Flag on User Accounts
+- Add new logo / branding to OSF for Meetings
+- Add user's registrations and preprints relationships to user serializer
+- There should not be a link to Box.com in the Welcome to the OSF email
+- Users Should be Alerted of Maintenance on All Pages
+- Add Embargo Date Management to Admin App
+- Cancel changes button on admin preprint config
+- Move Number of Forks, Links, Templates to Analytics Tab
+- Move "Add-ons" to own tab on Node Overview, out of Project Settings
+- API: Attempting to PATCH a registration needs corrected error code & message
+- Remove QA test items from elastic search
+- Admin: Checking "Domain redirect enabled" with no domain redirects to OSF landing page
+- 'Sign Up' webpage title issue
+- Send users an email about fork fail/success
+- Update language in engagement email
+- Always show dropdown on Configure Wiki Settings
+- Add project logs to admin app
+- Search by contributor's profile information
+- Enable account merging in admin app
+- Email users who have started but not finished a pre-reg application
+- Mod Meta Deletion followup
+- Trigger for wiki widget "Read More" does not match display field length
+- Improve node category visual recognition
+- Allow tags to be added after a registration is created
+- Remove WBv0-using code from the OSF
+- Show preprint provider logos in Admin
+- Add metatags to projects and components for better Zotero export
+- Add ability to rename a file on the file detail page
+- Change placeholder text in dashboard search box
+- Missing Restriction On String Size On Given, Middle, Family name, etc
+- Add "latest" version tag and have BAPI use this by default
+- Add links to status page
+- Allow ampersand in project description
+- Character count increase and better count for comments
+- Add flag to indicate custom highlighted taxonomy is used
+- Change FAQ link
+
 0.125.0 (2017-12-05)
 ====================
 
@@ -22,7 +106,24 @@ Changelog
 0.124.0 (2017-11-13)
 ====================
 
-- Critical bug fixes
+- Browser plugin for preprint partner preview
+- Importing preprint provider on production - taxonomies fix
+- Admin import should be fault tolerant for new fields
+- Titles for private linked nodes are visible in logs
+- Can't find unclaimed record for user
+- Opening a file in another tab using the "⌘" symbol causes the Files widget to perform inadequately
+- Make undecorated links in the wiki clickable
+- Add notification email on preprint submission
+- Include Biobliographic/Non-bibliographic option in Add Contributor Modal
+- Add Physical COS Address to Transactional\Notification Emails
+- Fix small errors on OSF Metrics
+- Add image sizing to wiki
+- Make "import contributors" a one-click process
+- Really allow users to affiliate registrations
+- Detect Child Components as Deleting Project
+- Improve the prereg Challenge approved submission email to encourage promotion on social media
+- Add original publication date field for preprints, citation changes
+- Update docker and docker-sync settings
 
 0.123.0 (2017-10-26)
 ====================

PULL_REQUEST_TEMPLATE.md

@@ -13,10 +13,18 @@
 
 <!-- Briefly describe or list your changes  -->
 
-## Side effects
+## QA Notes
 
-<!--Any possible side effects? -->
+<!-- Does this change need QA? If so, this section is required.
+     - Is cross-browser testing required/recommended?
+     - Is API testing required/recommended?
+     - What pages on the OSF should be tested?
+     - What edge cases should QA be aware of?
+-->
 
+## Side Effects
+
+<!-- Any possible side effects? -->
 
 ## Ticket
 

addons.json

@@ -18,6 +18,9 @@
         "googledrive",
         "bitbucket"
     ],
+    "addons_default": [
+        "osfstorage"
+    ],
     "addons_archivable": {
         "osfstorage": "full",
         "box": "partial",

addons/base/models.py

@@ -17,7 +17,7 @@
 from website import settings
 from addons.base import logger, serializer
 from website.oauth.signals import oauth_complete
-from website.util import waterbutler_url_for
+from website.util import waterbutler_api_url_for
 
 lookup = TemplateLookup(
     directories=[
@@ -561,26 +561,37 @@ def archive_folder_name(self):
         return name
 
     def _get_fileobj_child_metadata(self, filenode, user, cookie=None, version=None):
-        kwargs = dict(
-            provider=self.config.short_name,
-            path=filenode.get('path', ''),
-            node=self.owner,
+
+        kwargs = {}
+        if version:
+            kwargs['version'] = version
+        if cookie:
+            kwargs['cookie'] = cookie
+        elif user:
+            kwargs['cookie'] = user.get_or_create_cookie()
+
+        metadata_url = waterbutler_api_url_for(
+            self.owner._id,
+            self.config.short_name,
+            path=filenode.get('path', '/'),
             user=user,
             view_only=True,
+            _internal=True,
+            **kwargs
         )
-        if cookie:
-            kwargs['cookie'] = cookie
-        if version:
-            kwargs['version'] = version
-        metadata_url = waterbutler_url_for('metadata', _internal=True, **kwargs)
 
         res = requests.get(metadata_url)
+
         if res.status_code != 200:
             raise HTTPError(res.status_code, data={'error': res.json()})
 
         # TODO: better throttling?
         time.sleep(1.0 / 5.0)
-        return res.json().get('data', [])
+
+        data = res.json().get('data', None)
+        if data:
+            return [child['attributes'] for child in data]
+        return []
 
     def _get_file_tree(self, filenode=None, user=None, cookie=None, version=None):
         """
@@ -591,7 +602,7 @@ def _get_file_tree(self, filenode=None, user=None, cookie=None, version=None):
             'kind': 'folder',
             'name': self.root_node.name,
         }
-        if filenode.get('kind') == 'file' or 'size' in filenode:
+        if filenode.get('kind') == 'file':
             return filenode
 
         kwargs = {

addons/base/tests/views.py

@@ -309,8 +309,8 @@ def test_widget_view_complete(self):
         )
         assert_true(self.node_settings.complete)
         assert_equal(self.node_settings.list_id, 'Fake Key')
-        url = self.project.api_url_for('{0}_widget'.format(self.ADDON_SHORT_NAME))
-        res = self.app.get(url, auth=self.user.auth).json
+
+        res = self.citationsProvider().widget(self.project.get_addon(self.ADDON_SHORT_NAME))
 
         assert_true(res['complete'])
         assert_equal(res['list_id'], 'Fake Key')
@@ -321,8 +321,8 @@ def test_widget_view_incomplete(self):
         self.node_settings.save()
         assert_false(self.node_settings.complete)
         assert_equal(self.node_settings.list_id, None)
-        url = self.project.api_url_for('{0}_widget'.format(self.ADDON_SHORT_NAME))
-        res = self.app.get(url, auth=self.user.auth).json
+
+        res = self.citationsProvider().widget(self.project.get_addon(self.ADDON_SHORT_NAME))
 
         assert_false(res['complete'])
         assert_is_none(res['list_id'])

addons/base/views.py

@@ -35,7 +35,7 @@
 from osf.models import (BaseFileNode, TrashedFileNode,
                         OSFUser, AbstractNode,
                         NodeLog, DraftRegistration, MetaSchema)
-from website.profile.utils import get_gravatar
+from website.profile.utils import get_profile_image_url
 from website.project import decorators
 from website.project.decorators import must_be_contributor_or_public, must_be_valid_project
 from website.project.utils import serialize_node
@@ -195,7 +195,7 @@ def check_access(node, auth, action, cas_resp):
                 return True
             parent = parent.parent_node
 
-    # Users with the PREREG_ADMIN_TAG should be allowed to download files
+    # Users with the prereg admin permission should be allowed to download files
     # from prereg challenge draft registrations.
     try:
         prereg_schema = MetaSchema.objects.get(name='Prereg Challenge', schema_version=2)
@@ -207,7 +207,7 @@ def check_access(node, auth, action, cas_resp):
         if action == 'download' and \
                     auth.user is not None and \
                     prereg_draft_registration.count() > 0 and \
-                    settings.PREREG_ADMIN_TAG in auth.user.system_tags:
+                    auth.user.has_perm('osf.administer_prereg'):
             return True
     except MetaSchema.DoesNotExist:
         pass
@@ -409,6 +409,7 @@ def create_waterbutler_log(payload, **kwargs):
                     destination_path=payload['source']['materialized'],
                     source_addon=payload['source']['addon'],
                     destination_addon=payload['destination']['addon'],
+                    osf_support_email=settings.OSF_SUPPORT_EMAIL
                 )
 
             if payload.get('errors'):
@@ -568,7 +569,7 @@ def addon_deleted_file(auth, node, error_type='BLAME_PROVIDER', **kwargs):
             'render': None,
             'sharejs': None,
             'mfr': settings.MFR_SERVER_URL,
-            'gravatar': get_gravatar(auth.user, 25),
+            'profile_image': get_profile_image_url(auth.user, 25),
             'files': node.web_url_for('collect_file_trees'),
         },
         'extra': {},
@@ -731,6 +732,7 @@ def addon_view_file(auth, node, file_node, version):
             'direct': None,
             'mode': 'render',
             'action': 'download',
+            'public_file': node.is_public,
         })
     )
 
@@ -744,7 +746,7 @@ def addon_view_file(auth, node, file_node, version):
             'render': render_url.url,
             'mfr': settings.MFR_SERVER_URL,
             'sharejs': wiki_settings.SHAREJS_URL,
-            'gravatar': get_gravatar(auth.user, 25),
+            'profile_image': get_profile_image_url(auth.user, 25),
             'files': node.web_url_for('collect_file_trees'),
             'archived_from': get_archived_from_url(node, file_node) if node.is_registration else None,
         },

addons/dataverse/static/dataverseNodeConfig.js

@@ -29,6 +29,7 @@ function ViewModel(url) {
     self.loadedSettings = ko.observable(false);
     self.loadedDatasets = ko.observable(false);
     self.submitting = ko.observable(false);
+    self.authorizing = ko.observable(false);
 
     self.dataverses = ko.observableArray([]);
     self.datasets = ko.observableArray([]);
@@ -72,8 +73,7 @@ function ViewModel(url) {
     self.messages = {
         userSettingsError: ko.pureComputed(function() {
             return 'Could not retrieve settings. Please refresh the page or ' +
-                'contact <a href="mailto: support@osf.io">support@osf.io</a> if the ' +
-                'problem persists.';
+                'contact ' + $osf.osfSupportLink() + ' if the problem persists.';
         }),
         confirmDeauth: ko.pureComputed(function() {
             return 'Are you sure you want to remove this ' + self.addonName + ' account?';
@@ -93,8 +93,7 @@ function ViewModel(url) {
         authError: ko.pureComputed(function() {
             return 'Sorry, but there was a problem connecting to that instance of Dataverse. It ' +
                 'is likely that the instance hasn\'t been upgraded to Dataverse 4.0. If you ' +
-                'have any questions or believe this to be an error, please contact ' +
-                'support@osf.io.';
+                'have any questions or believe this to be an error, please contact ' + $osf.osfSupportEmail();
         }),
         tokenImportSuccess: ko.pureComputed(function() {
             return 'Successfully imported access token from profile.';
@@ -104,8 +103,7 @@ function ViewModel(url) {
         }),
         updateAccountsError: ko.pureComputed(function() {
             return 'Could not retrieve ' + self.addonName + ' account list at ' +
-                'this time. Please refresh the page. If the problem persists, email ' +
-                '<a href="mailto:support@osf.io">support@osf.io</a>.';
+                'this time. Please refresh the page. If the problem persists, email ' + $osf.osfSupportLink();
         }),
         datasetDeaccessioned: ko.pureComputed(function() {
             return 'This dataset has already been deaccessioned on Dataverse ' +
@@ -123,12 +121,12 @@ function ViewModel(url) {
         }),
         setDatasetError: ko.pureComputed(function() {
             return 'Could not connect to this dataset. Please refresh the page or ' +
-                'contact <a href="mailto: support@osf.io">support@osf.io</a> if the ' +
+                'contact ' + $osf.osfSupportLink() +' if the ' +
                 'problem persists.';
         }),
         getDatasetsError: ko.pureComputed(function() {
             return 'Could not load datasets. Please refresh the page or ' +
-                'contact <a href="mailto: support@osf.io">support@osf.io</a> if the ' +
+                'contact ' + $osf.osfSupportLink() +' if the ' +
                 'problem persists.';
         })
     };
@@ -267,6 +265,7 @@ ViewModel.prototype.updateFromData = function(data) {
 ViewModel.prototype.clearModal = function() {
     var self = this;
     self.message('');
+    self.authorizing(false);
     self.messageClass('text-info');
     self.apiToken(null);
     self.selectedHost(null);
@@ -297,7 +296,7 @@ ViewModel.prototype.setInfo = function() {
     }).fail(function(xhr, textStatus, error) {
         self.submitting(false);
         var errorMessage = (xhr.status === 410) ? self.messages.datasetDeaccessioned :
-            (xhr.status = 406) ? self.messages.forbiddenCharacters : self.messages.setDatasetError;
+            (xhr.status === 406) ? self.messages.forbiddenCharacters : self.messages.setDatasetError;
         self.changeMessage(errorMessage, 'text-danger');
         Raven.captureMessage('Could not authenticate with Dataverse', {
             extra: {
@@ -358,22 +357,27 @@ ViewModel.prototype.sendAuth = function() {
 
     // Selection should not be empty
     if( !self.selectedHost() ){
-        self.changeMessage("Please select a Dataverse repository.", 'text-danger');
+        self.changeMessage('Please select a Dataverse repository.', 'text-danger');
         return;
     }
+
     var url = self.urls().create;
+
+    self.authorizing(true);
     return $osf.postJSON(
         url,
         ko.toJS({
             host: self.host,
             api_token: self.apiToken
         })
     ).done(function() {
+        self.authorizing(false);
         self.clearModal();
         $modal.modal('hide');
         self.userHasAuth(true);
         self.importAuth();
     }).fail(function(xhr, textStatus, error) {
+        self.authorizing(false);
         var errorMessage = (xhr.status === 401) ? self.messages.authInvalid : self.messages.authError;
         self.changeMessage(errorMessage, 'text-danger');
         Raven.captureMessage('Could not authenticate with Dataverse', {