Skip to content

Commit

Permalink
[8.x] [Observability Onboarding] Show search bar even when category i…
Browse files Browse the repository at this point in the history
…s not selected (#197825) (#197974)

# Backport

This will backport the following commits from `main` to `8.x`:
- [[Observability Onboarding] Show search bar even when category is not
selected (#197825)](#197825)

<!--- Backport version: 9.4.3 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Mykola
Harmash","email":"[email protected]"},"sourceCommit":{"committedDate":"2024-10-28T11:21:07Z","message":"[Observability
Onboarding] Show search bar even when category is not selected
(#197825)\n\nCloses
elastic/observability-dev#4065 🔒\r\n\r\nFixes
an issue when search bar is not visible unless a category
is\r\nselected.\r\n\r\n![CleanShot 2024-10-25 at 14
53\r\n44@2x](https://github.com/user-attachments/assets/774d2fe2-e4f0-4a46-a851-a0f756a96b12)","sha":"97f227ef714b3ffe83cbd6a9db5db9d11e6d23fd","branchLabelMapping":{"^v9.0.0$":"main","^v8.17.0$":"8.x","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","v9.0.0","backport:prev-major","ci:project-deploy-observability","Team:obs-ux-logs","v8.16.0"],"title":"[Observability
Onboarding] Show search bar even when category is not
selected","number":197825,"url":"https://github.com/elastic/kibana/pull/197825","mergeCommit":{"message":"[Observability
Onboarding] Show search bar even when category is not selected
(#197825)\n\nCloses
elastic/observability-dev#4065 🔒\r\n\r\nFixes
an issue when search bar is not visible unless a category
is\r\nselected.\r\n\r\n![CleanShot 2024-10-25 at 14
53\r\n44@2x](https://github.com/user-attachments/assets/774d2fe2-e4f0-4a46-a851-a0f756a96b12)","sha":"97f227ef714b3ffe83cbd6a9db5db9d11e6d23fd"}},"sourceBranch":"main","suggestedTargetBranches":["8.16"],"targetPullRequestStates":[{"branch":"main","label":"v9.0.0","branchLabelMappingKey":"^v9.0.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/197825","number":197825,"mergeCommit":{"message":"[Observability
Onboarding] Show search bar even when category is not selected
(#197825)\n\nCloses
elastic/observability-dev#4065 🔒\r\n\r\nFixes
an issue when search bar is not visible unless a category
is\r\nselected.\r\n\r\n![CleanShot 2024-10-25 at 14
53\r\n44@2x](https://github.com/user-attachments/assets/774d2fe2-e4f0-4a46-a851-a0f756a96b12)","sha":"97f227ef714b3ffe83cbd6a9db5db9d11e6d23fd"}},{"branch":"8.16","label":"v8.16.0","branchLabelMappingKey":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"}]}]
BACKPORT-->

Co-authored-by: Mykola Harmash <[email protected]>
  • Loading branch information
kibanamachine and mykolaharmash authored Oct 28, 2024
1 parent 17c7e33 commit d6369fc
Showing 1 changed file with 28 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -316,33 +316,34 @@ export const OnboardingFlowForm: FunctionComponent = () => {
flowCategory={searchParams.get('category')}
/>
</div>
<div ref={searchResultsRef}>
<EuiSpacer size="m" />
<EuiText size="s" color="subdued">
<strong>
<FormattedMessage
id="xpack.observability_onboarding.experimentalOnboardingFlow.form.searchPromptText"
defaultMessage="Search through other ways of ingesting data:"
/>
</strong>
</EuiText>
<EuiSpacer size="m" />
<OnboardingFlowPackageList
showSearchBar={true}
searchQuery={integrationSearch}
flowSearch={integrationSearch}
setSearchQuery={setIntegrationSearch}
flowCategory={searchParams.get('category')}
customCards={customCards
?.filter(
// Filter out collection cards and regular integrations that show up via search anyway
(card) => card.type === 'virtual' && !card.isCollectionCard
)
.concat(virtualSearchResults)}
excludePackageIdList={searchExcludePackageIdList}
joinCardLists
/>
</div>
</div>

<div ref={searchResultsRef}>
<EuiSpacer size="xxl" />
<EuiText size="s" color="subdued">
<strong>
<FormattedMessage
id="xpack.observability_onboarding.experimentalOnboardingFlow.form.searchPromptText"
defaultMessage="Search through other ways of ingesting data:"
/>
</strong>
</EuiText>
<EuiSpacer size="m" />
<OnboardingFlowPackageList
showSearchBar={true}
searchQuery={integrationSearch}
flowSearch={integrationSearch}
setSearchQuery={setIntegrationSearch}
flowCategory={searchParams.get('category')}
customCards={customCards
?.filter(
// Filter out collection cards and regular integrations that show up via search anyway
(card) => card.type === 'virtual' && !card.isCollectionCard
)
.concat(virtualSearchResults)}
excludePackageIdList={searchExcludePackageIdList}
joinCardLists
/>
</div>
</EuiPanel>
);
Expand Down

0 comments on commit d6369fc

Please sign in to comment.