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

Jump to bottom

[Fleet + Integrations UI] Address UI Regressions in Fleet/Integrations #102250

Merged
merged 4 commits into from
Jun 16, 2021
Merged

[Fleet + Integrations UI] Address UI Regressions in Fleet/Integrations #102250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d181f35
Fix active tabs in integrations UI
kpollich Jun 15, 2021
3a68705
Remove duplicate base breadcrumb
kpollich Jun 15, 2021
9961d9d
Fix i18n
kpollich Jun 15, 2021
dadbb59
Merge branch 'master' into integrations-ui/address-regressions
kpollich Jun 16, 2021
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
9 changes: 1 addition & 8 deletions x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,7 @@ const BASE_BREADCRUMB: ChromeBreadcrumb = {
const breadcrumbGetters: {
[key in Page]?: (values: DynamicPagePathValues) => ChromeBreadcrumb[];
} = {
integrations: () => [
BASE_BREADCRUMB,
{
text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
defaultMessage: 'Integrations',
}),
},
],
integrations: () => [BASE_BREADCRUMB],
integrations_all: () => [
BASE_BREADCRUMB,
{
Expand Down
18 changes: 10 additions & 8 deletions x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,18 @@ import { CategoryFacets } from './category_facets';

export const EPMHomePage: React.FC = memo(() => {
return (
<DefaultLayout>
<Switch>
<Route path={INTEGRATIONS_ROUTING_PATHS.integrations_installed}>
<Switch>
<Route path={INTEGRATIONS_ROUTING_PATHS.integrations_installed}>
<DefaultLayout section="manage">
<InstalledPackages />
</Route>
<Route path={INTEGRATIONS_ROUTING_PATHS.integrations_all}>
</DefaultLayout>
</Route>
<Route path={INTEGRATIONS_ROUTING_PATHS.integrations_all}>
<DefaultLayout section="browse">
<AvailablePackages />
</Route>
</Switch>
</DefaultLayout>
</DefaultLayout>
</Route>
</Switch>
);
});

Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/ja-JP.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8939,7 +8939,6 @@
"xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "統合の編集",
"xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "登録トークン",
"xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
"xpack.fleet.breadcrumbs.integrationsPageTitle": "統合",
"xpack.fleet.breadcrumbs.overviewPageTitle": "概要",
"xpack.fleet.breadcrumbs.policiesPageTitle": "ポリシー",
"xpack.fleet.config.invalidPackageVersionError": "有効なサーバーまたはキーワード「latest」でなければなりません",
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/translations/translations/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9019,7 +9019,6 @@
"xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "编辑集成",
"xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "注册令牌",
"xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "已安装",
"xpack.fleet.breadcrumbs.integrationsPageTitle": "集成",
"xpack.fleet.breadcrumbs.overviewPageTitle": "概览",
"xpack.fleet.breadcrumbs.policiesPageTitle": "策略",
"xpack.fleet.config.invalidPackageVersionError": "必须是有效的 semver 或关键字 `latest`",
Expand Down