fix: configurable enum filters work with enum name in additional field (

#1706)
Aam-Digital · Feb 7, 2023 · b303533 · b303533
1 parent 99a5290
commit b303533
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 4 deletions.
diff --git a/src/app/core/entity-components/entity-list/filter-generator.service.spec.ts b/src/app/core/entity-components/entity-list/filter-generator.service.spec.ts
@@ -65,16 +65,33 @@ describe("FilterGeneratorService", () => {
     interactionTypes.push({ key: "all", label: "All" });
     const schema = Note.schema.get("category");
 
-    const filter = (await service.generate([{ id: "category" }], Note, []))[0];
+    let filter = (await service.generate([{ id: "category" }], Note, []))[0];
 
     expect(filter.filterSettings.label).toEqual(schema.label);
     expect(filter.filterSettings.name).toEqual("category");
-    const comparableOptions = filter.filterSettings.options.map((option) => {
+    let comparableOptions = filter.filterSettings.options.map((option) => {
+      return { key: option.key, label: option.label };
+    });
+    expect(comparableOptions).toEqual(
+      jasmine.arrayWithExactContents(interactionTypes)
+    );
+
+    // enum name in additional field
+    const schemaAdditional = {
+      dataType: schema.dataType,
+      additional: schema.innerDataType,
+    };
+    Note.schema.set("otherEnum", schemaAdditional);
+
+    filter = (await service.generate([{ id: "otherEnum" }], Note, []))[0];
+
+    comparableOptions = filter.filterSettings.options.map((option) => {
       return { key: option.key, label: option.label };
     });
     expect(comparableOptions).toEqual(
       jasmine.arrayWithExactContents(interactionTypes)
     );
+    Note.schema.delete("otherEnum");
   });
 
   it("should create a entity filter", async () => {

diff --git a/src/app/core/entity-components/entity-list/filter-generator.service.ts b/src/app/core/entity-components/entity-list/filter-generator.service.ts
@@ -40,7 +40,7 @@ export class FilterGeneratorService {
     filtersConfig: FilterConfig[],
     entityConstructor: EntityConstructor<T>,
     data: T[],
-    onlyShowUsedOptions: boolean = false
+    onlyShowUsedOptions = false
   ): Promise<FilterComponentSettings<T>[]> {
     const filterSettings: FilterComponentSettings<T>[] = [];
     for (const filter of filtersConfig) {
@@ -91,7 +91,7 @@ export class FilterGeneratorService {
     } else if (schema.dataType === "configurable-enum") {
       return this.createConfigurableEnumFilterOptions(
         config.id,
-        schema.innerDataType
+        schema.additional ?? schema.innerDataType
       );
     } else if (
       this.entities.has(config.type) ||