[ENG-10587] Remove areas that allow users to enter orcid info manually

api/base/schemas/social-schema.json

@@ -67,10 +67,6 @@
     "academiaInstitution": {
       "description": "The academiaInstitution for the given user",
       "type": "string"
-    },
-    "orcid": {
-      "description": "The orcid for the given user",
-      "type": "string"
     }
   },
   "additionalProperties": false

api_tests/users/views/test_user_detail.py

@@ -453,7 +453,6 @@ def user_one(self):
                 twitter='userOneTwitter',
                 linkedIn='userOneLinkedIn',
                 impactStory='userOneImpactStory',
-                orcid='userOneOrcid',
                 researcherId='userOneResearcherId'
             )
         )
@@ -508,7 +507,6 @@ def data_new_user_one(self, user_one):
                         'twitter': ['http://twitter.com/newtwitter'],
                         'linkedIn': ['https://www.linkedin.com/newLinkedIn'],
                         'impactStory': 'https://impactstory.org/newImpactStory',
-                        'orcid': 'http://orcid.org/newOrcid',
                         'researcherId': 'http://researcherid.com/rid/newResearcherId',
                     }},
             }}
@@ -916,7 +914,6 @@ def test_partial_patch_user_logged_in(self, app, user_one, url_user_one):
         assert user_one.social['twitter'] in social['twitter']
         assert user_one.social['linkedIn'] in social['linkedIn']
         assert user_one.social['impactStory'] in social['impactStory']
-        assert user_one.social['orcid'] in social['orcid']
         assert user_one.social['researcherId'] in social['researcherId']
         assert user_one.fullname == 'new_fullname'
         assert user_one.suffix == 'The Millionth'
