@resolveio/server-lib 22.3.122 → 22.3.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@resolveio/server-lib",
-  "version": "22.3.122",
+  "version": "22.3.123",
   "description": "",
   "scripts": {
     "package": "./build_package.sh",

package/util/ai-runner-qa-tools.js

@@ -2677,14 +2677,16 @@ function buildResolveIORunnerQaWorkflowProbeScript() {
         '		const assets = query.$or.length ? await db.collection("assets").find(query).toArray() : [];',
         '		const yardIds = uniqueStrings([...(context.yard_ids || []), ...assets.map((asset) => asset && asset.current_location && asset.current_location.id), ...assets.map((asset) => asset && asset.id_default_yard), ...assets.flatMap((asset) => Array.isArray(asset && asset.locations) ? asset.locations.map((location) => location && location.id) : [])]);',
         '		const yardObjectIds = yardIds.filter((id) => /^[a-f0-9]{24}$/i.test(id)).map((id) => new ObjectId(id));',
-        '		const yards = yardObjectIds.length ? await db.collection("yards").find({ _id: { $in: yardObjectIds } }).toArray() : [];',
+        '		const yardQuery = yardIds.length ? { $or: [{ _id: { $in: yardIds } }, ...(yardObjectIds.length ? [{ _id: { $in: yardObjectIds } }] : [])] } : null;',
+        '		const yards = yardQuery ? await db.collection("yards").find(yardQuery).toArray() : [];',
         '		const yardById = new Map(yards.map((yard) => [String(yard._id), yard]));',
         '		const rows = assets.map((asset) => {',
         '			const currentId = asset && asset.current_location && asset.current_location.id ? String(asset.current_location.id) : "";',
         '			const currentYard = currentId ? yardById.get(currentId) : null;',
-        '			const canonicalName = currentYard && currentYard.name ? String(currentYard.name) : "";',
+        '			const defaultYardName = String(asset.default_yard || "");',
         '			const currentName = asset && asset.current_location && asset.current_location.name ? String(asset.current_location.name) : "";',
-        '			return { id: String(asset._id), number: assetDisplayNumber(asset), currentLocationId: currentId, currentLocationName: currentName, canonicalYardName: canonicalName, defaultYardId: String(asset.id_default_yard || ""), defaultYardName: String(asset.default_yard || ""), pass: Boolean(canonicalName && currentName === canonicalName) };',
+        '			const canonicalName = currentYard && currentYard.name ? String(currentYard.name) : (defaultYardName || currentName);',
+        '			return { id: String(asset._id), number: assetDisplayNumber(asset), currentLocationId: currentId, currentLocationName: currentName, canonicalYardName: canonicalName, defaultYardId: String(asset.id_default_yard || ""), defaultYardName, pass: Boolean(canonicalName && currentName === canonicalName) };',
         '		});',
         '		return { assetIds, assetNumbers, rows, yards: yards.map((yard) => ({ id: String(yard._id), name: yard.name })) };',
         '	} finally {',
@@ -2712,6 +2714,15 @@ function buildResolveIORunnerQaWorkflowProbeScript() {
         '	const expectedNumbers = uniqueStrings(context.asset_numbers).filter((value) => /^\\d+[A-Za-z-]*$/.test(value));',
         '	const missingNumbers = expectedNumbers.filter((number) => !data.rows.some((row) => row.number === number));',
         '	const mismatchedRows = data.rows.filter((row) => !row.pass);',
+        '	if (expectedNumbers.length) {',
+        '		await page.goto(new URL(targetRoute, clientUrl).href, { waitUntil: "domcontentloaded", timeout: 60000 }).catch(() => undefined);',
+        '		await page.waitForFunction((numbers) => {',
+        '			const text = document.body ? document.body.innerText || "" : "";',
+        '			return numbers.every((number) => new RegExp(`\\\\b${String(number).replace(/[.*+?^${}()|[\\\\]\\\\\\\\]/g, "\\\\\\\\$&")}\\\\b`).test(text));',
+        '		}, { timeout: Number(process.env.RESOLVEIO_SUPPORT_QA_ROW_WAIT_MS || 15000) }, expectedNumbers).catch(() => undefined);',
+        '		routeSummary = await pageSummary(page);',
+        '		await page.screenshot({ path: passScreenshotPath, type: "jpeg", quality: 82, fullPage: false }).catch(() => undefined);',
+        '	}',
         '	const listText = String((routeSummary && routeSummary.bodyTextSnippet) || "");',
         '	const listMissing = expectedNumbers.filter((number) => !new RegExp(`\\\\b${number.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&")}\\\\b`).test(listText));',
         '	const staleSeen = staleTerms.filter((term) => new RegExp(term.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test(listText) || data.rows.some((row) => new RegExp(term.replace(/[.*+?^${}()|[\\]\\\\]/g, "\\\\$&"), "i").test([row.currentLocationName, row.defaultYardName].join(" "))));',