diff --git a/app/assets/javascripts/ci/job_details/components/job_log_top_bar.vue b/app/assets/javascripts/ci/job_details/components/job_log_top_bar.vue index 97ceb5ab71ae96f368d78cc60b9e6f88cfe928af..dac4afc090aeb59a672d336b41b12b6b82260b6d 100644 --- a/app/assets/javascripts/ci/job_details/components/job_log_top_bar.vue +++ b/app/assets/javascripts/ci/job_details/components/job_log_top_bar.vue @@ -4,7 +4,6 @@ import { scrollToElement, backOff } from '~/lib/utils/common_utils'; import { numberToHumanSize } from '~/lib/utils/number_utils'; import { s__, sprintf } from '~/locale'; import { compactJobLog } from '~/ci/job_details/utils'; -import HelpPopover from '~/vue_shared/components/help_popover.vue'; import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; export default { @@ -13,12 +12,8 @@ export default { scrollToTopButtonLabel: s__('Job|Scroll to top'), scrollToNextFailureButtonLabel: s__('Job|Scroll to next failure'), showRawButtonLabel: s__('Job|Show complete raw'), - searchPlaceholder: s__('Job|Search job log'), + searchPlaceholder: s__('Job|Search visible log output'), noResults: s__('Job|No search results found'), - searchPopoverTitle: s__('Job|Job log search'), - searchPopoverDescription: s__( - 'Job|Search for substrings in your job log output. Currently search is only supported for the visible job log output, not for any log output that is truncated due to size.', - ), logLineNumberNotFound: s__('Job|We could not find this element'), enterFullscreen: s__('Job|Show full screen'), exitFullScreen: s__('Job|Exit full screen'), @@ -29,7 +24,6 @@ export default { GlButton, GlSearchBoxByClick, GlSprintf, - HelpPopover, }, directives: { GlTooltip: GlTooltipDirective, @@ -200,7 +194,7 @@ export default { v-if="rawPath && isComplete && logViewerPath" :message=" s__( - 'Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}view full log%{fullLinkEnd}.', + 'Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}full log%{fullLinkEnd}.', ) " > @@ -221,21 +215,12 @@ export default { <gl-search-box-by-click v-model="searchTerm" - class="gl-mr-3 gl-flex-nowrap" + class="gl-mr-3 gl-w-30 gl-flex-nowrap" :placeholder="$options.i18n.searchPlaceholder" data-testid="job-log-search-box" @clear="$emit('searchResults', [])" @submit="searchJobLog" /> - - <help-popover class="gl-mr-3"> - <template #title>{{ $options.i18n.searchPopoverTitle }}</template> - - <p class="gl-mb-0"> - {{ $options.i18n.searchPopoverDescription }} - </p> - </help-popover> - <!-- links --> <gl-button v-if="rawPath" diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 83ca6ecf30676750676418eb2554fdbfece6e180..d514c825f8ea2f476e571744a76e075a07e0320f 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -30705,7 +30705,7 @@ msgstr "" msgid "Job|%{boldStart}Pipeline%{boldEnd} %{id} for %{mrId} with %{source} into %{target}" msgstr "" -msgid "Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}view full log%{fullLinkEnd}." +msgid "Job|%{rawLinkStart}View raw%{rawLinkEnd} or %{fullLinkStart}full log%{fullLinkEnd}." msgstr "" msgid "Job|%{searchLength} results found for %{searchTerm}" @@ -30768,9 +30768,6 @@ msgstr "" msgid "Job|Job has been erased by %{userLink}" msgstr "" -msgid "Job|Job log search" -msgstr "" - msgid "Job|Keep" msgstr "" @@ -30819,10 +30816,7 @@ msgstr "" msgid "Job|Scroll to top" msgstr "" -msgid "Job|Search for substrings in your job log output. Currently search is only supported for the visible job log output, not for any log output that is truncated due to size." -msgstr "" - -msgid "Job|Search job log" +msgid "Job|Search visible log output" msgstr "" msgid "Job|Show complete raw" diff --git a/spec/frontend/ci/job_details/components/job_log_top_bar_spec.js b/spec/frontend/ci/job_details/components/job_log_top_bar_spec.js index 40e68e0103d28f815ef55777d2954321e40d7462..ef5a7fcda54c78fd5e8eec3c810ebb7de8eb66bc 100644 --- a/spec/frontend/ci/job_details/components/job_log_top_bar_spec.js +++ b/spec/frontend/ci/job_details/components/job_log_top_bar_spec.js @@ -1,7 +1,6 @@ import { GlLink, GlSearchBoxByClick } from '@gitlab/ui'; import { mount } from '@vue/test-utils'; import JobLogTopBar from '~/ci/job_details/components/job_log_top_bar.vue'; -import HelpPopover from '~/vue_shared/components/help_popover.vue'; import { backoffMockImplementation } from 'helpers/backoff_helper'; import * as commonUtils from '~/lib/utils/common_utils'; import { mockJobLog } from 'jest/ci/jobs_mock_data'; @@ -56,7 +55,6 @@ describe('JobLogTopBar', () => { const findScrollTop = () => wrapper.find('[data-testid="job-top-bar-scroll-top"]'); const findScrollBottom = () => wrapper.find('[data-testid="job-top-bar-scroll-bottom"]'); const findJobLogSearch = () => wrapper.findComponent(GlSearchBoxByClick); - const findSearchHelp = () => wrapper.findComponent(HelpPopover); const findScrollFailure = () => wrapper.find('[data-testid="job-top-bar-scroll-to-failure"]'); const findShowFullScreenButton = () => wrapper.find('[data-testid="job-top-bar-enter-fullscreen"]'); @@ -310,7 +308,6 @@ describe('JobLogTopBar', () => { it('displays job log search', () => { expect(findJobLogSearch().exists()).toBe(true); - expect(findSearchHelp().exists()).toBe(true); }); it('emits search results', () => {