Issue #3463875 by spokje, jrb, godotislate, smustgrave: Ensure uniqueBundleId is unique in LoadJS (9b977fc3) · Commits · project / drupal

core/misc/ajax.js

+36 −35

Original line number	Diff line number	Diff line
		@@ -1716,8 +1716,9 @@
		}

		const allUniqueBundleIds = response.data.map(function (style) {
		const uniqueBundleId = style.href + ajax.instanceIndex;
		const uniqueBundleId = style.href;
		// Force file to load as a CSS stylesheet using 'css!' flag.
		if (!loadjs.isDefined(uniqueBundleId)) {
		loadjs(`css!${style.href}`, uniqueBundleId, {
		before(path, styleEl) {
		// This allows all attributes to be added, like media.
		@@ -1726,6 +1727,7 @@
		});
		},
		});
		}
		return uniqueBundleId;
		});
		// Returns the promise so that the next AJAX command waits on the
		@@ -1791,10 +1793,8 @@
		const parentEl = document.querySelector(response.selector \|\| 'body');
		const settings = ajax.settings \|\| drupalSettings;
		const allUniqueBundleIds = response.data.map((script) => {
		// loadjs requires a unique ID, and an AJAX instance's `instanceIndex`
		// is guaranteed to be unique.
		// @see Drupal.behaviors.AJAX.detach
		const uniqueBundleId = script.src + ajax.instanceIndex;
		const uniqueBundleId = script.src;
		if (!loadjs.isDefined(uniqueBundleId)) {
		loadjs(script.src, uniqueBundleId, {
		// The default loadjs behavior is to load script with async, in Drupal
		// we need to explicitly tell scripts to load async, this is set in
		@@ -1817,6 +1817,7 @@
		return false;
		},
		});
		}
		return uniqueBundleId;
		});
		// Returns the promise so that the next AJAX command waits on the

core/modules/config/tests/src/FunctionalJavascript/ConfigImportUIAjaxTest.php

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?php

		declare(strict_types=1);

		namespace Drupal\Tests\config\FunctionalJavascript;

		use Drupal\FunctionalJavascriptTests\WebDriverTestBase;

		/**
		* Tests the user interface for importing configuration.
		*
		* @group config
		*/
		class ConfigImportUIAjaxTest extends WebDriverTestBase {

		/**
		* {@inheritdoc}
		*/
		protected static $modules = [
		'config',
		];

		/**
		* {@inheritdoc}
		*/
		protected $defaultTheme = 'stark';

		/**
		* Tests an updated configuration object can be viewed more than once.
		*/
		public function testImport(): void {
		$name = 'system.site';
		$assert_session = $this->assertSession();
		$page = $this->getSession()->getPage();

		$user = $this->drupalCreateUser(['synchronize configuration']);
		$this->drupalLogin($user);
		$this->copyConfig($this->container->get('config.storage'), $this->container->get('config.storage.sync'));

		// Create updated configuration object.
		$new_site_name = 'Config import test ' . $this->randomString();
		$sync = $this->container->get('config.storage.sync');

		// Create updated configuration object.
		$config_data = $this->config('system.site')->get();
		$config_data['name'] = $new_site_name;
		$sync->write('system.site', $config_data);
		$this->assertTrue($sync->exists($name), $name . ' found.');

		// Verify that system.site appears as ready to import.
		$this->drupalGet('admin/config/development/configuration');
		$this->assertSession()->responseContains('<td>' . $name);
		$this->assertSession()->buttonExists('Import all');

		// Click the dropbutton to show the differences in a modal and close it.
		$page->find('css', '.dropbutton-action')->click();
		$assert_session->waitForElementVisible('css', '.ui-dialog');
		$assert_session->assertVisibleInViewport('css', '.ui-dialog .ui-dialog-content');
		$page->pressButton('Close');
		$assert_session->assertNoElementAfterWait('css', '.ui-dialog');

		// Do this again to make sure no JavaScript errors occur on revisits.
		$page->find('css', '.dropbutton-action')->click();
		$assert_session->waitForElementVisible('css', '.ui-dialog');
		$assert_session->assertVisibleInViewport('css', '.ui-dialog .ui-dialog-content');
		$page->pressButton('Close');
		$assert_session->assertNoElementAfterWait('css', '.ui-dialog');
		}

		}