Progress on move entry * Fixed header alignment * Building HTML with browser api instead of string. * jqueryElement.data(key, value) usages converted to jqueryElement.attr(data-key, value) * Logs simplified * Removed success toastry message

bc08d42d0e85db81e5b858267af02121bf63a100

bmen25124 <bmen25124@gmail.com>

Parents: f14c73bfccd10d9edb7f50c05e5146292dca2465

public/scripts/templates/worldInfoKeywordHeaders.html+1 -1 Viewed

-<div id="WIEntryHeaderTitlesPC" class="flex-container wide100p spaceBetween justifyCenter textAlignCenter" style="padding:0 4.5em;">
+<div id="WIEntryHeaderTitlesPC" class="flex-container wide100p spaceBetween justifyCenter textAlignCenter" style="padding:0 7.0em;">
     <small class="flex1" data-i18n="Title/Memo">Title/Memo</small>
     <small style="width: calc(3.5em + 10px)" data-i18n="Strategy">Strategy</small>
     <small style="width: calc(3.5em + 20px)" data-i18n="Position">Position</small>

public/scripts/world-info.js+45 -40 Viewed

  * Use `originalWIDataKeyMap` to find the correct value to be set.
+ *
  * @param {object} data - The data object containing the original data entries.
- * @param {string} uid - The unique identifier of the data entry.
+ * @param {number} uid - The unique identifier of the data entry.
  * @param {string} key - The key of the value to be set.
  * @param {any} value - The value to be set.
  */

     // move button
     const moveButton = template.find('.move_entry_button');
-    moveButton.data('uid', entry.uid);
+    moveButton.attr('data-uid', entry.uid);
-    moveButton.data('current-world', name);
+    moveButton.attr('data-current-world', name);
     moveButton.on('click', async function (e) {
         e.stopPropagation();
         const sourceUid = $(this).data('uid');
         const sourceWorld = $(this).data('current-world');
-        // Loading world info is bad, do we have cache variable?
+        const sourceWorldInfo = await loadWorldInfo(sourceWorld);
-        const sourceName = (await loadWorldInfo(sourceWorld)).entries[sourceUid].comment;
+        if (!sourceWorldInfo) {
+            return;
+        }
+        const sourceName = sourceWorldInfo.entries[sourceUid]?.comment;
+        if (sourceName === undefined) {
+            return;
+        }
+        const select = document.createElement('select');
+        select.id = 'move_entry_target_select';
+        select.classList.add('text_pole', 'wide100p', 'margin-top');
+        const defaultOption = document.createElement('option');
+        defaultOption.value = '';
+        defaultOption.textContent = `-- ${t`Select Target Lorebook`} --`;
+        select.appendChild(defaultOption);
-        let optionsHtml = `<option value="">-- ${t`Select Target Lorebook`} --</option>`;
         let selectableWorldCount = 0;
         world_names.forEach(worldName => {
-            if (worldName !== sourceWorld) { // Exclude the current world
+            if (worldName !== sourceWorld) { // Exclude current world
-                optionsHtml += `<option value="${world_names.indexOf(worldName)}">${worldName}</option>`;
+                const option = document.createElement('option');
-                selectableWorldCount += 1;
+                option.value = world_names.indexOf(worldName).toString();
+                option.textContent = worldName;
+                select.appendChild(option);
+                selectableWorldCount++;
+            }
         });

             return;
+        }
-        const content = `
+        // Create wrapper div
-            <div>${t`Move ${sourceName} to:`}</div>
+        const wrapper = document.createElement('div');
-            <select id="move_entry_target_select" class="text_pole wide100p margin-top">
+        wrapper.textContent = t`Move ${sourceName} to:`;
-                ${optionsHtml}
-            </select>
-        `;
-        const popupPromise = callGenericPopup(content, POPUP_TYPE.CONFIRM, '', {
+        // Create container and append elements
-            okButton: t`Move`,
+        const container = document.createElement('div');
-            cancelButton: t`Cancel`,
+        container.appendChild(wrapper);
-        });
+        container.appendChild(select);
         let selectedWorldIndex = -1;
-        $('#move_entry_target_select').on('change', function () {
+        select.addEventListener('change', function() {
-            /** @type {string} */
+            selectedWorldIndex = this.value === '' ? -1 : Number(this.value);
-            // @ts-ignore
-            const value = $(this).val();
-            selectedWorldIndex = value === '' ? -1 : Number(value);
         });
-        const popupConfirm = await popupPromise;
+        const popupConfirm = await callGenericPopup(container, POPUP_TYPE.CONFIRM, '', {
+            okButton: t`Move`,
+            cancelButton: t`Cancel`,
+        });
         if (!popupConfirm) {
             return;
+        }

+ *
  * @param {string} sourceName - The name of the source lorebook file.
  * @param {string} targetName - The name of the target lorebook file.
- * @param {number|string} uid - The UID of the entry to move from the source lorebook.
+ * @param {number} uid - The UID of the entry to move from the source lorebook.
  * @returns {Promise<boolean>} True if the move was successful, false otherwise.
  */
 export async function moveWorldInfoEntry(sourceName, targetName, uid) {
-    console.log(`[WI] Attempting to move entry UID ${uid} from '${sourceName}' to '${targetName}'`);
-    if (!sourceName || !targetName || uid === undefined || uid === null) {
-        console.error('[WI Move] Missing required arguments.');
-        return false;
-    }
     if (sourceName === targetName) {
-        toastr.warning(t`Source and target lorebooks cannot be the same.`);
         return false;
+    }

         targetData.entries[newUid] = entryToMove;
         delete sourceData.entries[entryUidString];
-        // Remove from originalData if it exists, using the original UID
+        // Remove from originalData if it exists
         deleteWIOriginalDataValue(sourceData, entryUidString);
+        // TODO: setWIOriginalDataValue
         console.debug(`[WI Move] Removed entry UID ${entryUidString} from source '${sourceName}'.`);
-        // Save immediately to reduce chances of inconsistency if the browser is closed
+        await saveWorldInfo(targetName, targetData);
-        // Note: This is not truly atomic. If one save fails, state could be inconsistent.
-        await saveWorldInfo(targetName, targetData, true);
         console.debug(`[WI Move] Saved target lorebook '${targetName}'.`);
-        await saveWorldInfo(sourceName, sourceData, true);
+        await saveWorldInfo(sourceName, sourceData);
         console.debug(`[WI Move] Saved source lorebook '${sourceName}'.`);
-        toastr.success(t`${entryToMove.comment} moved successfully!`);
+        console.log(`[WI Move] ${entryToMove.comment} moved successfully to '${targetName}'.`);
         // Check if the currently viewed book in the editor is the source or target and reload it
         const currentEditorBookIndex = Number($('#world_editor_select').val());