-
Notifications
You must be signed in to change notification settings - Fork 104
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move changes from ProfilePluginPOC to aperture/PluginPOCFeature (#883)
* build: create profile plugin page * build: add plugins folder to Profile * build: wrap Profile Plugin Page with Plugin Co-authored-by: Jason Wesson <[email protected]>
- Loading branch information
Showing
19 changed files
with
1,046 additions
and
168 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
---|---|---|
|
@@ -29,9 +29,9 @@ | |
], | ||
"dependencies": { | ||
"@edx/brand": "npm:@edx/[email protected]", | ||
"@edx/frontend-component-footer": "12.3.0", | ||
"@edx/frontend-component-footer": "12.4.0", | ||
"@edx/frontend-component-header": "4.7.1", | ||
"@edx/frontend-platform": "5.4.0", | ||
"@edx/frontend-platform": "5.6.1", | ||
"@edx/paragon": "^20.44.0", | ||
"@fortawesome/fontawesome-svg-core": "1.2.36", | ||
"@fortawesome/free-brands-svg-icons": "5.15.4", | ||
|
@@ -40,7 +40,7 @@ | |
"@fortawesome/react-fontawesome": "0.2.0", | ||
"@pact-foundation/pact": "^11.0.2", | ||
"classnames": "2.3.2", | ||
"core-js": "3.32.2", | ||
"core-js": "3.33.0", | ||
"history": "5.3.0", | ||
"lodash.camelcase": "4.3.0", | ||
"lodash.get": "4.4.2", | ||
|
@@ -49,6 +49,7 @@ | |
"prop-types": "15.8.1", | ||
"react": "17.0.2", | ||
"react-dom": "17.0.2", | ||
"react-error-boundary": "^4.0.11", | ||
"react-helmet": "6.1.0", | ||
"react-redux": "7.2.9", | ||
"react-router": "6.16.0", | ||
|
@@ -63,8 +64,8 @@ | |
"universal-cookie": "4.0.4" | ||
}, | ||
"devDependencies": { | ||
"@commitlint/cli": "17.7.2", | ||
"@commitlint/config-angular": "17.7.0", | ||
"@commitlint/cli": "17.8.0", | ||
"@commitlint/config-angular": "17.8.0", | ||
"@edx/browserslist-config": "^1.1.1", | ||
"@edx/frontend-build": "12.9.17", | ||
"@edx/reactifex": "2.2.0", | ||
|
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,93 @@ | ||
'use client'; | ||
|
||
import React, { | ||
useEffect, useMemo, useState, | ||
} from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { ErrorBoundary } from 'react-error-boundary'; | ||
import { logError } from '@edx/frontend-platform/logging'; | ||
import { | ||
dispatchMountedEvent, dispatchReadyEvent, dispatchUnmountedEvent, useHostEvent, | ||
} from './data/hooks'; | ||
import { PLUGIN_RESIZE } from './data/constants'; | ||
|
||
// see example-plugin-app/src/PluginOne.jsx for example of customizing errorFallback | ||
function errorFallbackDefault() { | ||
return ( | ||
<div> | ||
<h2> | ||
Oops! An error occurred. Please refresh the screen to try again. | ||
</h2> | ||
</div> | ||
); | ||
} | ||
|
||
// eslint-disable-next-line react/function-component-definition | ||
export default function Plugin({ | ||
children, className, style, ready, errorFallbackProp, | ||
}) { | ||
const [dimensions, setDimensions] = useState({ | ||
width: null, | ||
height: null, | ||
}); | ||
|
||
const finalStyle = useMemo(() => ({ | ||
...dimensions, | ||
...style, | ||
}), [dimensions, style]); | ||
|
||
const errorFallback = errorFallbackProp || errorFallbackDefault; | ||
|
||
// Error logging function | ||
// Need to confirm: When an error is caught here, the logging will be sent to the child MFE's logging service | ||
const logErrorToService = (error, info) => { | ||
logError(error, { stack: info.componentStack }); | ||
}; | ||
|
||
useHostEvent(PLUGIN_RESIZE, ({ payload }) => { | ||
setDimensions({ | ||
width: payload.width, | ||
height: payload.height, | ||
}); | ||
}); | ||
|
||
useEffect(() => { | ||
dispatchMountedEvent(); | ||
|
||
return () => { | ||
dispatchUnmountedEvent(); | ||
}; | ||
}, []); | ||
|
||
useEffect(() => { | ||
if (ready) { | ||
dispatchReadyEvent(); | ||
} | ||
}, [ready]); | ||
|
||
return ( | ||
<div className={className} style={finalStyle}> | ||
<ErrorBoundary | ||
FallbackComponent={errorFallback} | ||
onError={logErrorToService} | ||
> | ||
{children} | ||
</ErrorBoundary> | ||
</div> | ||
); | ||
} | ||
|
||
Plugin.propTypes = { | ||
children: PropTypes.node.isRequired, | ||
className: PropTypes.string, | ||
errorFallbackProp: PropTypes.func, | ||
ready: PropTypes.bool, | ||
style: PropTypes.object, // eslint-disable-line | ||
}; | ||
|
||
Plugin.defaultProps = { | ||
className: null, | ||
errorFallbackProp: null, | ||
style: {}, | ||
ready: true, | ||
}; |
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,42 @@ | ||
'use client'; | ||
|
||
import React from 'react'; | ||
|
||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import PluginContainerIframe from './PluginContainerIframe'; | ||
|
||
import { | ||
IFRAME_PLUGIN, | ||
} from './data/constants'; | ||
import { pluginConfigShape } from './data/shapes'; | ||
|
||
// eslint-disable-next-line react/function-component-definition | ||
export default function PluginContainer({ config, ...props }) { | ||
if (config === null) { | ||
return null; | ||
} | ||
|
||
// this will allow for future plugin types to be inserted in the PluginErrorBoundary | ||
let renderer = null; | ||
switch (config.type) { | ||
case IFRAME_PLUGIN: | ||
renderer = ( | ||
<PluginContainerIframe config={config} {...props} /> | ||
); | ||
break; | ||
// istanbul ignore next: default isn't meaningful, just satisfying linter | ||
default: | ||
} | ||
|
||
return ( | ||
renderer | ||
); | ||
} | ||
|
||
PluginContainer.propTypes = { | ||
config: pluginConfigShape, | ||
}; | ||
|
||
PluginContainer.defaultProps = { | ||
config: null, | ||
}; |
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,99 @@ | ||
import React, { | ||
useEffect, useState, | ||
} from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import classNames from 'classnames'; | ||
|
||
import { | ||
PLUGIN_MOUNTED, | ||
PLUGIN_READY, | ||
PLUGIN_RESIZE, | ||
} from './data/constants'; | ||
import { | ||
dispatchPluginEvent, | ||
useElementSize, | ||
usePluginEvent, | ||
} from './data/hooks'; | ||
import { pluginConfigShape } from './data/shapes'; | ||
|
||
/** | ||
* Feature policy for iframe, allowing access to certain courseware-related media. | ||
* | ||
* We must use the wildcard (*) origin for each feature, as courseware content | ||
* may be embedded in external iframes. Notably, xblock-lti-consumer is a popular | ||
* block that iframes external course content. | ||
* This policy was selected in conference with the edX Security Working Group. | ||
* Changes to it should be vetted by them ([email protected]). | ||
*/ | ||
export const IFRAME_FEATURE_POLICY = ( | ||
'fullscreen; microphone *; camera *; midi *; geolocation *; encrypted-media *' | ||
); | ||
|
||
// eslint-disable-next-line react/function-component-definition | ||
export default function PluginContainerIframe({ | ||
config, fallback, className, ...props | ||
}) { | ||
const { url } = config; | ||
const { title, scrolling } = props; | ||
const [mounted, setMounted] = useState(false); | ||
const [ready, setReady] = useState(false); | ||
|
||
const [iframeRef, iframeElement, width, height] = useElementSize(); | ||
|
||
useEffect(() => { | ||
if (mounted) { | ||
dispatchPluginEvent(iframeElement, { | ||
type: PLUGIN_RESIZE, | ||
payload: { | ||
width, | ||
height, | ||
}, | ||
}, url); | ||
} | ||
}, [iframeElement, mounted, width, height, url]); | ||
|
||
usePluginEvent(iframeElement, PLUGIN_MOUNTED, () => { | ||
setMounted(true); | ||
}); | ||
|
||
usePluginEvent(iframeElement, PLUGIN_READY, () => { | ||
setReady(true); | ||
}); | ||
|
||
return ( | ||
<> | ||
<iframe | ||
ref={iframeRef} | ||
title={title} | ||
src={url} | ||
allow={IFRAME_FEATURE_POLICY} | ||
scrolling={scrolling} | ||
referrerPolicy="origin" // The sent referrer will be limited to the origin of the referring page: its scheme, host, and port. | ||
className={classNames( | ||
'border border-0', | ||
{ 'd-none': !ready }, | ||
className, | ||
)} | ||
{...props} | ||
/> | ||
{!ready && fallback} | ||
</> | ||
); | ||
} | ||
|
||
PluginContainerIframe.propTypes = { | ||
config: pluginConfigShape, | ||
fallback: PropTypes.node, | ||
scrolling: PropTypes.oneOf(['auto', 'yes', 'no']), | ||
title: PropTypes.string, | ||
className: PropTypes.string, | ||
}; | ||
|
||
PluginContainerIframe.defaultProps = { | ||
config: null, | ||
fallback: null, | ||
scrolling: 'auto', | ||
title: null, | ||
className: null, | ||
}; |
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,45 @@ | ||
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
// eslint-disable-next-line import/no-extraneous-dependencies | ||
import { FormattedMessage } from 'react-intl'; | ||
|
||
import { logError } from '@edx/frontend-platform/logging'; | ||
|
||
export default class PluginErrorBoundary extends Component { | ||
constructor(props) { | ||
super(props); | ||
this.state = { hasError: false }; | ||
} | ||
|
||
static getDerivedStateFromError() { | ||
// Update state so the next render will show the fallback UI. | ||
return { hasError: true }; | ||
} | ||
|
||
componentDidCatch(error, info) { | ||
logError(error, { stack: info.componentStack }); | ||
} | ||
|
||
render() { | ||
if (this.state.hasError) { | ||
// You can render any custom fallback UI | ||
return ( | ||
<FormattedMessage | ||
id="plugin.load.failure.text" | ||
defaultMessage="This content failed to load." | ||
description="error message when an unexpected error occurs" | ||
/> | ||
); | ||
} | ||
|
||
return this.props.children; | ||
} | ||
} | ||
|
||
PluginErrorBoundary.propTypes = { | ||
children: PropTypes.node, | ||
}; | ||
|
||
PluginErrorBoundary.defaultProps = { | ||
children: null, | ||
}; |
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,75 @@ | ||
/* eslint-disable no-unused-vars */ | ||
import React, { forwardRef } from 'react'; | ||
|
||
import classNames from 'classnames'; | ||
import { Spinner } from '@edx/paragon'; | ||
import PropTypes from 'prop-types'; | ||
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n'; | ||
|
||
// import { usePluginSlot } from './data/hooks'; | ||
import PluginContainer from './PluginContainer'; | ||
|
||
const PluginSlot = forwardRef(({ | ||
as, id, intl, pluginProps, children, ...props | ||
}, ref) => { | ||
/* the plugins below are obtained by the id passed into PluginSlot by the Host MFE. See example/src/PluginsPage.jsx | ||
for an example of how PluginSlot is populated, and example/src/index.jsx for a dummy JS config that holds all plugins | ||
*/ | ||
// const { plugins, keepDefault } = usePluginSlot(id); | ||
|
||
const { fallback } = pluginProps; | ||
|
||
// TODO: Add internationalization to the "Loading" text on the spinner. | ||
let finalFallback = ( | ||
<div className={classNames(pluginProps.className, 'd-flex justify-content-center align-items-center')}> | ||
<Spinner animation="border" screenReaderText="Loading" /> | ||
</div> | ||
); | ||
if (fallback !== undefined) { | ||
finalFallback = fallback; | ||
} | ||
|
||
let finalChildren = []; | ||
// if (plugins.length > 0) { | ||
// if (keepDefault) { | ||
// finalChildren.push(children); | ||
// } | ||
// plugins.forEach((pluginConfig) => { | ||
// finalChildren.push( | ||
// <PluginContainer | ||
// key={pluginConfig.url} | ||
// config={pluginConfig} | ||
// fallback={finalFallback} | ||
// {...pluginProps} | ||
// />, | ||
// ); | ||
// }); | ||
// } else { | ||
finalChildren = children; | ||
// } | ||
|
||
return React.createElement( | ||
as, | ||
{ | ||
...props, | ||
ref, | ||
}, | ||
finalChildren, | ||
); | ||
}); | ||
|
||
export default injectIntl(PluginSlot); | ||
|
||
PluginSlot.propTypes = { | ||
as: PropTypes.elementType, | ||
children: PropTypes.node, | ||
id: PropTypes.string.isRequired, | ||
intl: intlShape.isRequired, | ||
pluginProps: PropTypes.object, // eslint-disable-line | ||
}; | ||
|
||
PluginSlot.defaultProps = { | ||
as: 'div', | ||
children: null, | ||
pluginProps: {}, | ||
}; |
Oops, something went wrong.