Skip to content

Commit 0b0cb96

Browse files
lcawllcawl
authored
Merge branch 'main' into changelog-products
2 parents 0f51cee + aea56e9 commit 0b0cb96

File tree

14 files changed

+294
-296
lines changed

14 files changed

+294
-296
lines changed

‎.github/updatecli/updatecli.d/versions.yml‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,8 @@ sources:
333333
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
334334
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
335335
versionfilter:
336-
kind: latest
336+
kind: semver
337+
pattern: "^9.0.0"
337338

338339
latest-elasticsearch-client-go-version:
339340
name: Get latest release version for Elasticsearch Go Client
@@ -346,7 +347,8 @@ sources:
346347
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
347348
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
348349
versionfilter:
349-
kind: latest
350+
kind: semver
351+
pattern: "^9.0.0"
350352

351353
latest-elasticsearch-client-java-version:
352354
name: Get latest release version for Elasticsearch Java Client
@@ -359,7 +361,8 @@ sources:
359361
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
360362
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
361363
versionfilter:
362-
kind: latest
364+
kind: semver
365+
pattern: "^9.0.0"
363366

364367
latest-elasticsearch-client-javascript-version:
365368
name: Get latest release version for Elasticsearch JavaScript Client
@@ -372,7 +375,8 @@ sources:
372375
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
373376
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
374377
versionfilter:
375-
kind: latest
378+
kind: semver
379+
pattern: "^9.0.0"
376380

377381
latest-elasticsearch-client-php-version:
378382
name: Get latest release version for Elasticsearch PHP Client
@@ -385,7 +389,8 @@ sources:
385389
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
386390
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
387391
versionfilter:
388-
kind: latest
392+
kind: semver
393+
pattern: "^9.0.0"
389394

390395
latest-elasticsearch-client-python-version:
391396
name: Get latest release version for Elasticsearch Python Client
@@ -398,7 +403,8 @@ sources:
398403
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
399404
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
400405
versionfilter:
401-
kind: latest
406+
kind: semver
407+
pattern: "^9.0.0"
402408

403409
latest-elasticsearch-client-ruby-version:
404410
name: Get latest release version for Elasticsearch Ruby Client
@@ -411,7 +417,8 @@ sources:
411417
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
412418
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
413419
versionfilter:
414-
kind: latest
420+
kind: semver
421+
pattern: "^9.0.0"
415422

416423
latest-elasticsearch-client-rust-version:
417424
name: Get latest release version for Elasticsearch Rust Client
@@ -424,7 +431,8 @@ sources:
424431
token: '{{ requiredEnv "GITHUB_TOKEN" }}'
425432
username: '{{ requiredEnv "GITHUB_ACTOR" }}'
426433
versionfilter:
427-
kind: latest
434+
kind: semver
435+
pattern: ">=9.0.0-0 <10.0.0"
428436

429437
targets:
430438
update-docs-docset-stack:

‎Directory.Packages.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<PackageVersion Include="AngleSharp" Version="1.4.0" />
2323
<PackageVersion Include="Aspire.Hosting" Version="13.0.0" />
2424
<PackageVersion Include="Aspire.Hosting.Testing" Version="13.0.0" />
25-
<PackageVersion Include="AWSSDK.Core" Version="4.0.3.3" />
25+
<PackageVersion Include="AWSSDK.Core" Version="4.0.3.4" />
2626
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="4.0.5" />
27-
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.5" />
27+
<PackageVersion Include="AWSSDK.SQS" Version="4.0.2.6" />
2828
<PackageVersion Include="AWSSDK.S3" Version="4.0.7.14" />
2929
<PackageVersion Include="Elastic.OpenTelemetry" Version="1.1.0" />
3030
<PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0" />
@@ -34,9 +34,9 @@
3434
<PackageVersion Include="Generator.Equals" Version="3.2.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
3535
<PackageVersion Include="KubernetesClient" Version="18.0.5" />
3636
<PackageVersion Include="Elastic.Aspire.Hosting.Elasticsearch" Version="9.3.0" />
37-
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.2.1" />
37+
<PackageVersion Include="Elastic.Clients.Elasticsearch" Version="9.2.2" />
3838
<PackageVersion Include="FakeItEasy" Version="8.3.0" />
39-
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.16.3" />
39+
<PackageVersion Include="Elastic.Ingest.Elasticsearch" Version="0.17.1" />
4040
<PackageVersion Include="InMemoryLogger" Version="1.0.66" />
4141
<PackageVersion Include="MartinCostello.Logging.XUnit.v3" Version="0.6.0" />
4242
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
@@ -55,7 +55,7 @@
5555
<PackageVersion Include="FSharp.Core" Version="10.0.100" />
5656
</ItemGroup>
5757
<ItemGroup>
58-
<PackageVersion Include="ConsoleAppFramework" Version="5.7.11" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
58+
<PackageVersion Include="ConsoleAppFramework" Version="5.7.13" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
5959
<PackageVersion Include="ConsoleAppFramework.Abstractions" Version="5.7.2" />
6060
<PackageVersion Include="Crayon" Version="2.0.69" />
6161
<PackageVersion Include="DotNet.Glob" Version="3.1.3" />
@@ -91,7 +91,7 @@
9191
<!-- Test packages -->
9292
<ItemGroup>
9393
<PackageVersion Include="Aspire.Hosting.AppHost" Version="13.0.0" />
94-
<PackageVersion Include="AngleSharp.Diffing" Version="1.1.0" />
94+
<PackageVersion Include="AngleSharp.Diffing" Version="1.1.1" />
9595
<PackageVersion Include="DiffPlex" Version="1.9.0" />
9696
<PackageVersion Include="FluentAssertions" Version="7.2.0" />
9797
<PackageVersion Include="FsUnit.xUnit" Version="7.0.1" />

