Merge branch 'feature-WG-399b2' into 'feature-WG-337-b3'

WebGde/WebContent/WebGde-Widgets/BPO/returnElement.js

 import { createLoadingScreen, removeLoadingScreen, resetGDE } from "../../script.js";
 import { SCHEMA_FILE_PATH } from "../DataInputWidget/config.js";
 import { validateInput } from "../DataInputWidget/validateInput.js";
+import { goBackToElementListViewer } from "../ElementListWidget/ElementListWidget.js";
 import { removePrompt, showPrompt } from "../LogInWidget/LogInPrompt.js";
 import { PROJECT_CODE } from "../Submit/config.js";
 import { interval } from "../captureMetrics/captureMetrics.js";
@@ -117,6 +118,7 @@ export function createReturnWindow() {
             sessionStorage.removeItem("doctype");
             removePrompt();
             document.getElementById("returnWindow").remove();
+            goBackToElementListViewer();
 
         }else{
             function errorReturn(){

WebGde/WebContent/WebGde-Widgets/ElementListWidget/ElementListWidget.js

 import { createWebGdeInterface } from '../../script.js';
-import { BPO_URL } from '../config.js';
+import { ADD_NEW_OPTION, DOMAIN } from '../config.js';
 import { DocumentControlWidget } from "../documentControlWidget/documentControlWidget.js";
 import { INDEXED_DB_STORAGE, HIGHLIGHT_OBJECT, IMAGE_VIEWER_OBJECT, INDEXED_DB_NAME, INDEXED_DB_TBL_NAME, setIndexedDBStorage, setHighlightObject, setImageViewerObject, setBPOObject, BPO_OBJECT, DISPLAY_FIELD_OBJECT, setDisplayFieldObject, activateGDE, setDocumentControlObject, DOCUMENT_CONTROL_OBJECT, IS_GDE_ACTIVATED } from "../globalVariable.js";
 
-
-const API_ROOT = `${BPO_URL}req`;
+const API_ROOT = `${DOMAIN}/bpo/req`;
 
 export class ElementListWidget {
 	global = {
@@ -140,14 +139,18 @@ export class ElementListWidget {
 
 		buttonContainer.appendChild(this.global.encodeButton);
 
-		const newButton = document.createElement("button");
-		newButton.id = "new-btn";
-		newButton.textContent = "NEW";
-		newButton.addEventListener("click", () => this.handleNewClick());
-		buttonContainer.appendChild(newButton);
+		if (ADD_NEW_OPTION === 'Y'){
+			const newButton = document.createElement("button");
+			newButton.id = "new-btn";
+			newButton.textContent = "NEW";
+			newButton.addEventListener("click", () => this.handleNewClick());
+			buttonContainer.appendChild(newButton);
+	
+			this.global.newButton = newButton;
+		}
 
 		this.global.container.appendChild(buttonContainer);
-		this.global.newButton = newButton;
+
 	}
 
 
@@ -237,7 +240,7 @@ export class ElementListWidget {
 		inputContainer.appendChild(DOCUMENT_CONTROL_OBJECT.getWidget());
 
 		// Call assignElementToWorker to assign the selected element to the current worker
-		const assignResponse = await assignElementToWorker(this.global.workerId, this.nodeId, this.global.queueIndex);
+		const assignResponse = await assignElementToWorker(this.global.workerId, this.nodeId, this.global.queueIndex, elementId);
 		if (!assignResponse.successful) {
 			console.error('Failed to assign element to worker:', assignResponse);
 			return;
@@ -255,9 +258,8 @@ async function fetchElementsForNode(nodeId) {
 	return await response.json();
 }
 
-
-async function assignElementToWorker(workerId, nodeId, queueIndex) {
-	const response = await fetch(`${API_ROOT}/workers/${workerId}/nodes/${nodeId}/elements/${queueIndex}`);
+async function assignElementToWorker(workerId, nodeId, queueIndex, elementId) {
+	const response = await fetch(`${API_ROOT}/workers/${workerId}/nodes/${nodeId}/elements/${queueIndex}/${elementId}`);
 	return await response.json();
 }
 

WebGde/WebContent/WebGde-Widgets/config.js

@@ -31,6 +31,7 @@ export const ENCODING_PASS = "PASS1"
 export const NEXT_NODE = "Complete"
 export const EXCEPTION_NODE = "Exception"
 export const SHOW_ELEMENT_LIST_VIEWER = "Y"
+export const ADD_NEW_OPTION = "Y"
 
 export const PDF_EXTENSION = ".pdf"
 export const JPG_EXTENSION = ".jpg"