Skip to content

Commit ac021d7

Browse files
authored
Merge branch '2.x' into backport/backport-8222-to-2.x
Signed-off-by: Kawika Avilla <[email protected]>
2 parents 87e6276 + 7d8844e commit ac021d7

File tree

29 files changed

+167
-64
lines changed

29 files changed

+167
-64
lines changed

changelogs/fragments/8151.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fix:
2+
- Remove workspace detail title in navigation when new nav is disabled ([#8151](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8151))

changelogs/fragments/8227.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
feat:
2+
- Adjust semantics and sizing of page titles in application headers ([#8227](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8227))

changelogs/fragments/8320.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fix:
2+
- Update osd to respect new oui breakpoints ([#8320](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8320))

changelogs/fragments/8331.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
fix:
2+
- Discover query input background not shrink when window resize ([#8331](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8331))

changelogs/fragments/8334.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
refactor:
2+
- Move the render of query extension control buttons to extension component ([#8334](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/8334))

src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/core/public/chrome/ui/header/collapsible_nav.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ export function CollapsibleNav({
282282
))}
283283

284284
{/* Docking button only for larger screens that can support it*/}
285-
<EuiShowFor sizes={['l', 'xl']}>
285+
<EuiShowFor sizes={['l', 'xl', 'xxl', 'xxxl']}>
286286
<EuiCollapsibleNavGroup>
287287
<EuiListGroup flush>
288288
<EuiListGroupItem

src/core/public/chrome/ui/header/header.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,15 +197,15 @@ export function Header({
197197
},
198198
{
199199
items: [
200-
<EuiShowFor sizes={['m', 'l', 'xl']}>
200+
<EuiShowFor sizes={['m', 'l', 'xl', 'xxl', 'xxxl']}>
201201
<HeaderNavControls navControls$={observables.navControlsExpandedCenter$} />
202202
</EuiShowFor>,
203203
],
204204
borders: 'none',
205205
},
206206
{
207207
items: [
208-
<EuiHideFor sizes={['m', 'l', 'xl']}>
208+
<EuiHideFor sizes={['m', 'l', 'xl', 'xxl', 'xxxl']}>
209209
<HeaderNavControls navControls$={observables.navControlsExpandedCenter$} />
210210
</EuiHideFor>,
211211
<HeaderNavControls navControls$={observables.navControlsExpandedRight$} />,

src/plugins/data/public/plugin.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ export class DataPublicPlugin
150150
storage: this.storage,
151151
sessionStorage: this.sessionStorage,
152152
defaultSearchInterceptor: searchService.getDefaultSearchInterceptor(),
153+
applicaton: core.application,
153154
});
154155

155156
uiActions.registerAction(
@@ -224,6 +225,7 @@ export class DataPublicPlugin
224225
savedObjectsClient: savedObjects.client,
225226
uiSettings,
226227
indexPatterns,
228+
applicaton: core.application,
227229
});
228230
setQueryService(query);
229231

0 commit comments

Comments
 (0)