Merge branch '348849-remove-feedback-link-in-discover-security-point' into 'master'

Remove feedback link in discover security point

See merge request gitlab-org/gitlab!78313

app/assets/stylesheets/framework/variables.scss

@@ -881,7 +881,6 @@ $security-and-compliance-carousel-image-carousel-width: 1000px;
 $security-and-compliance-carousel-image-discover-button-width: 45%;
 $security-and-compliance-carousel-image-discover-buttons-max-width: 280px;
 $security-and-compliance-carousel-image-discover-footer-max-width: 500px;
-$security-and-compliance-carousel-image-discover-feedback-width: 30%;
 $security-and-compliance-carousel-image-discover-text-carousel-max-width: 650px;
 $security-and-compliance-carousel-image-discover-text-carousel-caption-height: 100%;
 $security-and-compliance-carousel-image-discover-text-carousel-caption-max-width: 500px;

ee/app/assets/javascripts/vue_shared/discover/card_security_discover_app.vue

@@ -50,11 +50,6 @@ export default {
       required: false,
       default: '',
     },
-    linkFeedback: {
-      type: String,
-      required: false,
-      default: '',
-    },
   },
   data() {
     return {
@@ -90,7 +85,6 @@ export default {
     discoverTitle: s__(
       'Discover|Security capabilities, integrated into your development lifecycle',
     ),
-    discoverFeedbackLabel: s__('Discover|Send feedback'),
     discoverUpgradeLabel: s__('Discover|Upgrade now'),
     discoverTrialLabel: s__('Discover|Start a free trial'),
     carouselCaptions: [
@@ -189,20 +183,5 @@ export default {
         {{ $options.i18n.discoverTrialLabel }}
       </gl-button>
     </div>
-    <div id="tooltipcontainer" class="discover-feedback gl-fixed">
-      <gl-button
-        class="discover-button-feedback"
-        category="secondary"
-        variant="default"
-        target="_blank"
-        rel="noopener noreferrer"
-        data-track-action="click_button"
-        data-track-label="security-discover-feedback-cta"
-        :data-track-property="slide"
-        :href="linkFeedback"
-      >
-        {{ $options.i18n.discoverFeedbackLabel }}
-      </gl-button>
-    </div>
   </div>
 </template>

ee/app/assets/javascripts/vue_shared/discover/card_security_discover_bundle.js

@@ -11,7 +11,6 @@ export default () => {
     projectName,
     linkMain,
     linkSecondary,
-    linkFeedback,
     namespaceId,
     userName,
     firstName,
@@ -30,7 +29,6 @@ export default () => {
     },
     linkMain,
     linkSecondary,
-    linkFeedback,
   };
 
   return new Vue({

ee/app/assets/stylesheets/page_bundles/security_discover.scss

@@ -42,13 +42,6 @@
     max-width: $security-and-compliance-carousel-image-discover-footer-max-width;
   }
 
-  .discover-feedback {
-    width: $security-and-compliance-carousel-image-discover-feedback-width;
-    bottom: $gl-spacing-scale-5;
-    right: $gl-spacing-scale-5;
-    text-align: right;
-  }
-
   .discover-text-carousel {
     max-width: $security-and-compliance-carousel-image-discover-text-carousel-max-width;
 

ee/app/helpers/groups/security_features_helper.rb

@@ -46,8 +46,7 @@ module Groups::SecurityFeaturesHelper
       },
       link: {
         main: new_trial_registration_path(glm_source: 'gitlab.com', glm_content: content),
-        secondary: group_billings_path(group.root_ancestor, source: content),
-        feedback: 'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
+        secondary: group_billings_path(group.root_ancestor, source: content)
       }
     }
 

ee/app/helpers/projects/security/discover_helper.rb

@@ -19,8 +19,7 @@ module Projects::Security::DiscoverHelper
       },
       link: {
         main: new_trial_registration_path(glm_source: 'gitlab.com', glm_content: content),
-        secondary: link_upgrade,
-        feedback: 'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
+        secondary: link_upgrade
       }
     }
 

ee/spec/frontend/vue_shared/discover/card_security_discover_app_spec.js

@@ -22,7 +22,6 @@ describe('Card security discover app', () => {
       },
       linkMain: '/link/main',
       linkSecondary: '/link/secondary',
-      linkFeedback: 'link/feedback',
     };
     wrapper = mountFn(CardSecurityDiscoverApp, {
       localVue,
@@ -59,10 +58,6 @@ describe('Card security discover app', () => {
       );
     });
 
-    it('renders discover feedback link properly', () => {
-      expect(wrapper.find('.discover-button-feedback').html()).toContain('Send feedback');
-    });
-
     it('renders discover upgrade links properly', () => {
       expect(wrapper.find('.discover-button-upgrade').html()).toContain('Upgrade now');
     });
@@ -107,15 +102,6 @@ describe('Card security discover app', () => {
           property: 'sliding0-1',
         });
       });
-
-      it('tracks an event when clicked on feedback', () => {
-        wrapper.find('.discover-button-feedback').trigger('click');
-
-        expect(spy).toHaveBeenCalledWith('_category_', 'click_button', {
-          label: 'security-discover-feedback-cta',
-          property: '0',
-        });
-      });
     });
   });
   describe('Experiment pql_three_cta_test', () => {

ee/spec/helpers/groups/security_features_helper_spec.rb

@@ -102,8 +102,7 @@ RSpec.describe Groups::SecurityFeaturesHelper do
         },
         link: {
           main: new_trial_registration_path(glm_source: 'gitlab.com', glm_content: content),
-          secondary: group_billings_path(group.root_ancestor, source: content),
-          feedback: 'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
+          secondary: group_billings_path(group.root_ancestor, source: content)
         }
       }.merge(helper.hand_raise_props(group.root_ancestor))
     end

ee/spec/helpers/projects/security/discover_helper_spec.rb

@@ -17,8 +17,7 @@ RSpec.describe Projects::Security::DiscoverHelper do
         },
         link: {
           main: new_trial_registration_path(glm_source: 'gitlab.com', glm_content: content),
-          secondary: profile_billings_path(project.group, source: content),
-          feedback: 'https://gitlab.com/gitlab-org/growth/ui-ux/issues/25'
+          secondary: profile_billings_path(project.group, source: content)
         }
       }.merge(helper.hand_raise_props(project.root_ancestor))
     end

locale/gitlab.pot

@@ -12536,9 +12536,6 @@ msgstr ""
 msgid "Discover|See the other features of the %{linkStart}ultimate plan%{linkEnd}"
 msgstr ""
 
-msgid "Discover|Send feedback"
-msgstr ""
-
 msgid "Discover|Start a free trial"
 msgstr ""