Merge branch 'fix-annotations-feature-flag-check' into 'master'

Fix annotations actions and feature flag

See merge request gitlab-org/gitlab!29546

app/assets/javascripts/monitoring/stores/actions.js

@@ -90,7 +90,7 @@ export const fetchData = ({ dispatch }) => {
    * ready after the BE piece is implemented.
    * https://gitlab.com/gitlab-org/gitlab/-/issues/211330
    */
-  if (isFeatureFlagEnabled('metrics_dashboard_annotations')) {
+  if (isFeatureFlagEnabled('metricsDashboardAnnotations')) {
     dispatch('fetchAnnotations');
   }
 };
@@ -283,8 +283,6 @@ export const receiveEnvironmentsDataFailure = ({ commit }) => {
 };
 
 export const fetchAnnotations = ({ state, dispatch }) => {
-  dispatch('requestAnnotations');
-
   return gqClient
     .mutate({
       mutation: getAnnotations,
@@ -309,9 +307,6 @@ export const fetchAnnotations = ({ state, dispatch }) => {
     });
 };
 
-// While this commit does not update the state it will
-// eventually be useful to show a loading state
-export const requestAnnotations = ({ commit }) => commit(types.REQUEST_ANNOTATIONS);
 export const receiveAnnotationsSuccess = ({ commit }, data) =>
   commit(types.RECEIVE_ANNOTATIONS_SUCCESS, data);
 export const receiveAnnotationsFailure = ({ commit }) => commit(types.RECEIVE_ANNOTATIONS_FAILURE);

app/assets/javascripts/monitoring/stores/mutation_types.js

@@ -4,7 +4,6 @@ export const RECEIVE_METRICS_DASHBOARD_SUCCESS = 'RECEIVE_METRICS_DASHBOARD_SUCC
 export const RECEIVE_METRICS_DASHBOARD_FAILURE = 'RECEIVE_METRICS_DASHBOARD_FAILURE';
 
 // Annotations
-export const REQUEST_ANNOTATIONS = 'REQUEST_ANNOTATIONS';
 export const RECEIVE_ANNOTATIONS_SUCCESS = 'RECEIVE_ANNOTATIONS_SUCCESS';
 export const RECEIVE_ANNOTATIONS_FAILURE = 'RECEIVE_ANNOTATIONS_FAILURE';
 

spec/frontend/monitoring/store/actions_spec.js

@@ -260,10 +260,7 @@ describe('Monitoring store actions', () => {
         null,
         state,
         [],
-        [
-          { type: 'requestAnnotations' },
-          { type: 'receiveAnnotationsSuccess', payload: annotationsData },
-        ],
+        [{ type: 'receiveAnnotationsSuccess', payload: annotationsData }],
         () => {
           expect(mockMutate).toHaveBeenCalledWith(mutationVariables);
         },
@@ -288,7 +285,7 @@ describe('Monitoring store actions', () => {
         null,
         state,
         [],
-        [{ type: 'requestAnnotations' }, { type: 'receiveAnnotationsFailure' }],
+        [{ type: 'receiveAnnotationsFailure' }],
         () => {
           expect(mockMutate).toHaveBeenCalledWith(mutationVariables);
         },