From e61b82c45297396bf40b99efb6ab7a32ebf3b119 Mon Sep 17 00:00:00 2001 From: Alasdair Smith Date: Wed, 22 Nov 2017 17:07:50 +0000 Subject: [PATCH] Remove unused link sharing rollout, but keep onboarding popup --- .../Features/Project/ProjectController.coffee | 10 +---- services/web/app/views/project/editor.pug | 1 - .../app/views/project/editor/review-panel.pug | 4 +- .../web/app/views/project/editor/share.pug | 37 +------------------ services/web/public/coffee/ide.coffee | 8 ---- .../ShareProjectModalController.coffee | 7 ---- 6 files changed, 3 insertions(+), 64 deletions(-) diff --git a/services/web/app/coffee/Features/Project/ProjectController.coffee b/services/web/app/coffee/Features/Project/ProjectController.coffee index 97cf2f9a23..a552a67015 100644 --- a/services/web/app/coffee/Features/Project/ProjectController.coffee +++ b/services/web/app/coffee/Features/Project/ProjectController.coffee @@ -300,13 +300,6 @@ module.exports = ProjectController = token = TokenAccessHandler.getRequestToken(req, project_id) isTokenMember = results.isTokenMember - # Roll out token-access based on Project owner - enableTokenAccessUI = ProjectController._isInPercentageRollout( - 'linksharing', - project.owner_ref, - 100 - ) - showLinkSharingOnboarding = enableTokenAccessUI && results.couldShowLinkSharingOnboarding AuthorizationManager.getPrivilegeLevelForProject user_id, project_id, token, (error, privilegeLevel)-> return next(error) if error? if !privilegeLevel? or privilegeLevel == PrivilegeLevels.NONE @@ -355,8 +348,7 @@ module.exports = ProjectController = languages: Settings.languages themes: THEME_LIST maxDocLength: Settings.max_doc_length - enableTokenAccessUI: enableTokenAccessUI - showLinkSharingOnboarding: showLinkSharingOnboarding + showLinkSharingOnboarding: !!results.couldShowLinkSharingOnboarding timer.done() _buildProjectList: (allProjects, v1Projects = [])-> diff --git a/services/web/app/views/project/editor.pug b/services/web/app/views/project/editor.pug index 17efeb7f0f..4877c324ab 100644 --- a/services/web/app/views/project/editor.pug +++ b/services/web/app/views/project/editor.pug @@ -124,7 +124,6 @@ block requirejs window.showAutoCompileOnboarding = #{!!showAutoCompileOnboarding} window.showLinkSharingOnboarding = #{!!showLinkSharingOnboarding} window.wikiEnabled = #{!!(settings.apis.wiki && settings.apis.wiki.url)}; - window.enableTokenAccessUI = #{enableTokenAccessUI} window.requirejs = { "paths" : { "mathjax": "#{buildJsPath('/libs/mathjax/MathJax.js', {cdn:false, fingerprint:false, qs:{config:'TeX-AMS_HTML'}})}", diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug index a0d8b61341..168947c16a 100644 --- a/services/web/app/views/project/editor/review-panel.pug +++ b/services/web/app/views/project/editor/review-panel.pug @@ -91,9 +91,7 @@ ) li.rp-tc-state-separator - li.rp-tc-state-item.rp-tc-state-item-guests( - ng-if="__enableTokenAccessUI" - ) + li.rp-tc-state-item.rp-tc-state-item-guests span.rp-tc-state-item-name( ng-class="{ 'rp-tc-state-item-name-disabled' : reviewPanel.trackChangesOnForEveryone}" tooltip=translate('tc_switch_guests_tip') diff --git a/services/web/app/views/project/editor/share.pug b/services/web/app/views/project/editor/share.pug index 101bc27ab6..98568df122 100644 --- a/services/web/app/views/project/editor/share.pug +++ b/services/web/app/views/project/editor/share.pug @@ -9,18 +9,8 @@ script(type='text/ng-template', id='shareProjectModalTemplate') .modal-body.modal-body-share .container-fluid - //- Private - .row.public-access-level(ng-show="project.publicAccesLevel == 'private' && __enableTokenAccessUI == false") - .col-xs-12.text-center - | #{translate("this_project_is_private")} - |    - a( - href - ng-click="openMakePublicModal()" - ) #{translate("make_public")} - //- Private (with token-access available) - .row.public-access-level(ng-show="project.publicAccesLevel == 'private' && __enableTokenAccessUI == true") + .row.public-access-level(ng-show="project.publicAccesLevel == 'private'") .col-xs-12.text-center | #{translate('link_sharing_is_off')}. |    @@ -206,31 +196,6 @@ script(type='text/ng-template', id='shareProjectModalTemplate') ng-click="done()" ) #{translate("close")} -script(type="text/ng-template", id="makePublicModalTemplate") - .modal-header - button.close( - type="button" - data-dismiss="modal" - ng-click="cancel()" - ) × - h3 #{translate("make_project_public")}? - .modal-body.modal-body-share - p #{translate("make_project_public_consequences")} - p - select.form-control( - ng-model="inputs.privileges" - name="privileges" - ) - option(value="readAndWrite") #{translate("allow_public_editing")} - option(value="readOnly") #{translate("allow_public_read_only")} - .modal-footer - button.btn.btn-default( - ng-click="cancel()" - ) #{translate("cancel")} - button.btn.btn-info( - ng-click="makePublic()" - ) #{translate("make_public")} - script(type="text/ng-template", id="makeTokenBasedModalTemplate") .modal-header button.close( diff --git a/services/web/public/coffee/ide.coffee b/services/web/public/coffee/ide.coffee index 23b290c9dd..fca6cba7b5 100644 --- a/services/web/public/coffee/ide.coffee +++ b/services/web/public/coffee/ide.coffee @@ -82,14 +82,6 @@ define [ linkSharing: if window.showLinkSharingOnboarding then 'unseen' else 'dismissed' } $scope.user = window.user - $scope.__enableTokenAccessUI = window.enableTokenAccessUI == true - # TODO: remove after rollout and testing - window.turnOnTokenAccessUI = () -> - $scope.__enableTokenAccessUI = true - $scope.$digest - window.turnOffTokenAccessUI = () -> - $scope.__enableTokenAccessUI = false - $scope.$digest $scope.shouldABTestPlans = false if $scope.user.signUpDate >= '2016-10-27' diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee index 4c8d4b5171..789f6272ca 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee @@ -178,13 +178,6 @@ define [ $scope.state.error = "Sorry, something went wrong resending the invite :(" event.target.blur() - $scope.openMakePublicModal = () -> - $modal.open { - templateUrl: "makePublicModalTemplate" - controller: "MakePublicModalController" - scope: $scope - } - $scope.openMakePrivateModal = () -> $modal.open { templateUrl: "makePrivateModalTemplate"