From 2d0444b64edbc0721b496b40e3f38ecbd45a27f6 Mon Sep 17 00:00:00 2001
From: Chaitanya Sammetla <chaitanya.sammetla@liferay.com>
Date: Thu, 21 Aug 2025 16:22:07 +0530
Subject: [PATCH] LPP-60015 persist previous page values in multiSelect
 itemSelector

---
 .../ViewItemSelectorViewDescriptorMultiple.ts | 72 ++++++++++++++++---
 1 file changed, 61 insertions(+), 11 deletions(-)

diff --git a/modules/apps/item-selector/item-selector-web/src/main/resources/META-INF/resources/js/ViewItemSelectorViewDescriptorMultiple.ts b/modules/apps/item-selector/item-selector-web/src/main/resources/META-INF/resources/js/ViewItemSelectorViewDescriptorMultiple.ts
index c7b2496f8eedbf..ca5742864a7ccc 100644
--- a/modules/apps/item-selector/item-selector-web/src/main/resources/META-INF/resources/js/ViewItemSelectorViewDescriptorMultiple.ts
+++ b/modules/apps/item-selector/item-selector-web/src/main/resources/META-INF/resources/js/ViewItemSelectorViewDescriptorMultiple.ts
@@ -16,25 +16,75 @@ export default function ({
 	itemSelectorSelectedEvent,
 	namespace,
 }: Props) {
+	const searchContainer = Liferay.SearchContainer.get(`${namespace}entries`);
+	const containerId = `${namespace}entries`;
 
-	// @ts-ignore
+	const GLOBAL_KEY = `${namespace}__idToJsonMap`;
+	const idToJsonMap: Map<string, string> =
+		(window as any)[GLOBAL_KEY] || new Map<string, string>();
+	(window as any)[GLOBAL_KEY] = idToJsonMap;
 
-	const searchContainer = Liferay.SearchContainer.get(`${namespace}entries`);
+	const getContainer = (): HTMLElement | null =>
+		document.getElementById(containerId);
+
+	const getIdFromJsonString = (
+		jsonStr: string | undefined | null
+	): string | null => {
+		if (!jsonStr) {return null;}
+		try {
+			const obj = JSON.parse(jsonStr);
+			const id = obj?.assetEntryId ?? obj?.classPK;
+
+			return id != null ? String(id) : null;
+		}
+		catch {
+			return null;
+		}
+	};
+
+	const indexVisibleRows = () => {
+		const container = getContainer();
+		if (!container) {return;}
+
+		const rows = container.querySelectorAll<HTMLElement>(
+			'li[data-value], tr[data-value], dd[data-value]'
+		);
+
+		rows.forEach((row) => {
+			const jsonStr = row.dataset.value;
+			const id = getIdFromJsonString(jsonStr);
+			if (id && jsonStr) {
+				idToJsonMap.set(id, jsonStr);
+			}
+		});
+	};
+
+	const getSelectedIds = (): string[] => {
+		const nodeList = searchContainer.select.getAllSelectedElements();
+		const ids: string[] = [];
+
+		nodeList.each((node: any) => {
+			const v = node.get('value');
+			if (v != null) {ids.push(String(v));}
+		});
+
+		return Array.from(new Set(ids));
+	};
+
+	const buildPayload = (): string[] => {
+		indexVisibleRows();
+		const ids = getSelectedIds();
+
+		return ids.map((id) => idToJsonMap.get(id) ?? id);
+	};
 
 	const searchContainerOnHandler = searchContainer.on('rowToggled', () => {
-		const searchContainerItems: HTMLElement[] = searchContainer.select
-			.getAllSelectedElements()
-			.getDOMNodes();
+		const payload = buildPayload();
 
 		getOpener().Liferay.fire(itemSelectorSelectedEvent, {
 			data: {
 				returnType: itemSelectorReturnType,
-				value: searchContainerItems
-					.map((item: HTMLElement) => item.closest('li, tr, dd'))
-					.filter((domElement): domElement is HTMLElement =>
-						Boolean(domElement)
-					)
-					.map((domElement) => domElement.dataset.value),
+				value: payload,
 			},
 		});
 	});