Fix a bug in CSV export where the column "isInstanceOf" would be adde…

…d in addition to "relations.isInstanceOf"
dainst · Dec 2, 2024 · b783c00 · b783c00
1 parent e84f159
commit b783c00
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/desktop/src/app/components/export/csv/csv-export.ts b/desktop/src/app/components/export/csv/csv-export.ts
@@ -47,7 +47,9 @@ export module CSVExport {
                                      combineHierarchicalRelations: boolean = true,
                                      addScanCode: boolean = false) {
 
-        fieldDefinitions = fieldDefinitions.filter(field => field.inputType !== Field.InputType.RELATION);
+        fieldDefinitions = fieldDefinitions.filter(field => {
+            return !Field.InputType.RELATION_INPUT_TYPES.includes(field.inputType);
+        });
 
         const headings: string[] = makeHeadings(
             fieldDefinitions, relations, combineHierarchicalRelations, addScanCode

diff --git a/desktop/test/unit/components/export/csv/csv-export.spec.ts b/desktop/test/unit/components/export/csv/csv-export.spec.ts
@@ -15,6 +15,7 @@ export function makeFieldDefinitions(fieldNames: string[]) {
         if (fieldName.startsWith('period')) inputType = 'dropdownRange';
         if (fieldName.startsWith('relation')) inputType = 'relation';
         if (fieldName.startsWith('composite')) inputType = 'composite';
+        if (fieldName.startsWith('isInstanceOf')) inputType = 'instanceOf';
 
         return { name: fieldName, inputType: inputType };
     }) as Array<Field>;
@@ -88,6 +89,19 @@ describe('CSVExport', () => {
     });
 
 
+    test('export instanceOf field', () => {
+
+        const fields = makeFieldDefinitions(['identifier', 'shortDescription', 'isInstanceOf']);
+        const resource = ifResource('i1', 'identifier1', { en: 'shortDescription1' }, 'category');
+        resource.relations = { isInstanceOf: ['identifier2'] } as any;
+
+        const result = CSVExport.createExportable([resource], fields, ['liesWithin', 'isInstanceOf'], ['en'], ',')
+            .csvData;
+        expect(result[0]).toBe('"identifier","shortDescription.en","relations.isInstanceOf","relations.isChildOf"');
+        expect(result[1]).toBe('"identifier1","shortDescription1","identifier2",""');
+    });
+
+
     function expectCorrectChildOfTarget(resource, t, expectation) {
 
         const result = CSVExport.createExportable([resource], t, Relation.Hierarchy.ALL, ['en'], ',').csvData;