reset stored and in memory properties when change folder path

Fix jhipster#6279
renanfranca · May 29, 2023 · a7b4254 · a7b4254
1 parent 9aeeca0
commit a7b4254
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 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
@@ -347,6 +347,7 @@ export default defineComponent({
     const updateFolderPath = (path: string): void => {
       folderPath.value = path;
       moduleParameters.storeFolderPath(folderPath.value);
+      moduleParametersValues.value.clear();
     };
 
     const projectFolderUpdated = (): void => {
@@ -362,9 +363,7 @@ export default defineComponent({
       landscape.value.loaded(landscapeValue().resetAppliedModules(projectHistory.modules));
 
       projectHistory.properties.forEach(property => {
-        if (unknownProperty(property.key)) {
-          moduleParametersValues.value.set(property.key, property.value);
-        }
+        moduleParametersValues.value.set(property.key, property.value);
       });
       moduleParameters.store(moduleParametersValues.value);
     };

diff --git a/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts b/src/main/webapp/app/module/primary/modules-patch/ModulesPatch.component.ts
@@ -140,6 +140,8 @@ export default defineComponent({
 
     const updateFolderPath = (path: string): void => {
       folderPath.value = path;
+      moduleParameters.storeFolderPath(folderPath.value);
+      moduleParametersValues.value.clear();
     };
 
     const updateProperty = (property: ModuleParameter): void => {
@@ -260,9 +262,7 @@ export default defineComponent({
       appliedModules.value = projectHistory.modules.map(module => module.get());
 
       projectHistory.properties.forEach(property => {
-        if (unknownProperty(property.key)) {
-          moduleParametersValues.value.set(property.key, property.value);
-        }
+        moduleParametersValues.value.set(property.key, property.value);
       });
       moduleParameters.store(moduleParametersValues.value);
     };

diff --git a/src/test/javascript/spec/module/primary/landscape/LandscapeComponent.spec.ts b/src/test/javascript/spec/module/primary/landscape/LandscapeComponent.spec.ts
@@ -733,7 +733,7 @@ describe('Landscape', () => {
       expect(wrapper.find(wrappedElement('init-module')).exists()).toBe(true);
     });
 
-    it('Should not replace user setted properties from history', async () => {
+    it('Should replace user setted properties from history', async () => {
       const modules = repositoryWithLandscape();
       const wrapper = wrap({ modules });
       await flushPromises();
@@ -743,7 +743,7 @@ describe('Landscape', () => {
       await updatePath(wrapper);
 
       const baseNameField = wrapper.find(wrappedElement('parameter-baseName-field')).element as HTMLInputElement;
-      expect(baseNameField.value).toBe('pouet');
+      expect(baseNameField.value).toBe('settedbase');
     });
   });
 

diff --git a/src/test/javascript/spec/module/primary/modules-patch/ModulesPatchComponent.spec.ts b/src/test/javascript/spec/module/primary/modules-patch/ModulesPatchComponent.spec.ts
@@ -500,16 +500,16 @@ describe('Modules', () => {
       expect(baseNameField.value).toBe('settedbase');
     });
 
-    it('It should not override setted properties', async () => {
+    it('It should override setted properties from history', async () => {
       const modules = repositoryWithModules();
       modules.history.resolves(defaultProjectHistory());
       const wrapper = await filledModuleForm(modules);
 
-      wrapper.find(wrappedElement('folder-path-field')).trigger('blur');
+      await wrapper.find(wrappedElement('folder-path-field')).trigger('blur');
       await flushPromises();
 
       const baseNameField = wrapper.find(wrappedElement('parameter-baseName-field')).element as HTMLInputElement;
-      expect(baseNameField.value).toBe('test');
+      expect(baseNameField.value).toBe('settedbase');
     });
   });