Merge pull request #10663 from qmonmert/fix/10660

Fix: preset modules selected and deselected
jhipster · Aug 24, 2024 · b15920f · b15920f
2 parents 627b98a + c2e6ca6
commit b15920f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 0 deletions.
diff --git a/src/main/webapp/app/module/primary/landscape/Landscape.component.ts b/src/main/webapp/app/module/primary/landscape/Landscape.component.ts
@@ -411,6 +411,12 @@ export default defineComponent({
         return;
       }
 
+      landscapeValue()
+        .selectedModules()
+        .forEach(module => {
+          landscape.value.loaded(landscapeValue().toggle(module));
+        });
+
       preset.modules.forEach(module => {
         landscape.value.loaded(landscapeValue().toggle(module));
       });

diff --git a/src/test/webapp/unit/module/domain/Modules.fixture.ts b/src/test/webapp/unit/module/domain/Modules.fixture.ts
@@ -189,6 +189,14 @@ export const defaultPresets = (): Presets => ({
       name: 'init-maven',
       modules: [moduleSlug('init'), moduleSlug('maven')],
     },
+    {
+      name: 'init-prettier',
+      modules: [moduleSlug('application-service-hexagonal-architecture-documentation'), moduleSlug('init'), moduleSlug('prettier')],
+    },
+    {
+      name: 'init-typescript',
+      modules: [moduleSlug('init'), moduleSlug('typescript'), moduleSlug('application-service-hexagonal-architecture-documentation')],
+    },
   ],
 });
 

diff --git a/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts b/src/test/webapp/unit/module/primary/landscape/LandscapeComponent.spec.ts
@@ -1119,6 +1119,22 @@ describe('Landscape', () => {
       });
     });
 
+    it('should select modules from selected preset when preset option is updated multiple times', async () => {
+      let { initModuleElement } = await setupAndSelectPreset('init-prettier');
+
+      let classes = initModuleElement.classes();
+      ['-selected', '-compacted'].forEach(expectedClass => {
+        expect(classes).toContain(expectedClass);
+      });
+
+      ({ initModuleElement } = await setupAndSelectPreset('init-typescript'));
+
+      classes = initModuleElement.classes();
+      ['-selected', '-compacted'].forEach(expectedClass => {
+        expect(classes).toContain(expectedClass);
+      });
+    });
+
     it('should retain module selection state when preset option is deselected', async () => {
       const { presetComponent, initModuleElement } = await setupAndSelectPreset('init-maven');
 

diff --git a/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts b/src/test/webapp/unit/module/secondary/RestModulesRepository.spec.ts
@@ -315,6 +315,14 @@ const restPresets = (): Presets => ({
       name: 'init-maven',
       modules: [moduleSlug('init'), moduleSlug('maven')],
     },
+    {
+      name: 'init-prettier',
+      modules: [moduleSlug('application-service-hexagonal-architecture-documentation'), moduleSlug('init'), moduleSlug('prettier')],
+    },
+    {
+      name: 'init-typescript',
+      modules: [moduleSlug('init'), moduleSlug('typescript'), moduleSlug('application-service-hexagonal-architecture-documentation')],
+    },
   ],
 });