-
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
Dynamic uiActions & license support #68507
Merged
+370
−58
Merged
Changes from 18 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
10d1323
uiActions & license support
Dosant 03792f0
fixes
Dosant 2f879a4
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant 9636632
review
Dosant 8852123
improve sorting, improving showing error in a list
Dosant 794a9d7
a bit of space of error icon
Dosant be2449d
Merge branch 'master' into dev/uiactions-license
elasticmachine 0787389
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant a9efdc0
Merge branch 'dev/uiactions-license' of github.com:Dosant/kibana into…
Dosant 41ff5c3
refactor using `registerActionHook` approach
Dosant 5eea2b8
fix ts
Dosant f77c4cf
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant fa41858
@streamich review
Dosant a58692c
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant e655e68
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant fa1dcf2
fix i18n
Dosant 2278f55
fix i18n
Dosant 9c4a462
Merge branch 'master' into dev/uiactions-license
elasticmachine a9ee244
Merge branch 'master' of github.com:elastic/kibana into dev/uiactions…
Dosant 8144666
Merge branch 'dev/uiactions-license' of github.com:Dosant/kibana into…
Dosant 491fee6
simplify uiActions license implementation after Stacey review
Dosant 7f02c0f
clean up
Dosant File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -39,6 +39,8 @@ export class DashboardToUrlDrilldown implements Drilldown<Config, ActionContext> | |
|
||
public readonly order = 8; | ||
|
||
readonly minimalLicense = 'gold'; // example of minimal license support | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. only thing required for consumer 🙌 |
||
|
||
public readonly getDisplayName = () => 'Go to URL (example)'; | ||
|
||
public readonly euiIcon = 'link'; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
x-pack/plugins/ui_actions_enhanced/public/actions/action_enhanced.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
import { | ||
Action, | ||
ActionType, | ||
UiActionsActionDefinition as ActionDefinition, | ||
} from '../../../../../src/plugins/ui_actions/public'; | ||
import { LicenseType } from '../../../licensing/public'; | ||
|
||
export interface ActionEnhanced<Context extends {} = {}, T = ActionType> | ||
extends Action<Context, T> { | ||
readonly enhancements: { | ||
/** | ||
* Minimal license | ||
* if missing, then no license limitations | ||
*/ | ||
minimalLicense?: LicenseType; | ||
}; | ||
} | ||
|
||
export interface ActionEnhancedDefinition<Context extends object = object> | ||
extends ActionDefinition<Context> { | ||
readonly enhancements: { | ||
/** | ||
* Minimal license | ||
* if missing, then no license limitations | ||
*/ | ||
minimalLicense?: LicenseType; | ||
}; | ||
} | ||
|
||
export type ActionEnhancedContext<A> = A extends ActionEnhancedDefinition<infer Context> | ||
? Context | ||
: never; | ||
|
||
export function isEnhancedAction<Context extends {} = {}, T = ActionType>( | ||
action: Action<Context, T> | ||
): action is ActionEnhanced<Context, T> { | ||
return !!action.enhancements; | ||
} |
12 changes: 12 additions & 0 deletions
12
x-pack/plugins/ui_actions_enhanced/public/actions/index.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
/* | ||
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
* or more contributor license agreements. Licensed under the Elastic License; | ||
* you may not use this file except in compliance with the Elastic License. | ||
*/ | ||
|
||
export { | ||
ActionEnhanced, | ||
ActionEnhancedDefinition, | ||
ActionEnhancedContext, | ||
isEnhancedAction, | ||
} from './action_enhanced'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
is
context
needed? I don't see it used and since it'sunknown
, probably not that helpful anyway.Should it return
Promise<boolean>
to matchisCompatible
fns?