-
Notifications
You must be signed in to change notification settings - Fork 15
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
feat: implement plugin wrappers #1332
Merged
Merged
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
be38607
feat: ideas for plugin wrappers [LIBS-397]
tomzemp 30c963c
feat: update plugin wrappers
tomzemp b14952b
fix: clean up, add useless test
tomzemp 46c9219
chore: start pluginwrapper error boundary
tomzemp ddc4251
chore: sample error
tomzemp c72fc6e
fix: custom error handling
tomzemp bda6a43
feat: plugin wrappers, errors + alerts
tomzemp 1681f6e
chore: move plugin wrapper logic to app-platform
tomzemp c537590
fix: add documentation, clean up
tomzemp 41124e8
Merge branch 'alpha' into LIBS-397/plugin-wrappers-sender
tomzemp 2480c1c
fix: dependency resolution
tomzemp 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
# Plugin Component | ||
|
||
A wrapper that creates an iframe for a specified plugin and establishes a two-way communication channel with said plugin, allowing you to pass props (including callbacks between an app and a plugin). Note that the plugin must be built using the app-platform with entryPoints.plugin specified in the d2.config.js file. | ||
|
||
## Basic Usage (Defining a plugin within an app) | ||
|
||
Within an app you can specify a plugin (either by providing its short name `pluginShortName`, or by specifying a URL directly (`pluginSource`). If you have provided `pluginSource`, this will take precedence (Note: lookup logic is TBD? Should we allow a URL only in development mode, for example?). | ||
|
||
```jsx | ||
import { Plugin } from '@dhis2/app-runtime' | ||
|
||
// within the app | ||
const MyApp = () => ( | ||
<Plugin | ||
pluginShortName={mutation} | ||
onError={(err) => { | ||
console.error(err) | ||
}} | ||
showAlertsInPlugin={true} | ||
numberToPass={'42'} | ||
callbackToPass={({ name }) => { | ||
console.log(`Hi ${name}!`) | ||
}} | ||
/> | ||
) | ||
``` | ||
|
||
## Basic Usage (Using properties from the parent app) | ||
|
||
You must build your plugin with the app-platform. If you have done this, your entry component will be passed the props from the parent app. From the example above, the properties `numberToPass` and `callbackToPass` will be available in the build plugin (when it is rendered with a <Plugin> component). | ||
|
||
```jsx | ||
// your plugin entry point (the plugin itself) | ||
|
||
const MyPlugin = (propsFromParent) => { | ||
const { numberToPass, callbackToPass: sayHi } = propsFromParent | ||
return ( | ||
<> | ||
<p>{`The meaning of life is: ${numberToPass}`}</p> | ||
<button onClick={() => sayHi({ name: 'Arthur Dent' })}> | ||
Say hi | ||
</button> | ||
</> | ||
) | ||
} | ||
``` | ||
|
||
## Plugin Props (reserved props) | ||
|
||
| Name | Type | Required | Description | | ||
| :--------------------: | :------------: | :---------------------------------------------: | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | ||
| **pluginShortName** | _string_ | _required_ if `pluginSource` is not provided | The shortName of the app/plugin you wish to load (matching the result from api/apps). Used to look up the plugin entry point. If this is not provided, `pluginSource` must be provided. `pluginSource` will take precedence if provided. | | ||
| **pluginSource** | _string_ (url) | _required_ if `pluginShortName` is not provided | The URL of the plugin. If this is not provided, `pluginShortName` must be provided. | | ||
| **onError** | _Function_ | _optional_ | Callback function to be called when an error in the plugin triggers an error boundary. You can use this to pass an error back up to the app and create a custom handling/UX if errors occur in the plugin. In general, it is recommended that you use the plugin's built-in error boundaries | | ||
| **showAlertsInPlugin** | _boolean_ | _optional_ | If `true`, any alerts within the plugin (defined with the `useAlert` hook) will be rendered within the iframe. By default, this is `false`. It is recommended, in general, that you do not override this and allow alerts to be hoisted up to the app level | | ||
|
||
## Plugin Props (custom props) | ||
|
||
You can specify pass any other props on the <Plugin> component and these will be passed down to the plugin (provided it was built with app-platform). When props are updated, they will be passed back down to the plugin. This mimics the behaviour of a normal React component, and hence you should provide stable references as needed to prevent rerendering. | ||
|
||
## Extended example | ||
|
||
See these links for an extended example of how <Plugin> component can be used within an [app](https://github.com/tomzemp/workingplugin/blob/plugin-wrapper-in-platform/src/App.js) and consumed within the [plugin](https://github.com/tomzemp/workingplugin/blob/plugin-wrapper-in-platform/src/Plugin.js). |
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 |
---|---|---|
@@ -1,3 +1,4 @@ | ||
export { AlertsProvider } from './AlertsProvider' | ||
export { useAlerts } from './useAlerts' | ||
export { useAlert } from './useAlert' | ||
export { AlertsManagerContext } from './AlertsManagerContext' | ||
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 |
---|---|---|
|
@@ -6,7 +6,8 @@ export const useAlert = ( | |
message: string | ((props: any) => string), | ||
options: AlertOptions | ((props: any) => AlertOptions) = {} | ||
): { show: (props?: any) => void; hide: () => void } => { | ||
const { add }: AlertsManager = useContext(AlertsManagerContext) | ||
const { add, plugin, parentAlertsAdd, showAlertsInPlugin }: AlertsManager = | ||
useContext(AlertsManagerContext) | ||
const alertRef = useRef(<Alert | null>null) | ||
|
||
const show = useCallback( | ||
|
@@ -17,15 +18,25 @@ export const useAlert = ( | |
const resolvedOptions = | ||
typeof options === 'function' ? options(props) : options | ||
|
||
alertRef.current = add( | ||
{ | ||
message: resolvedMessage, | ||
options: resolvedOptions, | ||
}, | ||
alertRef | ||
) | ||
if (plugin && parentAlertsAdd && !showAlertsInPlugin) { | ||
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. I passed this showAlertsInPlugin down to useAlert as I thought it made the logic clearer here, but it could be incorporated into logic further up and then not passed down. |
||
alertRef.current = parentAlertsAdd( | ||
{ | ||
message: resolvedMessage, | ||
options: resolvedOptions, | ||
}, | ||
alertRef | ||
) | ||
} else { | ||
alertRef.current = add( | ||
{ | ||
message: resolvedMessage, | ||
options: resolvedOptions, | ||
}, | ||
alertRef | ||
) | ||
} | ||
}, | ||
[add, message, options] | ||
[add, parentAlertsAdd, message, options, plugin, showAlertsInPlugin] | ||
) | ||
|
||
const hide = useCallback(() => { | ||
|
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.
this is now being exported so that the PluginSender can access
add
from the parent (app) and pass it to the plugin, so that the alerts can then be added to the app's AlertsManager rather than the plugin's