Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

2 files changed, 18 insertions, 9 deletions

diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
index 28039321428..a93035cc53a 100644
--- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
+++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap
@@ -17,6 +17,7 @@ exports[`Dashboard template matches the default snapshot 1`] = `
       primarybuttontext=""
       secondarybuttonlink=""
       secondarybuttontext=""
+      showicon="true"
       title="Feature deprecation"
       variant="warning"
     >
diff --git a/spec/frontend/monitoring/components/dashboard_panel_spec.js b/spec/frontend/monitoring/components/dashboard_panel_spec.js
index 7bd062b81f1..1f9eb03b5d4 100644
--- a/spec/frontend/monitoring/components/dashboard_panel_spec.js
+++ b/spec/frontend/monitoring/components/dashboard_panel_spec.js
@@ -65,6 +65,7 @@ describe('Dashboard Panel', () => {
       },
       store,
       mocks,
+      provide: { glFeatures: { monitorLogging: true } },
       ...options,
     });
   };
@@ -379,6 +380,21 @@ describe('Dashboard Panel', () => {
       expect(findViewLogsLink().attributes('href')).toMatch(mockLogsHref);
     });
 
+    describe(':monitor_logging feature flag', () => {
+      it.each`
+        flagState | logsState  | expected
+        ${true}   | ${'shows'} | ${true}
+        ${false}  | ${'hides'} | ${false}
+      `('$logsState logs when flag state is $flagState', async ({ flagState, expected }) => {
+        createWrapper({}, { provide: { glFeatures: { monitorLogging: flagState } } });
+        state.logsPath = mockLogsPath;
+        state.timeRange = mockTimeRange;
+        await nextTick();
+
+        expect(findViewLogsLink().exists()).toBe(expected);
+      });
+    });
+
     it('it is overridden when a datazoom event is received', async () => {
       state.logsPath = mockLogsPath;
       state.timeRange = mockTimeRange;
@@ -488,15 +504,7 @@ describe('Dashboard Panel', () => {
       store.registerModule(mockNamespace, monitoringDashboard);
       store.state.embedGroup.modules.push(mockNamespace);
 
-      wrapper = shallowMount(DashboardPanel, {
-        propsData: {
-          graphData,
-          settingsPath: dashboardProps.settingsPath,
-          namespace: mockNamespace,
-        },
-        store,
-        mocks,
-      });
+      createWrapper({ namespace: mockNamespace });
     });
 
     it('handles namespaced time range and logs path state', async () => {