Show select pattern of e-stat data presets (#805)

* Show select pattern of e-stat data presets

* Fix to ignore some property to get ai_manager object

Author: ishii-norimi

js/data/dashboard_estat.js

@@ -20,7 +20,7 @@ describe('classification', () => {
 		await svg.waitForSelector('.points .datas circle')
 		expect((await svg.$$('.points .datas circle')).length).toBe(144)
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page)
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas.length).toBe(144)
 	})

tests/gui/data/air.test.js

@@ -26,7 +26,7 @@ describe('classification', () => {
 		const size = (await svg.$$('.points .datas circle')).length
 		expect(size).toBeGreaterThan(0)
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page, { ignoreProperties: ['_indicatorMetaInfos'] })
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas._x.length).toBe(size)
 	})

tests/gui/data/dashboard_estat.test.js

@@ -25,7 +25,7 @@ describe('classification', () => {
 		await svg.waitForSelector('.points .datas circle')
 		expect((await svg.$$('.points .datas circle')).length).toBe(100)
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page)
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas._x.length).toBe(100)
 	})

tests/gui/data/functional.test.js

@@ -25,7 +25,7 @@ describe('classification', () => {
 		await svg.waitForSelector('.points .datas circle')
 		expect((await svg.$$('.points .datas circle')).length).toBe(150)
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page)
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas._x.length).toBe(150)
 	})

tests/gui/data/iris.test.js

@@ -25,7 +25,7 @@ describe('classification', () => {
 		await svg.waitForSelector('.points .datas circle')
 		expect((await svg.$$('.points .datas circle')).length).toBe(506)
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page)
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas._x.length).toBe(506)
 	})

tests/gui/data/statlib.test.js

@@ -1,57 +1,62 @@
-export default () => {
-	const cp = []
-	const stack = [[ai_manager, 0, cp]]
-	const checked = new Set()
-	while (stack.length > 0) {
-		const [obj, key, parent] = stack.shift()
-		if (obj instanceof Element) {
-			continue
-		}
-		if (checked.has(obj)) {
-			parent[key] = 'Recursive Object'
-		} else if (obj === null) {
-			parent[key] = null
-		} else if (Array.isArray(obj)) {
-			checked.add(obj)
-			const arr = []
-			obj.forEach((v, i) => stack.push([v, i, arr]))
-			parent[key] = arr
-		} else if (typeof obj === 'object') {
-			checked.add(obj)
-			const o = {}
-			const propNames = Object.getOwnPropertyNames(obj)
-			propNames.sort()
-			for (const key of propNames) {
-				try {
-					stack.push([obj[key], key, o])
-				} catch (e) {
-					o[key] = 'error'
-				}
+export default (page, option = {}) => {
+	return page.evaluate(option => {
+		const cp = []
+		const stack = [[ai_manager, 0, cp]]
+		const checked = new Set()
+		while (stack.length > 0) {
+			const [obj, key, parent] = stack.shift()
+			if (obj instanceof Element) {
+				continue
+			}
+			if (option.ignoreProperties && option.ignoreProperties.includes(key)) {
+				continue
 			}
-			let proto = Object.getPrototypeOf(obj)
-			let cnt = 0
-			while (proto && cnt++ < 2) {
-				const descriptors = Object.getOwnPropertyDescriptors(proto)
-				const descriptorNames = Object.keys(descriptors)
-				descriptorNames.sort()
-				for (const key of descriptorNames) {
-					const descriptor = descriptors[key]
-					if (descriptor.get) {
-						try {
-							stack.push([obj[key], key, o])
-						} catch (e) {
-							o[key] = 'error'
+			if (checked.has(obj)) {
+				parent[key] = 'Recursive Object'
+			} else if (obj === null) {
+				parent[key] = null
+			} else if (Array.isArray(obj)) {
+				checked.add(obj)
+				const arr = []
+				obj.forEach((v, i) => stack.push([v, i, arr]))
+				parent[key] = arr
+			} else if (typeof obj === 'object') {
+				checked.add(obj)
+				const o = {}
+				const propNames = Object.getOwnPropertyNames(obj)
+				propNames.sort()
+				for (const key of propNames) {
+					try {
+						stack.push([obj[key], key, o])
+					} catch (e) {
+						o[key] = 'error'
+					}
+				}
+				let proto = Object.getPrototypeOf(obj)
+				let cnt = 0
+				while (proto && cnt++ < 2) {
+					const descriptors = Object.getOwnPropertyDescriptors(proto)
+					const descriptorNames = Object.keys(descriptors)
+					descriptorNames.sort()
+					for (const key of descriptorNames) {
+						const descriptor = descriptors[key]
+						if (descriptor.get) {
+							try {
+								stack.push([obj[key], key, o])
+							} catch (e) {
+								o[key] = 'error'
+							}
 						}
 					}
+					proto = Object.getPrototypeOf(proto)
 				}
-				proto = Object.getPrototypeOf(proto)
+				parent[key] = o
+			} else if (typeof obj === 'function') {
+				parent[key] = obj.toString()
+			} else {
+				parent[key] = obj
 			}
-			parent[key] = o
-		} else if (typeof obj === 'function') {
-			parent[key] = obj.toString()
-		} else {
-			parent[key] = obj
 		}
-	}
-	return JSON.parse(JSON.stringify(cp[0]))
+		return JSON.parse(JSON.stringify(cp[0]))
+	}, option)
 }

tests/gui/helper/aimanager.js

@@ -39,7 +39,7 @@ describe('index', () => {
 		await expect(page.title()).resolves.toMatch('AI on Browser')
 		await page.waitForSelector('#data_menu > *')
 
-		const aiManager = await page.evaluate(getaimanager)
+		const aiManager = await getaimanager(page)
 		expect(aiManager).toBeDefined()
 		expect(aiManager._datas).toBeDefined()
 		expect(aiManager._datas.length).toBe(300)