@@ -933,7 +930,6 @@ def test_patch_all_social_fields(self, app, user_one, url_user_one, mock_spam_he
             'academiaProfileID': 'okokokok',
             'ssrn': 'aaaa',
             'impactStory': 'why not',
-            'orcid': 'ork-id',
             'researchGate': 'Why are there so many of these',
             'researcherId': 'ok-lastone',
             'academiaInstitution': 'Center for Open Science'
@@ -1005,7 +1001,6 @@ def test_partial_patch_user_logged_in_no_social_fields(
         assert user_one.social['twitter'] in social['twitter']
         assert user_one.social['linkedIn'] in social['linkedIn']
         assert user_one.social['impactStory'] in social['impactStory']
-        assert user_one.social['orcid'] in social['orcid']
         assert user_one.social['researcherId'] in social['researcherId']
         assert user_one.fullname == 'new_fullname'
         assert user_one.suffix == 'The Millionth'
@@ -1056,7 +1051,6 @@ def test_put_user_logged_in(self, app, user_one, data_new_user_one, url_user_one
         assert 'newtwitter' in social['twitter'][0]
         assert 'newLinkedIn' in social['linkedIn'][0]
         assert 'newImpactStory' in social['impactStory']
-        assert 'newOrcid' in social['orcid']
         assert 'newResearcherId' in social['researcherId']
         user_one.reload()
         assert user_one.fullname == data_new_user_one['data']['attributes']['full_name']
@@ -1069,7 +1063,6 @@ def test_put_user_logged_in(self, app, user_one, data_new_user_one, url_user_one
         assert 'newtwitter' in social['twitter'][0]
         assert 'newLinkedIn' in social['linkedIn'][0]
         assert 'newImpactStory' in social['impactStory']
-        assert 'newOrcid' in social['orcid']
         assert 'newResearcherId' in social['researcherId']
 
     def test_update_user_sanitizes_html_properly(

api_tests/users/views/test_user_exceptions.py

@@ -22,7 +22,6 @@ def user(self):
                 twitter='userOneTwitter',
                 linkedIn='userOneLinkedIn',
                 impactStory='userOneImpactStory',
-                orcid='userOneOrcid',
                 researcherId='userOneResearcherId'
             )
         )

osf/external/chronos/chronos.py

@@ -103,7 +103,6 @@ def serialize_user(cls, user):
             'GIVEN_NAME': user.given_name,
             'FULLNAME': user.fullname,
             'MIDDLE_NAME': user.middle_names,
-            'ORCID_ID': user.social.get('orcid', None),
             'PARTNER_USER_ID': user._id,
             'SURNAME': user.family_name,
         }

osf/models/user.py

@@ -344,7 +344,6 @@ class OSFUser(DirtyFieldsMixin, GuidMixin, BaseModel, AbstractBaseUser, Permissi
     #     'twitter': <list of twitter usernames>,
     #     'github': <list of github usernames>,
     #     'linkedIn': <list of linkedin profiles>,
-    #     'orcid': <orcid for user>,
     #     'researcherID': <researcherID>,
     #     'impactStory': <impactStory identifier>,
     #     'scholar': <google scholar identifier>,

website/static/js/profile.js

@@ -43,7 +43,6 @@ function urlRegex() {
 }
 
 var socialRules = {
-    orcid: /orcid\.org\/([-\d]+)/i,
     researcherId: /researcherid\.com\/rid\/([-\w]+)/i,
     scholar: /scholar\.google\.com\/citations\?user=(\w+)/i,
     twitter: /twitter\.com\/(\w+)/i,
@@ -601,10 +600,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) {
         return true;
     });
 
-    self.orcid = extendLink(
-        ko.observable().extend({trimmed: true, cleanup: cleanByRule(socialRules.orcid)}),
-        self, 'orcid', 'http://orcid.org/'
-    );
     self.researcherId = extendLink(
         ko.observable().extend({trimmed: true, cleanup: cleanByRule(socialRules.researcherId)}),
         self, 'researcherId', 'http://researcherId.com/rid/'
@@ -653,7 +648,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) {
 
     self.trackedProperties = [
         self.profileWebsites,
-        self.orcid,
         self.researcherId,
         self.twitter,
         self.scholar,
@@ -675,7 +669,6 @@ var SocialViewModel = function(urls, modes, preventUnsaved) {
 
     self.values = ko.computed(function() {
         return [
-            {label: 'ORCID', text: self.orcid(), value: self.orcid.url()},
             {label: 'ResearcherID', text: self.researcherId(), value: self.researcherId.url()},
             {label: 'Twitter', text: self.twitter(), value: self.twitter.url()},
             {label: 'GitHub', text: self.github(), value: self.github.url()},

website/templates/include/profile/social.mako

@@ -35,14 +35,6 @@
                 </a>
             </div>
 
-            <div class="form-group">
-                <label>ORCID</label>
-                <div class="input-group">
-                <span class="input-group-addon">http://orcid.org/</span>
-                <input class="form-control" data-bind="value: orcid" placeholder="xxxx-xxxx-xxxx-xxxx" aria-label="ORCID input" />
-                </div>
-            </div>
-
             <div class="form-group">
                 <label>ResearcherID</label>
                 <div class="input-group">
@@ -190,7 +182,6 @@
 <script>
 iconName = function(name) {
     var nameToHtml = {
-        "ORCID": "<i class='ai ai-orcid-square ai-2x' />",
         "ResearcherID": "<img src='http://tguillerme.github.io/images/logo-RID.png' class='icon-image'>",
         "Twitter": "<i class='fa fa-twitter-square fa-2x' />",
         "GitHub": "<i class='fa fa-github-square fa-2x' />",

website/templates/project/modal_add_contributor.mako

@@ -128,11 +128,6 @@
                                                         <i class="fa fa-info-circle social-icons fa-lg"></i>
                                                     </a>
                                                 </span>
-                                                <span data-bind="visible: contributor.social.orcid">
-                                                    <a data-bind="attr: {href: contributor.social.orcid}" data-toggle="tooltip" title="ORCiD" target="_blank">
-                                                        <i class="fa social-icons fa-lg">iD</i>
-                                                    </a>
-                                                </span>
                                                 <span data-bind="visible: contributor.social.researcherId">
                                                     <a data-bind="attr: {href: contributor.social.researcherId}" data-toggle="tooltip" title="ResearcherID" target="_blank">
                                                         <i class="fa social-icons fa-lg">R</i>

website/templates/search.mako

@@ -180,11 +180,6 @@
                             <i class="fa fa-info-circle social-icons" data-toggle="tooltip" title="ImpactStory"></i>
                         </a>
                     </li>
-                    <li data-bind="visible: social.orcid">
-                        <a data-bind="attr: {href: social.orcid}">
-                            <i class="fa social-icons" data-toggle="tooltip" title="ORCiD">iD</i>
-                        </a>
-                    </li>
                     <li data-bind="visible: social.researcherId">
                         <a data-bind="attr: {href: social.researcherId}">
                             <i class="fa social-icons" data-toggle="tooltip" title="ResearcherID">R</i>