Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Navigation] Remove integrations from new NavGroups #1950

Merged
merged 3 commits into from
Jul 22, 2024
Merged

[Navigation] Remove integrations from new NavGroups #1950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8fd9f08
Remove integrations from new Nav
Jul 21, 2024
0fb7044
Integrations only in observability
Jul 22, 2024
223fb9b
Update snapshots
Jul 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ exports[`Panels View Component render panel view container and refresh panel 1`]
class="euiToolTipAnchor"
>
<button
class="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
class="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
type="button"
>
Expand Down Expand Up @@ -734,7 +734,7 @@ exports[`Panels View Component render panel view so container and reload dashboa
class="euiToolTipAnchor"
>
<button
class="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
class="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
type="button"
>
Expand Down Expand Up @@ -2334,7 +2334,6 @@ exports[`Panels View Component renders panel view container with visualizations
className="euiSuperUpdateButton"
color="primary"
data-test-subj="superDatePickerApplyTimeButton"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -2354,7 +2353,6 @@ exports[`Panels View Component renders panel view container with visualizations
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
element="button"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -2369,7 +2367,7 @@ exports[`Panels View Component renders panel view container with visualizations
type="button"
>
<button
className="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
className="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
onBlur={[Function]}
Expand Down Expand Up @@ -4581,7 +4579,6 @@ exports[`Panels View Component renders panel view container without visualizatio
className="euiSuperUpdateButton"
color="primary"
data-test-subj="superDatePickerApplyTimeButton"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -4601,7 +4598,6 @@ exports[`Panels View Component renders panel view container without visualizatio
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
element="button"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -4616,7 +4612,7 @@ exports[`Panels View Component renders panel view container without visualizatio
type="button"
>
<button
className="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
className="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
onBlur={[Function]}
Expand Down
6 changes: 3 additions & 3 deletions public/components/custom_panels/__tests__/__snapshots__/custom_panel_view_so.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ exports[`Panels View SO Component render panel view container and refresh panel
class="euiToolTipAnchor"
>
<button
class="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
class="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
type="button"
>
Expand Down Expand Up @@ -734,7 +734,7 @@ exports[`Panels View SO Component render panel view so container and reload dash
class="euiToolTipAnchor"
>
<button
class="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
class="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
type="button"
>
Expand Down Expand Up @@ -1167,7 +1167,7 @@ exports[`Panels View SO Component renders panels view SO container with visualiz
class="euiToolTipAnchor"
>
<button
class="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
class="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
type="button"
>
Expand Down
4 changes: 1 addition & 3 deletions public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
className="euiSuperUpdateButton"
color="primary"
data-test-subj="superDatePickerApplyTimeButton"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -717,7 +716,6 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
element="button"
fill={true}
iconType="refresh"
isDisabled={false}
isLoading={false}
Expand All @@ -732,7 +730,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
type="button"
>
<button
className="euiButton euiButton--primary euiButton--fill euiSuperUpdateButton"
className="euiButton euiButton--primary euiSuperUpdateButton"
data-test-subj="superDatePickerApplyTimeButton"
disabled={false}
onBlur={[Function]}
Expand Down
16 changes: 8 additions & 8 deletions public/plugin.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,14 @@ export class ObservabilityPlugin
mount: appMountWithStartPage('applications'),
});

core.application.register({
id: observabilityIntegrationsID,
title: observabilityIntegrationsTitle,
category: DEFAULT_APP_CATEGORIES.management,
order: observabilityIntegrationsPluginOrder,
mount: appMountWithStartPage('integrations'),
});

if (core.chrome.navGroup.getNavGroupEnabled()) {
core.application.register({
id: 'observability-traces-nav',
Expand Down Expand Up @@ -361,14 +369,6 @@ export class ObservabilityPlugin
mount: appMountWithStartPage('notebooks'),
});

core.application.register({
id: observabilityIntegrationsID,
title: observabilityIntegrationsTitle,
category: DEFAULT_APP_CATEGORIES.management,
order: observabilityIntegrationsPluginOrder,
mount: appMountWithStartPage('integrations'),
});

registerAllPluginNavGroups(core);

core.application.register({
Expand Down
37 changes: 12 additions & 25 deletions public/plugin_nav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/

import {
observabilityApplicationsID,
observabilityIntegrationsID,
Expand All @@ -21,6 +22,14 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
},
]);

core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
{
id: observabilityIntegrationsID,
category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
order: 500,
},
]);

core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
{
id: observabilityMetricsID,
Expand All @@ -33,47 +42,25 @@ export function registerAllPluginNavGroups(core: CoreSetup<AppPluginStartDepende
core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
{
id: observabilityNotebookID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
order: 400,
},
]);
core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS[`security-analytics`], [
{
id: observabilityNotebookID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
order: 400,
},
]);
core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.analytics, [
{
id: observabilityNotebookID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
category: DEFAULT_APP_CATEGORIES.visualizeAndReport,
order: 400,
},
]);

core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
TackAdam marked this conversation as resolved.
Show resolved Hide resolved
{
id: observabilityIntegrationsID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
order: 500,
},
]);
core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS[`security-analytics`], [
{
id: observabilityIntegrationsID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
order: 500,
},
]);
core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.analytics, [
{
id: observabilityIntegrationsID,
category: DEFAULT_APP_CATEGORIES.dashboardAndReport,
order: 500,
},
]);

core.chrome.navGroup.addNavLinksToGroup(DEFAULT_NAV_GROUPS.observability, [
{
id: 'observability-traces-nav',
Expand Down
Loading