webengine projection #291
webengine projection #291
Conversation
| if (mem.usedJSHeapSize / mem.jsHeapSizeLimit > 0.75) { | ||
| for (var app of self.props.webEngineApps) { | ||
| if (app.runningAppId && app.style.position === 'absolute') { | ||
| bcController.onExitApplication('RESOURCE_CONSTRAINT', app.runningAppId); |
There was a problem hiding this comment.
If the app is taking up too much memory, should the HMI also "delete" the iframe? Does that happen indirectly after the OnExitApplication message is sent?
There was a problem hiding this comment.
This will indirectly remove the iframe after OnAppUnregistered is received by the HMI.
src/js/AppStore.js
Outdated
| if (manifest.category === 'WEB_VIEW') { | ||
| style = { | ||
| position: 'absolute', | ||
| width: '960px', |
There was a problem hiding this comment.
The size of the web view needs to take into account the dynamic height and width parameters set in the config and used by the scss files. It might be cleaner to define these styles in an scss file and pass a className within the js code instead.
There was a problem hiding this comment.
Good point, I applied these changes here: ab9eaef
src/js/Controllers/UIController.js
Outdated
| @@ -295,6 +297,11 @@ class UIController { | |||
| this.listener.send(RpcFactory.UIPerformInteractionResponse(choiceID, appID, msgID)) | |||
| } | |||
| onSystemContext(context, appID) { | |||
| if (context === 'MAIN' || context === 'ALERT') { | |||
| store.dispatch(appStoreShowWebView()); | |||
There was a problem hiding this comment.
Should you check that the current route is the appstore/webview before dispatching these actions?
There was a problem hiding this comment.
You're right, there's an issue here if an app registers as WEB_VIEW and changes templates. That app's iframe would still be shown. I will look into this.
There was a problem hiding this comment.
In a9d1f48 I added a variable to the state to check whether we were in /web-view and used this in index.js alongside this variable that reflected the current context. This worked fine, but I realized that checking if we are in /web-view is enough and the context doesn't matter after that. So in a1ab7d8 I removed the old state variable related to the context.
| render() { | ||
| return ( | ||
| <div className="webView"> | ||
| <AppHeader backLink="/" menuName="Apps" icon="false"/> |
There was a problem hiding this comment.
I assume WebengineAppContainer was not included in this component because the iframe needs to be running when not in view?
There was a problem hiding this comment.
Exactly, the iframe has to be outside the route context so it can run when we are in a menu etc.
src/js/reducers.js
Outdated
| @@ -434,6 +434,9 @@ function ui(state = {}, action) { | |||
| case "NON-MEDIA": | |||
| app.displayLayout = "nonmedia" | |||
| break | |||
| case "WEB_VIEW": | |||
| app.displayLayout = "webview" | |||
There was a problem hiding this comment.
I think web-view would be more inline with the naming conventions, except nonmedia is kind of ruining my claim.
There was a problem hiding this comment.
updated in 89d551f
If we changed nonmedia we could fix this special case and just use .toLower() for the registerApp call.
|
FYI style does not persist over ignition cycles for installed projection apps. |
…close all running webengine apps on resource constraing, wait for core to connect to send GetInstalledApps
|
In 51ed7e7 I removed webengine app style from the state completely, since iframe visibility will now be controlled by the web-view route modifying I also made it so that all web engine apps will be exited when we are running low on memory instead of just projection apps because I was differentiating them by the style. Lastly I changed when GetInstalledApps is sent to core so that it won't be sent before the HMI is connected to Core. |
implement #275
this PR is ready for review!