0f606642 · permissionBRICK/SillyTavern

public/script.js+1 -1 Viewed

+                }
             } break;
             case 'import_tags': {
-                await importTags(characters[this_chid], { forceShow: true });
+                await importTags(characters[this_chid], { importSetting: tag_import_setting.ASK });
             } break;
             /*case 'delete_button':
                 popup_type = "del_ch";

public/scripts/BulkEditOverlay.js+3 -3 Viewed

 import { favsToHotswap } from './RossAscends-mods.js';
 import { hideLoader, showLoader } from './loader.js';
 import { convertCharacterToPersona } from './personas.js';
-import { createTagInput, getTagKeyForEntity, getTagsList, printTagList, tag_map, compareTagsForSort, removeTagFromMap, importTags } from './tags.js';
+import { createTagInput, getTagKeyForEntity, getTagsList, printTagList, tag_map, compareTagsForSort, removeTagFromMap, importTags, tag_import_setting } from './tags.js';
 /**
  * Static object representing the actions of the

      */
     async importExistingTags() {
         for (const characterId of this.characterIds) {
-            await importTags(characters[characterId], { importExisting: true });
+            await importTags(characters[characterId], { importSetting: tag_import_setting.ONLY_EXISTING });
+        }
         $('#bulkTagList').empty();

      */
     async importAllTags() {
         for (const characterId of this.characterIds) {
-            await importTags(characters[characterId], { importAll: true });
+            await importTags(characters[characterId], { importSetting: tag_import_setting.ALL });
+        }
         $('#bulkTagList').empty();

public/scripts/tags.js+8 -20 Viewed

+ *
  * @param {Character} character - The character
  * @param {object} [options] - Options
- * @param {boolean} [options.importAll=false] - Whether to import all tags without dialog
+ * @param {tag_import_setting} [options.importSetting=null] - Force a tag import setting
- * @param {boolean} [options.importExisting=false] - Whether to import existing tags without dialog
- * @param {boolean} [options.forceShow=false] - Whether to force showing the import dialog
  * @returns {Promise<boolean>} Boolean indicating whether any tag was imported
  */
-async function importTags(character, { importAll = false, importExisting = false, forceShow = false } = {}) {
+async function importTags(character, { importSetting = null } = {}) {
     // Gather the tags to import based on the selected setting
-    const tagNamesToImport = await handleTagImport(character, { importAll, importExisting, forceShow });
+    const tagNamesToImport = await handleTagImport(character, { importSetting });
     if (!tagNamesToImport?.length) {
         console.debug('No tags to import');
         return;

+ *
  * @param {Character} character - The character
  * @param {object} [options] - Options
- * @param {boolean} [options.importAll=false] - Whether to import all tags without dialog
+ * @param {tag_import_setting} [options.importSetting=null] - Force a tag import setting
- * @param {boolean} [options.importExisting=false] - Whether to import existing tags without dialog
- * @param {boolean} [options.forceShow=false] - Whether to force showing the import dialog
  * @returns {Promise<string[]>} Array of strings representing the tags to import
  */
-async function handleTagImport(character, { importAll = false, importExisting = false, forceShow = false } = {}) {
+async function handleTagImport(character, { importSetting = null } = {}) {
     /** @type {string[]} */
     const importTags = character.tags.map(t => t.trim()).filter(t => t)
         .filter(t => !IMPORT_EXLCUDED_TAGS.includes(t))

         .map(newTag);
     const folderTags = getOpenBogusFolders();
-    // Choose the setting for this dialog. If from settings, verify the setting really exists, otherwise take "ASK".
+    // Choose the setting for this dialog. First check override, then saved setting or finally use "ASK".
-    let setting;
+    const setting = importSetting ? importSetting :
-    if (forceShow) {
+        Object.values(tag_import_setting).find(setting => setting === power_user.tag_import_setting) ?? tag_import_setting.ASK;
-        setting = tag_import_setting.ASK;
-    } else if (importAll) {
-        setting = tag_import_setting.ALL;
-    } else if (importExisting) {
-        setting = tag_import_setting.ONLY_EXISTING;
-    } else {
-        setting = Object.values(tag_import_setting).find(setting => setting === power_user.tag_import_setting) ?? tag_import_setting.ASK;
-    }
     switch (setting) {
         case tag_import_setting.ALL:

Refactor tag import setting override