-
Notifications
You must be signed in to change notification settings - Fork 8.3k
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
Add ApplicationService app status management #50223
Add ApplicationService app status management #50223
Conversation
This comment has been minimized.
This comment has been minimized.
if (this.apps.get(appId) === undefined) { | ||
throw new Error(`Trying to navigate to an unknown application: ${appId}`); | ||
} | ||
const app = availableApps$.value.get(appId); | ||
if (app === undefined || app.status !== AppStatus.accessible) { | ||
throw new Error(`Trying to navigate to an inaccessible application: ${appId}`); | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is our strategy regarding error throwing ? Should I create a custom error type every time, even when not enhancing Error
with custom props?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good question. navigateToApp
is a part of public API and can be called by any plugin. If we throw an error here, it becomes a plugin responsibility to handle the error. I think the core should handle core errors.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So instead of throwing, we should probably redirect to a 404 page or something similar ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or probably call FatalError API https://github.com/pgayvallet/kibana/blob/09cd6d82af8dd192036d96cabe803c4ce7615a4f/src/core/public/fatal_errors/fatal_errors_service.tsx#L49
Although it doesn't scale well. We can forget to wrap the public method, for example. Probably it worth a separate discussion.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One option in this case is to redirect to the route (basically, remove this check) and rely on the existing "Application Not Found" UI to show. That would be a bit more graceful than breaking the calling code, but may obscure a bug. Though this case also exposes the need for plugins to know which applications are available in order to show/hide links to other apps.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Though this case also exposes the need for plugins to know which applications are available in order to show/hide links to other apps.
Have they got other links besides navLinks?
The platform could provide a list of available apps. Then plugins can use this info to enable/disable links. Should they hide links or make them disabled (for the sake of UI consistency)?
For now Application Not Found
is ok. And it's inlined with behavior when a user lands on URL for an unknown or disabled app.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed the error logic, user will now lands on the 404 page when redirecting to a non-existing app
export const mergeCapabilities = (...sources: Array<Partial<Capabilities>>) => | ||
sources.reduce( | ||
(capabilities, source) => { | ||
Object.entries(source).forEach(([key, value]) => { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
File was unused
* An observable for a tooltip shown when hovering over app link. | ||
* A tooltip shown when hovering over app link. | ||
*/ | ||
tooltip$?: Observable<string>; | ||
tooltip?: string; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reverted the tooltip observable, as it was currently unimplemented, and should now be updated using the new AppStatusUpdater
mechanism
export const AppRouter: React.StatelessComponent<Props> = ({ | ||
export const AppRouter: React.FunctionComponent<Props> = ({ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
StatelessComponent
is deprecated due to react hooks. FunctionComponent
is the new terminology.
navLinks$.next( | ||
const updater: LinksUpdater = navLinks => | ||
new Map( | ||
[...navLinks$.value.entries()].map(([linkId, link]) => { | ||
[...navLinks.entries()].map(([linkId, link]) => { | ||
return [linkId, link.id === id ? link.update(values) : link] as [ | ||
string, | ||
NavLinkWrapper | ||
]; | ||
}) | ||
) | ||
); | ||
); | ||
|
||
linkUpdaters$.next([...linkUpdaters$.value, updater]); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before PR, we were reading the application.availableApps
only once at startup, which allowed to directly edit the links in NavlinkServices
. As availableApps$
is now an Observable, I have to keep track of every 'manually' applied changes in NavlinkServices
to reapply them after each availableApps$
emission. Hopefully at some point, we will no longer allow direct edition to Navlinks, and this will disappear, but for now, this seems like a necessary evil for retro-compat.
Pinging @elastic/kibana-platform (Team:Platform) |
💚 Build Succeeded |
💔 Build Failed |
💔 Build Failed |
@elastic/apm-ui @elastic/ml-ui @elastic/kibana-gis I changed some |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ML test file changes LGTM
await plugin.navigateToApp(appId); | ||
cb(); | ||
} catch (e) { | ||
cb(e.message); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
optional: we can use an object to be more explicit cb({error: e.message})
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done. As you already mentioned, our wrong signature on browser.executeAsync
forces to cast when returning a typed thing from the callback. But even the webdriver signature is quite wrong, as it does not explicitly specify the last cb
parameter's type...
// webdriver/index.d.ts
executeAsyncScript<T>(script: string|Function, ...var_args: any[]): Promise<T>;
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
APM changes LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maps lgtm! Thanks for the clean up!
💚 Build SucceededHistory
To update your PR or re-run it, just comment with: |
* add unimplemented registerAppStatusUpdater & remove observers for apps and legacyApps * adapt NavLinksService to use new application observables * merge availableApps$ and availableLegacyApps$ * updating core docs * adapt the navLink updating methods * filters the inaccessible apps from availableApps$ * restrict access to navigateToApp depending on app status * fixes due to merge * add statusUpdater$ to AppBase * export new types * disable navlink depending on app status * update generated doc * update snapshots for disabled prop * Address josh review * Address review comments * fix merge conflicts * adapt changes due to merge * update generated doc * add comment and fix navlink url for custom url apps * add AppNavLinkStatus type to split app/navlink states * fix typo * review comments and improvements * add functional tests * update generated docs and migration guide * fix wrong type cast on AppsMenuProvider.readLinks * properly type return of navigateToApp
* add unimplemented registerAppStatusUpdater & remove observers for apps and legacyApps * adapt NavLinksService to use new application observables * merge availableApps$ and availableLegacyApps$ * updating core docs * adapt the navLink updating methods * filters the inaccessible apps from availableApps$ * restrict access to navigateToApp depending on app status * fixes due to merge * add statusUpdater$ to AppBase * export new types * disable navlink depending on app status * update generated doc * update snapshots for disabled prop * Address josh review * Address review comments * fix merge conflicts * adapt changes due to merge * update generated doc * add comment and fix navlink url for custom url apps * add AppNavLinkStatus type to split app/navlink states * fix typo * review comments and improvements * add functional tests * update generated docs and migration guide * fix wrong type cast on AppsMenuProvider.readLinks * properly type return of navigateToApp
* master: (69 commits) [Graph] Fix various a11y issues (elastic#54097) Add ApplicationService app status management (elastic#50223) logs in one time (elastic#54447) Deprecate using `elasticsearch.ssl.certificate` without `elasticsearch.ssl.key` and vice versa (elastic#54392) [Optimizer] Fix a stack overflow with watch_cache when it attempts to delete very large folders. (elastic#54457) Security - Role Mappings UI (elastic#53620) [SIEM] [Detection engine] Permission II (elastic#54292) Allow User to Cleanup Repository from UI (elastic#53047) [Detection engine] Some UX for rule creation (elastic#54471) share specific instances of some ui packages (elastic#54079) [ML] APM modules configs for RUM Javascript and NodeJS (elastic#53792) [APM] Delay rendering invalid license notification (elastic#53924) [Graph] Improve error message on graph requests (elastic#54230) [ILM] Kibana should allow a min_age setting of 0ms in ILM policy phases (elastic#53719) Unit Tests for common/lib (elastic#53736) [Graph] Only show explorable fields (elastic#54101) remove linting rule exception for markdown (elastic#54232) [Monitoring] Fetch shard data more efficiently (elastic#54028) [Maps] Add hiddenLayers option to embeddable map input (elastic#54355) Pass termOrder and hasTermsAgg properties to serializeThresholdWatch function (elastic#54391) ...
* master: (69 commits) [Graph] Fix various a11y issues (elastic#54097) Add ApplicationService app status management (elastic#50223) logs in one time (elastic#54447) Deprecate using `elasticsearch.ssl.certificate` without `elasticsearch.ssl.key` and vice versa (elastic#54392) [Optimizer] Fix a stack overflow with watch_cache when it attempts to delete very large folders. (elastic#54457) Security - Role Mappings UI (elastic#53620) [SIEM] [Detection engine] Permission II (elastic#54292) Allow User to Cleanup Repository from UI (elastic#53047) [Detection engine] Some UX for rule creation (elastic#54471) share specific instances of some ui packages (elastic#54079) [ML] APM modules configs for RUM Javascript and NodeJS (elastic#53792) [APM] Delay rendering invalid license notification (elastic#53924) [Graph] Improve error message on graph requests (elastic#54230) [ILM] Kibana should allow a min_age setting of 0ms in ILM policy phases (elastic#53719) Unit Tests for common/lib (elastic#53736) [Graph] Only show explorable fields (elastic#54101) remove linting rule exception for markdown (elastic#54232) [Monitoring] Fetch shard data more efficiently (elastic#54028) [Maps] Add hiddenLayers option to embeddable map input (elastic#54355) Pass termOrder and hasTermsAgg properties to serializeThresholdWatch function (elastic#54391) ...
* add unimplemented registerAppStatusUpdater & remove observers for apps and legacyApps * adapt NavLinksService to use new application observables * merge availableApps$ and availableLegacyApps$ * updating core docs * adapt the navLink updating methods * filters the inaccessible apps from availableApps$ * restrict access to navigateToApp depending on app status * fixes due to merge * add statusUpdater$ to AppBase * export new types * disable navlink depending on app status * update generated doc * update snapshots for disabled prop * Address josh review * Address review comments * fix merge conflicts * adapt changes due to merge * update generated doc * add comment and fix navlink url for custom url apps * add AppNavLinkStatus type to split app/navlink states * fix typo * review comments and improvements * add functional tests * update generated docs and migration guide * fix wrong type cast on AppsMenuProvider.readLinks * properly type return of navigateToApp
This was already backported, but changes to endpoint app could not be backported, since endpoint app itself hadn't been backported. Now that the endpoint app is backported, reapply the endpoint specific changes from the original commit.
* Add Endpoint plugin and Resolver embeddable (#51994) * Add functional tests for plugins to x-pack (so we can do a functional test of the Resolver embeddable) * Add Endpoint plugin * Add Resolver embeddable * Test that Resolver embeddable can be rendered Conflicts: x-pack/.i18nrc.json x-pack/test/api_integration/apis/index.js * [Endpoint] Register endpoint app (#53527) * register app, create functional test * formatting * update tests * adjust test data for endpoint * add endpoint tests for testing spaces, app enabled, disabled, etc * linting * add read privileges to endpoint * rename variable since its used now * remove deprecated context * remove unused variable * fix type check * correct test suite message Co-Authored-By: Larry Gregory <[email protected]> Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Larry Gregory <[email protected]> * [Endpoint] add react router to endpoint app (#53808) * add react router to endpoint app * linting * linting * linting * correct tests * change history from hash to browser, add new test util * remove default values in helper functions * fix type check, use FunctionComponent as oppsed to FC * use BrowserRouter component * use BrowserRouter component lin * add comments to test framework, change function name to include browserHistory Co-authored-by: Elastic Machine <[email protected]> * EMT-issue-65: add endpoint list api (#53861) add endpoint list api * EMT-65:always return accurate endpoint count (#54423) EMT-65:always return accurate endpoint count, independent of paging properties * Resolver component w/ sample data (#53619) Resolver is a map. It shows processes that ran on a computer. The processes are drawn as nodes and lines connect processes with their parents. Resolver is not yet implemented in Kibana. This PR adds a 'map' type UX. The user can click and drag to pan the map and zoom using trackpad pinching (or ctrl and mousewheel.) There is no code providing actual data. Sample data is included. The sample data is used to draw a map. The fundamental info needed is: process names the parent of a process With this info we can topologically lay out the processes. The sample data isn't yet in a realistic format. We'll be fixing that soon. Related issue: elastic/endpoint-app-team#30 * Resolver test plugin not using mount context. (#54933) Mount context was deprecated. Use core.getStartServices() instead. * Resolver nonlinear zoom (#54936) * [Endpoint] add Redux saga Middleware and app Store (#53906) * Added saga library * Initialize endpoint app redux store * Resolver is overflow: hidden to prevent obscured elements from showing up (#55076) * [Endpoint] Fix saga to start only after store is created and stopped on app unmount (#55245) - added `stop()`/`start()` methods to the Saga Middleware creator factory - adjust tests based on changes - changed application `renderApp` to stop sagas when react app is unmounted * Resolver zoom, pan, and center controls (#55221) * Resolver zoom, pan, and center controls * add tests, fix north panning * fix type issue * update west and east panning to behave like google maps * [Endpoint] FIX: Increase tests `sleep` default duration back to 100ms (#55492) Revert `sleep()` default duration, in the saga tests, back to 100ms in order to prevent intermittent failures during CI runs. Fixes #55464 Fixes #55465 * [Endpoint] EMT-65: make endpoint data types common, restructure (#54772) [Endpoint] EMT-65: make endpoint data types common, use schema changes * Basic Functionality Alert List (#55800) * sets up initial grid and data type * data feeds in from backend but doesnt update * sample data feeding in correctly * Fix combineReducers issue by importing Redux type from 'redux' package * Add usePageId hook that fires action when user navigates to page * Strict typing for middleware * addresses comments and uses better types * move types to common/types.ts * Move types to endpoint/types.ts, address PR comments blah 2 Co-authored-by: Pedro Jaramillo <[email protected]> * [Endpoint] Add Endpoint Details route (#55746) * Add Endpoint Details route * add Endpoint Details tests * sacrifices to the Type gods * update to latest endpoint schema Co-authored-by: Elastic Machine <[email protected]> * [Endpoint] EMT-67: add kql support for endpoint list (#56328) [Endpoint] EMT-67: add kql support for endpoint list * [Endpoint] ERT-82 ERT-83 ERT-84: Alert list API with pagination (#56538) * ERT-82 ERT-83 ERT-84 (partial): Add Alert List API with pagination * Better type safety for alert list API * Add Test to Verify Endpoint App Landing Page (#57129) Conflicts: x-pack/test/functional/page_objects/index.ts * fixes render bug in alert list (#57152) Co-authored-by: Elastic Machine <[email protected]> * Resolver: Animate camera, add sidebar (#55590) This PR adds a sidebar navigation. clicking the icons in the nav will focus the camera on the different nodes. There is an animation effect when the camera moves. Conflicts: yarn.lock * [Endpoint] Task/basic endpoint list (#55623) * Adds host management list to endpoint security plugin Co-authored-by: Elastic Machine <[email protected]> * [Endpoint] Policy List UI route and initial view (#56918) * Initial Policy List view * Add `endpoint/policy` route and displays Policy List * test cases (both unit and functional) Does not yet interact with API (Ingest). * Add ApplicationService app status management (#50223) This was already backported, but changes to endpoint app could not be backported, since endpoint app itself hadn't been backported. Now that the endpoint app is backported, reapply the endpoint specific changes from the original commit. * Implements `getStartServices` on server-side (#55156) This was already backported, but changes to endpoint app could not be backported, since endpoint app itself hadn't been backported. Now that the endpoint app is backported, reapply the endpoint specific changes from the original commit. * [ui/utils/query_string]: Remove unused methods & migrate apps to querystring lib (#56957) This was already backported, but changes to endpoint app could not be backported, since endpoint app itself hadn't been backported. Now that the endpoint app is backported, reapply the endpoint specific changes from the original commit. Co-authored-by: Kevin Logan <[email protected]> Co-authored-by: Elastic Machine <[email protected]> Co-authored-by: Larry Gregory <[email protected]> Co-authored-by: nnamdifrankie <[email protected]> Co-authored-by: Davis Plumlee <[email protected]> Co-authored-by: Paul Tavares <[email protected]> Co-authored-by: Pedro Jaramillo <[email protected]> Co-authored-by: Dan Panzarella <[email protected]> Co-authored-by: Madison Caldwell <[email protected]> Co-authored-by: Charlie Pichette <[email protected]> Co-authored-by: Candace Park <[email protected]> Co-authored-by: Pierre Gayvallet <[email protected]> Co-authored-by: Alexey Antonov <[email protected]>
Summary
Fixes #45291
PR adds ways to manage the
ApplicationService
applications status.AppUpdater
type.registerAppUpdater
method onApplicationSetup
that allows control over all applications status.updater$
on application registration (AppBase
) that allows control over a specific registered application.ApplicationService.availableApps
to anavailableApps$
observable that re-emit any time any application change.ApplicationService
'savailableApps
andlegacyApps
for simplification and easier legacy removal when the time comes.Both approaches relies on observables to update the statuses: every time the Observable emit a new values, the
availableApplications$
re-emit the updated list.Checklist
Use
strikethroughsto remove checklist items you don't feel are applicable to this PR.- [ ] This was checked for cross-browser compatibility, including a check against IE11- [ ] Any text added follows EUI's writing guidelines, uses sentence case text and includes i18n support- [ ] This was checked for keyboard-only and screenreader accessibilityFor maintainers
- [ ] This was checked for breaking API changes and was labeled appropriately- [ ] This includes a feature addition or change that requires a release note and was labeled appropriately