Fix module application duplicates

jhipster · Aug 28, 2022 · ac42e2d · ac42e2d
1 parent cf6ae9a
commit ac42e2d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/src/main/webapp/app/module/primary/landscape/ComponentLandscape.ts b/src/main/webapp/app/module/primary/landscape/ComponentLandscape.ts
@@ -70,11 +70,12 @@ export class ComponentLandscape {
 
   private selectModuleAndDependencies(module: ElementSlug): void {
     this.selectModule(module);
+
     this.moduleSelectionTree(module).forEach(moduleDependency => this.selectModule(moduleDependency));
   }
 
   public selectModule(module: ElementSlug): void {
-    if (this.unknownElement(module)) {
+    if (this.unknownElement(module) || this.selectedModules.includes(module)) {
       return;
     }
 

diff --git a/src/test/javascript/spec/module/primary/landscape/Landscape.spec.ts b/src/test/javascript/spec/module/primary/landscape/Landscape.spec.ts
@@ -1,6 +1,7 @@
 import { ApplicationListener } from '@/common/primary/applicationlistener/ApplicationListener';
 import { ModuleSlug } from '@/module/domain/ModuleSlug';
 import { ModulesRepository } from '@/module/domain/ModulesRepository';
+import { ModulesToApply } from '@/module/domain/ModulesToApply';
 import { LandscapeVue } from '@/module/primary/landscape';
 import { flushPromises, mount, VueWrapper } from '@vue/test-utils';
 import sinon, { SinonStub } from 'sinon';
@@ -468,9 +469,17 @@ describe('Landscape', () => {
       const wrapper = wrap({ modules });
       await flushPromises();
 
-      await validateInitApplication(wrapper);
+      await wrapper.find(wrappedElement('folder-path-field')).setValue('test');
+      await clickModule('init', wrapper);
+      await clickModule('vue', wrapper);
+      await wrapper.find(wrappedElement('parameter-baseName-field')).setValue('base');
 
-      expect(modules.applyAll.calledOnce).toBe(true);
+      await wrapper.find(wrappedElement('modules-application-button')).trigger('click');
+
+      await flushPromises();
+
+      const [appliedModules] = modules.applyAll.lastCall.args as ModulesToApply[];
+      expect(appliedModules.modules.map(slug => slug.get())).toEqual(['init', 'vue']);
       expect(wrapper.find(wrappedElement('modules-application-button')).attributes('disabled')).toBeUndefined();
 
       const [message] = alertBus.success.lastCall.args;