‎src/Elastic.Documentation.Site/Assets/eui-icons-cache.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ import { icon as EuiIconCopy } from '@elastic/eui/es/components/icon/assets/copy
1515
import { icon as EuiIconCopyClipboard } from '@elastic/eui/es/components/icon/assets/copy_clipboard'
1616
import { icon as EuiIconCross } from '@elastic/eui/es/components/icon/assets/cross'
1717
import { icon as EuiIconDocument } from '@elastic/eui/es/components/icon/assets/document'
18+
import { icon as EuiIconDocumentation } from '@elastic/eui/es/components/icon/assets/documentation'
1819
import { icon as EuiIconDot } from '@elastic/eui/es/components/icon/assets/dot'
1920
import { icon as EuiIconEmpty } from '@elastic/eui/es/components/icon/assets/empty'
2021
import { icon as EuiIconError } from '@elastic/eui/es/components/icon/assets/error'
@@ -48,6 +49,7 @@ const iconMapping = {
4849
arrowRight: EuiIconArrowRight,
4950
code: EuiIconCode,
5051
document: EuiIconDocument,
52+
documentation: EuiIconDocumentation,
5153
dot: EuiIconDot,
5254
empty: EuiIconEmpty,
5355
search: EuiIconSearch,

‎src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/AskAi/Chat.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ function useFocusOnComplete(inputRef: RefObject<HTMLTextAreaElement | null>) {
379379
// ============================================================================
380380

381381
const KEYBOARD_SHORTCUTS = [
382-
{ keys: ['⌘K'], label: 'to search' },
383-
{ keys: ['Esc'], label: 'to close' },
382+
{ keys: ['⌘K'], label: 'Search' },
383+
{ keys: ['Esc'], label: 'Close' },
384384
]
385385

386386
const containerStyles = css`

‎src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/InfoBanner.tsx‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ export const InfoBanner = () => {
2323
>
2424
<EuiBetaBadge
2525
css={css`
26-
display: inline-flex;
26+
display: inherit;
2727
`}
2828
label="Alpha"
29+
size="s"
2930
color="accent"
3031
tooltipContent="This feature is in private preview and is only enabled if you are in Elastic's Global VPN."
3132
/>

‎src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/KeyboardShortcutsFooter.tsx‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ export const KeyboardShortcutsFooter = ({
2222
display: flex;
2323
align-items: center;
2424
justify-content: center;
25-
gap: ${euiTheme.size.m};
26-
background-color: ${euiTheme.colors.backgroundBaseSubdued};
25+
gap: ${euiTheme.size.l};
26+
border-top: 1px solid ${euiTheme.colors.borderBaseSubdued};
27+
background-color: ${euiTheme.colors.backgroundBasePlain};
2728
border-bottom-right-radius: ${euiTheme.size.s};
2829
border-bottom-left-radius: ${euiTheme.size.s};
2930
padding-inline: ${euiTheme.size.base};
@@ -49,7 +50,8 @@ const KeyboardKey = ({ children }: { children: React.ReactNode }) => {
4950
display: inline-flex;
5051
justify-content: center;
5152
align-items: center;
52-
background-color: ${euiTheme.colors.backgroundLightText};
53+
background-color: ${euiTheme.colors.backgroundBasePlain};
54+
border: 1px solid ${euiTheme.colors.borderBasePlain};
5355
min-width: ${euiTheme.size.l};
5456
height: ${euiTheme.size.l};
5557
border-radius: ${euiTheme.border.radius.small};
@@ -95,6 +97,7 @@ const KeyboardIconsWithLabel = ({
9597
display: flex;
9698
align-items: center;
9799
gap: ${euiTheme.size.xs};
100+
color: #1d2a3e;
98101
`}
99102
>
100103
<span
@@ -107,7 +110,7 @@ const KeyboardIconsWithLabel = ({
107110
<KeyboardIcon type={key} key={key + index} />
108111
))}
109112
</span>
110-
<EuiText size="s">{label}</EuiText>
113+
<EuiText size="xs">{label}</EuiText>
111114
</span>
112115
)
113116
}

‎src/Elastic.Documentation.Site/Assets/web-components/SearchOrAskAi/Search/Search.tsx‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,16 +117,22 @@ export const Search = () => {
117117
buttonRef={buttonRef}
118118
itemRefs={itemRefs}
119119
/>
120-
<EuiHorizontalRule margin="none" />
120+
{!showLoadingSpinner && <EuiHorizontalRule margin="none" />}
121121
{searchTerm && (
122122
<div
123123
css={css`
124124
padding-inline: ${euiTheme.size.base};
125125
`}
126126
>
127127
<EuiSpacer size="m" />
128-
<EuiText color="subdued" size="xs">
129-
Ask AI assistant
128+
<EuiText
129+
color="default"
130+
size="xs"
131+
css={css`
132+
font-weight: 500;
133+
`}
134+
>
135+
Ask AI Assistant
130136
</EuiText>
131137
<EuiSpacer size="s" />
132138
<TellMeMoreButton
@@ -145,9 +151,9 @@ export const Search = () => {
145151
}
146152

147153
const SEARCH_KEYBOARD_SHORTCUTS = [
148-
{ keys: ['returnKey'], label: 'to select' },
149-
{ keys: ['sortUp', 'sortDown'], label: 'to navigate' },
150-
{ keys: ['Esc'], label: 'to close' },
154+
{ keys: ['returnKey'], label: 'Select' },
155+
{ keys: ['sortUp', 'sortDown'], label: 'Navigate' },
156+
{ keys: ['Esc'], label: 'Close' },
151157
]
152158

153159
const SearchFooter = () => (

0 commit comments

Comments
 (0)