Tab Reloading Issue Fix

:Release Notes:
Tab Reloading Issue Fix

:Detailed Notes:
Under critical memory state, all tabs are set to reload.
Bug fix - Unloaded tab is not reloaded

:Testing Performed:
Tested with verification Build

:QA Notes:
NA

:Issues Addressed:
[WRO-9714] Unloaded tab is not reloaded

Change-Id: I7329fc1ce88e64402eb5380d361d6dcc9feb9e76

Author: GaneshBhatGRB

samples/enact-based/src/NevaLib/MemoryManagerTabPolicy.js

@@ -6,23 +6,23 @@
 //
 // https://github.com/webosose/com.webos.app.enactbrowser/blob/master/LICENSE
 
-import {RendererPerTabPolicy as SimplePolicy} from './RendererPerTabPolicy.js';
+import { RendererPerTabPolicy as SimplePolicy } from './RendererPerTabPolicy.js';
 
 const maxActive = 1;
 
 class MemoryManagerTabPolicy {
-	constructor (
-			tabs,
-			webViews,
-			maxSuspendedNormal,
-			maxSuspendedLow,
-			maxSuspendedCritical
+	constructor(
+		tabs,
+		webViews,
+		maxSuspendedNormal,
+		maxSuspendedLow,
+		maxSuspendedCritical
 	) {
 		this.simplePolicy = new SimplePolicy(
 			tabs,
 			webViews,
 			maxActive,
-			maxSuspendedCritical
+			maxSuspendedCritical,
 		);
 		this.maxSuspendedNormal = maxSuspendedNormal;
 		this.maxSuspendedLow = maxSuspendedLow;
@@ -33,27 +33,27 @@ class MemoryManagerTabPolicy {
 			Promise.race([
 				new Promise((resolve) => {
 					window.navigator.memorymanager.getMemoryStatus((ev) => {
-						resolve(ev.system.level);
+						resolve(ev)
 					});
 				}),
 				new Promise((resolve) => {
 					window.navigator.memorymanager.onlevelchanged = (ev) => {
-						resolve(ev.current);
+						resolve(ev);
 					};
 				})
 			]).then((memoryStatus) => {
 				console.log('Initializing memory status: ' + memoryStatus); // eslint-disable-line no-console
 				policy.simplePolicy.maxSuspendedTabFamilies =
-                    policy.statusToMaxSuspended(memoryStatus);
+					policy.statusToMaxSuspended(memoryStatus);
 				window.navigator.memorymanager.onlevelchanged =
-                    policy._handleLevelChanged;
+					policy._handleLevelChanged;
 			});
 		} else {
 			console.error('MemoryManager interface is not implemented! Check your WebOS version!'); // eslint-disable-line no-console
 		}
 	}
 
-	statusToMaxSuspended (memoryStatus) {
+	statusToMaxSuspended(memoryStatus) {
 		switch (memoryStatus) {
 			case 'normal':
 				return this.maxSuspendedNormal;
@@ -73,18 +73,18 @@ class MemoryManagerTabPolicy {
 			current: '[normal|low|critical]'
 		}
 	*/
+
 	_handleLevelChanged = (ev) => {
-		console.log('Handle memory level change ' + ev.current); // eslint-disable-line no-console
+		console.log('Memory level changed to ==>' + ev); // eslint-disable-line no-console
 		const policy = this.simplePolicy;
-		policy.maxSuspended = this.statusToMaxSuspended(ev.current);
-		while (policy.queue.length > policy.maxSuspended + policy.maxActive) {
-			const id = policy.queue.pop();
-			policy.webViews[id].deactivate();
+		if (ev == "critical") {
+			policy.criticalReached = true
+			policy._handleCriticalMemory()
+		} else {
+			policy.criticalReached = false
 		}
-		console.log('_handleLevelChanged'); // eslint-disable-line no-console
-		console.log(policy); // eslint-disable-line no-console
 	};
 }
 
 export default MemoryManagerTabPolicy;
-export {MemoryManagerTabPolicy};
+export { MemoryManagerTabPolicy };

samples/enact-based/src/NevaLib/RendererPerTabPolicy.js

@@ -6,31 +6,44 @@
 //
 // https://github.com/webosose/com.webos.app.enactbrowser/blob/master/LICENSE
 
-import {TabTypes} from 'js-browser-lib/TabsConsts';
+import { TabTypes } from 'js-browser-lib/TabsConsts';
 
+let deactivate_tab_family, maxNotDeactivated;
 class RendererPerTabPolicy {
-	constructor (tabs, webViews, maxActiveTabFamilies, maxSuspendedTabFamilies) {
-		this.webViews = webViews;
-		this.queue = [];
-		this.maxActiveTabFamilies = maxActiveTabFamilies;
-		this.maxSuspendedTabFamilies = maxSuspendedTabFamilies;
-		tabs.addEventListener('select', this._handleTabSelect);
-		tabs.addEventListener('delete', this._handleTabDelete);
-	}
+    constructor(tabs, webViews, maxActiveTabFamilies, maxSuspendedTabFamilies) {
+        this.webViews = webViews;
+        this.queue = [];
+        this.maxActiveTabFamilies = maxActiveTabFamilies;
+        this.maxSuspendedTabFamilies = maxSuspendedTabFamilies;
+        this.criticalReached = false;
+        tabs.addEventListener('select', this._handleTabSelect);
+        tabs.addEventListener('delete', this._handleTabDelete);
+    }
+
+
+    _handleCriticalMemory = () => {
+        if (this.criticalReached) {
+            console.log("reached CRITICAL_HANDLER function")
+            this.webViews.map((i, index) => {
+                //Apart from current/active tab, all other tabs are de-activated.
+                Number(this.queue[0]) !== index && this.webViews[index].deactivate()
+            });
+        }
+    }
 
-	_handleTabSelect = (ev) => {
-		const tab = ev.state;
+    _handleTabSelect = (ev) => {
+        const tab = ev.state;
 
-		// VKB for current tab should be hidden when the other tab is selected
-		if (this.queue.length > 0 && this.webViews[this.queue[0]]) {
-			this.webViews[this.queue[0]].clearTextInputFocus();
-		}
+        // VKB for current tab should be hidden when the other tab is selected
+        if (this.queue.length > 0 && this.webViews[this.queue[0]]) {
+            this.webViews[this.queue[0]].clearTextInputFocus();
+        }
 
-		if (tab.type !== TabTypes.WEBVIEW) {
-			return;
-		}
+        if (tab.type !== TabTypes.WEBVIEW) {
+            return;
+        }
 
-		let tab_family_id = this.webViews[tab.id].tabFamilyId;
+        let tab_family_id = this.webViews[tab.id].tabFamilyId;
 
         this.queue.unshift(tab_family_id);
         this.queue = [...new Set(this.queue)]; // remove duplicates
@@ -50,32 +63,41 @@ class RendererPerTabPolicy {
         let suspend_tab_family = manage_tab_family(
             id => this.webViews[id].suspend()
         );
-        let deactivate_tab_family = manage_tab_family(
+        deactivate_tab_family = manage_tab_family(
             id => this.webViews[id].deactivate()
         );
 
         console.log(`tab family id: ${tab_family_id}. this.queue: ${this.queue.toString()}`);
+        console.log("criticalReached is ==> ", this.criticalReached)
 
         activate_tab_family(tab_family_id);
 
-        if (this.queue.length > this.maxActiveTabFamilies) {
-            suspend_tab_family(this.queue[this.maxActiveTabFamilies]);
+        if (!this.criticalReached) {
+            if (this.queue.length > this.maxActiveTabFamilies) {
+                suspend_tab_family(this.queue[this.maxActiveTabFamilies]);
+            }
+
+            maxNotDeactivated = this.maxActiveTabFamilies + this.maxSuspendedTabFamilies;
         }
 
-        const maxNotDeactivated = this.maxActiveTabFamilies + this.maxSuspendedTabFamilies;
+        if (this.criticalReached) {
+            this.webViews.map((i, index) => {
+                return Number(this.queue[0]) !== index && this.webViews[index].deactivate()
+            });
+        }
 
         if (this.queue.length > maxNotDeactivated) {
-            deactivate_tab_family(this.queue.pop());
+            return deactivate_tab_family(this.queue.pop());
         }
-	};
+    };
 
-	_handleTabDelete = (ev) => {
-		const tab = ev.state;
-		if (tab.type !== TabTypes.WEBVIEW) {
-			return;
-		}
+    _handleTabDelete = (ev) => {
+        const tab = ev.state;
+        if (tab.type !== TabTypes.WEBVIEW) {
+            return;
+        }
 
-		this.queue = this.queue.filter((tab_family_id) => {
+        this.queue = this.queue.filter((tab_family_id) => {
             // if there are at least one tab family member
             let result = this.webViews.find((webView, index, views) => {
                 if (views[index] === undefined) {
@@ -85,8 +107,8 @@ class RendererPerTabPolicy {
             });
             return result !== undefined;
         });
-	};
+    };
 }
 
 export default RendererPerTabPolicy;
-export {RendererPerTabPolicy};
+export { RendererPerTabPolicy };

samples/enact-based/src/components/Popup/Popup.js

@@ -7,7 +7,7 @@
 // https://github.com/webosose/com.webos.app.enactbrowser/blob/master/LICENSE
 
 /**
- * Contains the declaration for the Menu component.
+ * Contains the declaration for the Popup component.
  *
  */
 import $L from '@enact/i18n/$L';

samples/enact-based/src/components/Popup/Popup.module.less

@@ -1,37 +1,9 @@
-/* Menu.module.less */
+/* Popup.module.less */
 
 @import '~@enact/agate/styles/skin.less';
 @import '~@enact/agate/styles/variables.less';
 @import '~@enact/agate/styles/mixins.less';
 
-.menuContainer {
-	min-width: 322px;
-}
-
-.MenuPopupButton {
-	width: 20rem !important;
-
-	.contextualPopup .container {
-		width: 20rem;
-	}
-
-	.container {
-		width: 20rem;
-	}
-}
-
-.applySkins({
-	.item {
-		padding: 0;
-		border-bottom-color: transparent;
-		line-height: 48px;
-
-		.focus({
-			border-bottom-color: transparent;
-		});
-}
-});
-
 .NotificationPopup {
 	background-color: white;
 	padding: 0.5%;
@@ -62,7 +34,6 @@
 	margin-right: 3%;
 }
 
-
 .closeIcon {
 	color: black;
 	font-size: 2.2rem !important;

src/WebView.js

@@ -98,8 +98,8 @@ const WebViewMixinBase = {
     deactivate: function WebViewMixin_deactivate() {
         console.log('DEACTIVATE ' + this.rootId);
         if (this.activeState !== 'deactivated') {
-            // document.getElementById(this.rootId).removeChild(this); // TODO: change to terminate
-            // this.activeState = 'deactivated';
+            document.getElementById(this.rootId).removeChild(this); // TODO: change to terminate
+            this.activeState = 'deactivated';
         }
     },