Add backfill for missing WI entries fields (#4203) * Add backfill for missing WI entries fields Fixes #4202 * Backfill before filter/sorting * Fix array wrapping * Check if characterFilter is array * Add console debug for isArray check * Add isArray check for entry

780bd1fc65145bd95428bacbe17089cffa3fe7a0

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed

Parents: 1ad7662f102bd5b9d74240e8390e2b553745bf20

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

+}
 /**
 + * Adds missing fields to WI entries that are present in the entry template, but not in the data.
 + * Additionally verify that array/object fields are of the expected type.
 + * @param {any[]} data WI entries
 + * @returns {any[]} Data with backfilled fields
 + */
 +function addMissingWorldInfoFields(data) {
 +    data.forEach((entry) => {
 +        // Add missing fields from the template
 +        Object.entries(newWorldInfoEntryTemplate).forEach(([key, value]) => {
 +            if (!Object.hasOwn(entry, key)) {
 +                entry[key] = structuredClone(value);
 +            }
 +        });
++
 +        // Ensure that the key is always an array
 +        if (!Array.isArray(entry.key)) {
 +            console.debug('[WI] Fixing invalid "key" field for entry', entry);
 +            entry.key = [];
 +        }
++
 +        // Ensure that the keysecondary is always an array
 +        if (!Array.isArray(entry.keysecondary)) {
 +            console.debug('[WI] Fixing invalid "keysecondary" field for entry', entry);
 +            entry.keysecondary = [];
 +        }
++
 +        // Ensure that the characterFilter is an object with the expected structure
 +        if (!entry.characterFilter || typeof entry.characterFilter !== 'object' || Array.isArray(entry.characterFilter)) {
 +            entry.characterFilter = {
 +                isExclude: false,
 +                names: [],
 +                tags: [],
 +            };
 +        }
 +    });
++
 +    return data;
 +}
++
 +/**
  * Sorts the given data based on the selected sort option
+ *
  * @param {any[]} data WI entries

         // Convert the data.entries object into an array
         let entriesArray = Object.keys(data.entries).map(uid => {
             const entry = data.entries[uid];
 +            if (!entry || typeof entry !== 'object' || Array.isArray(entry)) {
 +                return null;
 +            }
             entry.displayIndex = entry.displayIndex ?? entry.uid;
             return entry;
 -        });
 +        }).filter(entry => entry !== null);
         // Apply the filter and do the chosen sorting
 +        entriesArray = addMissingWorldInfoFields(entriesArray);
         entriesArray = worldInfoFilter.applyFilters(entriesArray);
         entriesArray = sortWorldInfoEntries(entriesArray);