From edeaa4baa09f30d0089017f195931c3ea6bdb0e7 Mon Sep 17 00:00:00 2001 From: Miguel Serrano Date: Wed, 16 Nov 2022 12:34:46 +0100 Subject: [PATCH] Merge pull request #10435 from overleaf/msm-remove-survey-banner Remove banner to recruit new joiners for survey GitOrigin-RevId: c427c57b80d6e38285ddbafc67554b62516ea8b8 --- .../src/Features/Project/ProjectController.js | 34 ++----------------- services/web/app/views/project/list.pug | 22 ------------ .../js/main/project-list/project-list.js | 7 ---- services/web/locales/en.json | 5 +-- services/web/locales/sv.json | 4 +-- 5 files changed, 4 insertions(+), 68 deletions(-) diff --git a/services/web/app/src/Features/Project/ProjectController.js b/services/web/app/src/Features/Project/ProjectController.js index 65a32bb60c..458d8a4ae0 100644 --- a/services/web/app/src/Features/Project/ProjectController.js +++ b/services/web/app/src/Features/Project/ProjectController.js @@ -509,24 +509,6 @@ const ProjectController = { } ) }, - newJoinerSurveyBannerActive(cb) { - SplitTestHandler.getAssignment( - req, - res, - 'new-joiner-survey-banner', - (err, assignment) => { - if (err) { - logger.warn( - { err }, - 'failed to get "new-joiner-survey-banner" split test assignment' - ) - cb(null, false) - } else { - cb(null, assignment.variant === 'active') - } - } - ) - }, survey(cb) { SurveyHandler.getSurvey(userId, (err, survey) => { if (err) { @@ -544,13 +526,8 @@ const ProjectController = { OError.tag(err, 'error getting data for project list page') return next(err) } - const { - notifications, - user, - userEmailsData, - primaryEmailCheckActive, - newJoinerSurveyBannerActive, - } = results + const { notifications, user, userEmailsData, primaryEmailCheckActive } = + results if ( user && @@ -679,12 +656,6 @@ const ProjectController = { ) } - const isNewJoiner = - user.signUpDate && - Date.now() - user.signUpDate.getTime() < 1000 * 60 * 60 * 24 - const shouldDisplayNewJoinerBanner = - newJoinerSurveyBannerActive && isNewJoiner - ProjectController._injectProjectUsers(projects, (error, projects) => { if (error != null) { return next(error) @@ -709,7 +680,6 @@ const ProjectController = { showThinFooter: true, // don't show the fat footer on the projects dashboard, as there's a fixed space available usersBestSubscription: results.usersBestSubscription, survey: results.survey, - shouldDisplayNewJoinerBanner, } const paidUser = diff --git a/services/web/app/views/project/list.pug b/services/web/app/views/project/list.pug index bc8cd38d1a..e7758a0776 100644 --- a/services/web/app/views/project/list.pug +++ b/services/web/app/views/project/list.pug @@ -65,28 +65,6 @@ block content ) × .project-list-main.col-md-10.col-xs-9 - - if shouldDisplayNewJoinerBanner - .alert.alert-info( - ng-if="shouldShowNewJoinerSurvey" - ) - .notification-body - strong #{translate("new_joiner_survey_text_1")} - |   - span #{translate("new_joiner_survey_text_2")} - span.pull-right - a.btn.btn-sm.btn-info( - href="https://docs.google.com/forms/d/e/1FAIpQLSduwnJnerjeqeRIwvyn209mRUfoL96-USTOx7B0INBsqhR48A/viewform?usp=sf_link" - target="_blank" - rel="noopener noreferrer" - ng-click="dismissNewJoinerSurvey()" - ) - strong #{translate("take_survey")} - |   - button(ng-click="dismissNewJoinerSurvey()").close - span(aria-hidden="true") × - span.sr-only #{translate("close")} - include ./list/notifications include ./list/project-list diff --git a/services/web/frontend/js/main/project-list/project-list.js b/services/web/frontend/js/main/project-list/project-list.js index 03253a8eef..a152652800 100644 --- a/services/web/frontend/js/main/project-list/project-list.js +++ b/services/web/frontend/js/main/project-list/project-list.js @@ -38,13 +38,6 @@ App.controller( $scope.shouldShowSurveyLink = false } - $scope.shouldShowNewJoinerSurvey = - localStorage('dismissed-new-joiner-survey') !== true - $scope.dismissNewJoinerSurvey = () => { - localStorage('dismissed-new-joiner-survey', true) - $scope.shouldShowNewJoinerSurvey = false - } - $timeout(() => recalculateProjectListHeight(), 10) $scope.$watch( diff --git a/services/web/locales/en.json b/services/web/locales/en.json index 10d06b588b..791dbc7950 100644 --- a/services/web/locales/en.json +++ b/services/web/locales/en.json @@ -1914,8 +1914,5 @@ "show_x_more_projects": "Show __x__ more projects", "showing_x_out_of_n_projects": "Showing __x__ out of __n__ projects.", "make_a_copy": "Make a copy", - "projects_list": "Projects list", - "new_joiner_survey_text_1": "Are you new to Overleaf?", - "new_joiner_survey_text_2": "Tell us your first impressions for a chance to win 50 USD", - "take_survey": "Take Survey" + "projects_list": "Projects list" } diff --git a/services/web/locales/sv.json b/services/web/locales/sv.json index fdcb14257a..d1afc43517 100644 --- a/services/web/locales/sv.json +++ b/services/web/locales/sv.json @@ -1456,7 +1456,5 @@ "tag_name_cannot_exceed_characters": "Taggnamnet får inte överstiga __maxLength__ tecken.", "save_changes": "Spara ändringar", "make_a_copy": "Gör en kopia", - "projects_list": "Förteckning över projekt", - "new_joiner_survey_text_1": "Är du ny på Overleaf?", - "new_joiner_survey_text_2": "Berätta om dina första intryck och ha en chans att vinna 50 USD." + "projects_list": "Förteckning över projekt" }