Merge branch '201733-logs-search-is-broken' into 'master'

Allow submit to event to trigger a new search

Closes #201733

See merge request gitlab-org/gitlab!24262

ee/app/assets/javascripts/logs/components/environment_logs.vue

@@ -204,7 +204,7 @@ export default {
             class="js-logs-search"
             type="search"
             autofocus
-            @submit="disableAdvancedControls && setSearch(searchQuery)"
+            @submit="!disableAdvancedControls && setSearch(searchQuery)"
           />
         </gl-form-group>
       </div>

ee/changelogs/unreleased/201733-logs-search-is-broken.yml

+---
+title: Allow submit to event to trigger a new search
+merge_request: 24262
+author:
+type: fixed

ee/spec/frontend/logs/components/environment_logs_spec.js

@@ -13,6 +13,7 @@ import {
   mockLogsResult,
   mockTrace,
   mockPodName,
+  mockSearch,
   mockEnvironmentsEndpoint,
   mockDocumentationPath,
 } from '../mock_data';
@@ -33,6 +34,7 @@ describe('EnvironmentLogs', () => {
 
   const actionMocks = {
     setInitData: jest.fn(),
+    setSearch: jest.fn(),
     showPodLogs: jest.fn(),
     showEnvironment: jest.fn(),
     fetchEnvironments: jest.fn(),
@@ -205,10 +207,19 @@ describe('EnvironmentLogs', () => {
       initWrapper();
     });
 
-    it('displays a disabled search bar and time window dropdown', () => {
+    it('displays a disabled time window dropdown', () => {
+      expect(findTimeRangePicker().attributes('disabled')).toBe('true');
+    });
+
+    it('displays a disabled search bar', () => {
       expect(findSearchBar().exists()).toBe(true);
       expect(findSearchBar().attributes('disabled')).toBe('true');
-      expect(findTimeRangePicker().attributes('disabled')).toBe('true');
+
+      // input a query and click `search`
+      findSearchBar().vm.$emit('input', mockSearch);
+      findSearchBar().vm.$emit('submit');
+
+      expect(actionMocks.setSearch).not.toHaveBeenCalled();
     });
   });
 
@@ -232,6 +243,13 @@ describe('EnvironmentLogs', () => {
 
     it('displays an enabled search bar', () => {
       expect(findSearchBar().attributes('disabled')).toBeFalsy();
+
+      // input a query and click `search`
+      findSearchBar().vm.$emit('input', mockSearch);
+      findSearchBar().vm.$emit('submit');
+
+      expect(actionMocks.setSearch).toHaveBeenCalledTimes(1);
+      expect(actionMocks.setSearch).toHaveBeenCalledWith(mockSearch);
     });
 
     it('displays an enabled time window dropdown', () => {