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

Graph: Remove reference to local application service in graph #64288

Merged
merged 1 commit into from
Apr 24, 2020
Merged

Graph: Remove reference to local application service in graph #64288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions x-pack/plugins/graph/public/_main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,9 @@
-webkit-touch-callout: none;
-webkit-tap-highlight-color: transparent;
}

.gphAppWrapper {
display: flex;
flex-direction: column;
flex-grow: 1;
}
6 changes: 3 additions & 3 deletions x-pack/plugins/graph/public/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export const renderApp = ({ appBasePath, element, ...deps }: GraphDependencies)
};
};

const mainTemplate = (basePath: string) => `<div ng-view class="kbnLocalApplicationWrapper">
const mainTemplate = (basePath: string) => `<div ng-view class="gphAppWrapper">
<base href="${basePath}" />
</div>
`;
Expand All @@ -107,14 +107,14 @@ const thirdPartyAngularDependencies = ['ngSanitize', 'ngRoute', 'react', 'ui.boo

function mountGraphApp(appBasePath: string, element: HTMLElement) {
const mountpoint = document.createElement('div');
mountpoint.setAttribute('class', 'kbnLocalApplicationWrapper');
mountpoint.setAttribute('class', 'gphAppWrapper');
// eslint-disable-next-line
mountpoint.innerHTML = mainTemplate(appBasePath);
// bootstrap angular into detached element and attach it later to
// make angular-within-angular possible
const $injector = angular.bootstrap(mountpoint, [moduleName]);
element.appendChild(mountpoint);
element.setAttribute('class', 'kbnLocalApplicationWrapper');
element.setAttribute('class', 'gphAppWrapper');
return $injector;
}

Expand Down
2 changes: 0 additions & 2 deletions x-pack/plugins/graph/public/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,3 @@
@import './main';
@import './angular/templates/index';
@import './components/index';
// Local application mount wrapper styles
@import 'src/legacy/core_plugins/kibana/public/local_application_service/index';