Add support for merging yup form configurations instead of overriding…

… them in store

.changeset/strange-steaks-raise.md

@@ -0,0 +1,5 @@
+---
+"@croz/nrich-form-configuration-core": patch
+---
+
+Add support for merging yup form configurations instead of overriding them in store

libs/form-configuration/core/src/loader/fetch-form-configurations.ts

@@ -19,6 +19,13 @@ import { FormConfiguration, FormConfigurationConfiguration, FormYupConfiguration
 import { FormConfigurationValidationConverter } from "../converter";
 import { useFormConfigurationStore } from "../store";
 
+const mergeFormYupConfigurationsWithoutDuplicates = (oldFormYupConfiguration: FormYupConfiguration[], newFormYupConfiguration: FormYupConfiguration[]) => {
+  const mergedFormYupConfigurations = [...oldFormYupConfiguration, ...newFormYupConfiguration];
+
+  // next line removes all duplicates based on formId
+  return [...new Map(mergedFormYupConfigurations.map((item) => [item.formId, item])).values()];
+};
+
 export const fetchFormConfigurations = async ({ url, requestOptionsResolver, additionalValidatorConverters }: FormConfigurationConfiguration): Promise<FormConfiguration[]> => {
   const formConfigurationValidationConverter = new FormConfigurationValidationConverter(additionalValidatorConverters);
   const additionalOptions = requestOptionsResolver?.() || {};
@@ -40,7 +47,7 @@ export const fetchFormConfigurations = async ({ url, requestOptionsResolver, add
         yupSchema: formConfigurationValidationConverter.convertFormConfigurationToYupSchema(item.constrainedPropertyConfigurationList),
       });
     });
-    useFormConfigurationStore.getState().set(formYupConfigurations);
+    useFormConfigurationStore.getState().set(mergeFormYupConfigurationsWithoutDuplicates(useFormConfigurationStore.getState().formYupConfigurations, formYupConfigurations));
     useFormConfigurationStore.getState().setFormConfigurationLoaded(true);
   }
 

libs/form-configuration/core/test/loader/fetch-form-configurations.test.ts

@@ -17,20 +17,21 @@
 
 import { fetchFormConfigurations } from "../../src/loader";
 import { useFormConfigurationStore } from "../../src/store";
-import { mockFormConfigurations, mockValidatorConverters } from "../testutil/form-configuration-generating-util";
+import { mockFormConfigurations, mockFormYupConfigurations, mockValidatorConverters } from "../testutil/form-configuration-generating-util";
 import { setupFormConfigurationServer } from "../testutil/setup-form-configuration-server";
 
 const server = setupFormConfigurationServer();
 
 beforeAll(() => {
+  useFormConfigurationStore.getState().set([mockFormYupConfigurations[0]]);
   server.listen();
 });
 
 afterEach(() => server.resetHandlers());
 afterAll(() => server.close());
 
 describe("@croz/nrich-form-configuration-core/fetch-form-configurations", () => {
-  it("should resolve form configurations", async () => {
+  it("should resolve form configurations and not add duplicates to store", async () => {
     // when
     const response = await fetchFormConfigurations({ url: "/test-url", additionalValidatorConverters: mockValidatorConverters });