Async logic fixes

0e81fb6a4a449ae49e7055027669e2eee581ac47

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

public/scripts/extensions.js+6 -13 Viewed

 import { showLoader } from './loader.js';
 import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
 import { renderTemplate, renderTemplateAsync } from './templates.js';
 import { delay, isSubsetOf, setValueByPath } from './utils.js';
 import { getContext } from './st-context.js';
 import { isAdmin } from './user.js';
 import { t } from './i18n.js';

     const abortController = new AbortController();
     let popupPromise;
     try {
 +        // If we are updating an extension, the "old" popup is still active. We should close that.
 +        await Popup.util.popups.find(popup => popup.content.querySelector('.extensions_info'))?.completeCancelled();
         const htmlDefault = $('<div class="marginBot10"><h3 class="textAlignCenter">Built-in Extensions:</h3></div>');
         const htmlExternal = $('<div class="marginBot10"><h3 class="textAlignCenter">Installed Extensions:</h3></div>');
         const htmlLoading = $(`<div class="flex-container alignItemsCenter justifyCenter marginTop10 marginBot5">

             },
         };
 -        // If we are updating an extension, the "old" popup is still active. We should close that.
 -        const oldPopup = Popup.util.popups.find(popup => popup.content.querySelector('.extensions_info'));
 -        if (oldPopup) {
 -            await oldPopup.complete(POPUP_RESULT.CANCELLED);
 -        }
+-
         let waitingForSave = false;
         const popup = new Popup(html, POPUP_TYPE.TEXT, '', {

         const data = await response.json();
         if (!quiet) {
             awaitvoid showExtensionsDetails();
+        }
         if (data.isUpToDate) {

         toastr.success(t`Extension ${extensionName} moved.`);
         await loadExtensionSettings({}, false, false);
 -        await Popup.util.popups.find(popup => popup.content.querySelector('.extensions_info'))?.completeCancelled();
 +        void showExtensionsDetails();
 -        showExtensionsDetails();
     } catch (error) {
         console.error('Error:', error);
+    }

@@ -934,9 +929,7 @@ export async function deleteExtension(extensionName) {
934	929	}
935	930
936	931	toastr.success(t`Extension ${extensionName} deleted`);
937		- showExtensionsDetails();
	932	+ delay(1000).then(() => location.reload());
938		- // reload the page to remove the extension from the list
939		- location.reload();
940	933	}
941	934
942	935	/**