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.

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

[Dashboard] Deangularize navbar, attempt nr. 2 #61611

Merged
merged 64 commits into from
Apr 22, 2020
Merged
Changes from 1 commit
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
03336a7
Attempt at deangularization, nr.2
Mar 27, 2020
797c0fc
Remove padding in fullscreen
Mar 27, 2020
33ea01c
Fixing failing functional test
Mar 30, 2020
9b4a28c
Fixing remaining functional test
Mar 31, 2020
ca84abc
Fixing typescript errors
Apr 1, 2020
687f193
Fixing filter bar not being visible in fullscreen
Apr 3, 2020
ef77d2e
Fixing filter bar not being visible in fullscreen
Apr 3, 2020
fb33274
Rebasing against master
Apr 7, 2020
9026945
Fixing a small leftover
Apr 7, 2020
477f4d1
Fix order of functions
Apr 7, 2020
a081dd2
Fixing linting error
Apr 7, 2020
198affa
Merge branch 'master' into deangularize-navbar-2
elasticmachine Apr 7, 2020
c106db9
Merge branch 'master' into deangularize-navbar-2
elasticmachine Apr 10, 2020
ff6504f
Merge branch 'master' into deangularize-navbar-2
elasticmachine Apr 12, 2020
778358f
Changing noPadding to a custom class
Apr 14, 2020
6844e0d
Use filterManagers to handle filters
Apr 14, 2020
38fd2ca
Rename class
Apr 14, 2020
5a90798
Attempt at deangularization, nr.2
Mar 27, 2020
271c193
Remove padding in fullscreen
Mar 27, 2020
46b8486
Fixing failing functional test
Mar 30, 2020
556b2e1
Fixing remaining functional test
Mar 31, 2020
e69dcce
Fixing typescript errors
Apr 1, 2020
8f96c19
Fixing filter bar not being visible in fullscreen
Apr 3, 2020
d1a0467
Fixing filter bar not being visible in fullscreen
Apr 3, 2020
debf3fa
Rebasing against master
Apr 7, 2020
bee3768
Fixing a small leftover
Apr 7, 2020
1894e58
Fix order of functions
Apr 7, 2020
5033678
Fixing linting error
Apr 7, 2020
8acefd6
[APM] Agent config select box doesn't work on IE (#63236)
cauemarcondes Apr 10, 2020
b0f2ba6
Use globe icon for "ext" span type on service map (#63205)
smith Apr 10, 2020
910e2b8
Move shared vislib components into Charts plugin (#62957)
DianaDerevyankina Apr 10, 2020
19fc959
Make uptime alert flyout test a little more resilient (#62702)
brianseeders Apr 10, 2020
bc26037
[SIEM] [Cases] Unit tests for case UI components (#63005)
stephmilovic Apr 10, 2020
1e66805
Endpoint: Remove unused `lib` module (#63248)
Apr 10, 2020
b38b2cb
[Lens] Fix error in query from generated suggestion (#63018)
Apr 10, 2020
a4ac154
Resolver/node svg 2 html (#62958)
bkimmel Apr 10, 2020
734513c
[Reporting] convert all server unit tests to TypeScript (#62873)
tsullivan Apr 10, 2020
b5f8664
[SIEM] Link ML Rule card CTA to license_management (#63210)
rylnd Apr 10, 2020
ae22596
Correctly type ILM's optional dependencies as optional (#63255)
cjcenizal Apr 10, 2020
192ad72
[Telemetry] use prod keys (#63263)
Bamieh Apr 10, 2020
64cf730
update chromedriver dependency to 81.0.0 (#63266)
dmlemeshko Apr 10, 2020
05c55ec
task/mac-eventing-form (#62999)
parkiino Apr 10, 2020
39c491e
bc6 rule import april 9 (#63152)
randomuserid Apr 10, 2020
9e5fb5e
Added UI for pre-configured connectors. (#63074)
YulNaumenko Apr 10, 2020
5eb6610
TaskManager tasks scheduled without attempting to run (#62078)
kobelb Apr 10, 2020
96e4749
Changed alerting wrong param name for help xpack.encrypted_saved_obje…
YulNaumenko Apr 11, 2020
c63933a
fix ScopedHistory.createHref to prepend location with scoped history …
pgayvallet Apr 11, 2020
adf38e0
fixing custom link popover size and hiding scroll (#63240)
cauemarcondes Apr 11, 2020
4827dbf
Changing noPadding to a custom class
Apr 14, 2020
8161d30
Use filterManagers to handle filters
Apr 14, 2020
a2abe6d
Rename class
Apr 14, 2020
537131c
Applying some changes
Apr 16, 2020
9bb8355
UseDefaultBehaviors in dashboard app controller
Apr 16, 2020
bca426e
Merge branch 'master' into deangularize-navbar-2
Apr 16, 2020
1be9803
Merge branch 'master' into deangularize-navbar-2
Apr 16, 2020
2edfa15
Reverting search_bar code changes
Apr 16, 2020
8076ed2
Removing some stuff that was causing functional tests to fail
Apr 17, 2020
6b09cee
Merge branch 'master' into deangularize-navbar-2
Apr 17, 2020
5b00872
Removing refresh dashboard container which was causing errors during …
Apr 17, 2020
1b5ac60
Do not destroy dashboardContainer
Apr 18, 2020
f1b5312
Merge branch 'master' into deangularize-navbar-2
elasticmachine Apr 19, 2020
ea48a46
Adding updateSavedQueryId method
Apr 20, 2020
6a751f4
Merge branch 'deangularize-navbar-2' of https://github.com/majagrubic…
Apr 20, 2020
359149c
Merge branch 'master' into deangularize-navbar-2
Apr 20, 2020
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
Prev Previous commit
Next Next commit
Remove padding in fullscreen
Maja Grubic committed Apr 7, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 797c0fc1a316794fd5aebbacd1c052c10b3037df
Original file line number Diff line number Diff line change
@@ -246,6 +246,7 @@ export class DashboardAppController {
return {
appName: 'dashboard',
config: isFullScreenMode ? undefined : $scope.topNavMenu,
noPadding: isFullScreenMode,
showSearchBar: !isFullScreenMode,
showFilterBar: showFilterBar() && !isFullScreenMode,
showQueryBar: !isFullScreenMode,
Original file line number Diff line number Diff line change
@@ -75,4 +75,12 @@ describe('TopNavMenu', () => {
expect(component.find(TOP_NAV_ITEM_SELECTOR).length).toBe(0);
expect(component.find(SEARCH_BAR_SELECTOR).length).toBe(1);
});

it('Should render without padding', () => {
const component = shallowWithIntl(
<TopNavMenu appName={'test'} showSearchBar={true} data={dataShim as any} noPadding={true} />
);

expect(component.find('.kbnTopNavMenu').length).toBe(0);
});
});
5 changes: 4 additions & 1 deletion src/plugins/navigation/public/top_nav_menu/top_nav_menu.tsx
Original file line number Diff line number Diff line change
@@ -29,6 +29,7 @@ export type TopNavMenuProps = StatefulSearchBarProps & {
config?: TopNavMenuData[];
showSearchBar?: boolean;
data?: DataPublicPluginStart;
noPadding?: boolean;
};

/*
@@ -65,14 +66,15 @@ export function TopNavMenu(props: TopNavMenuProps) {
}

function renderLayout() {
const className = props.noPadding ? undefined : 'kbnTopNavMenu';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not pass in a class name from the caller directly?
I'm sure there will be other use cases for that.

return (
<span className="kbnTopNavMenu__wrapper">
<EuiFlexGroup
data-test-subj="top-nav"
justifyContent="flexStart"
alignItems="center"
gutterSize="none"
className="kbnTopNavMenu"
className={className}
responsive={false}
>
{renderItems()}
@@ -92,4 +94,5 @@ TopNavMenu.defaultProps = {
showDatePicker: true,
showFilterBar: true,
screenTitle: '',
noPadding: false,
};