Fix(enrichment): Add dataset columns to initial visited nodes

src/api/controller/api/enrichment.js

@@ -13,7 +13,6 @@ import {
 import { cancelJob, getActiveJob } from '../../workers/tools';
 import { getLocale } from 'redux-polyglot/dist/selectors';
 import { orderEnrichmentsByDependencies } from '../../services/orderEnrichmentsByDependencies';
-import enrichment from '../../../app/js/admin/enrichment';
 
 export const setup = async (ctx, next) => {
     try {
@@ -168,10 +167,14 @@ export const enrichmentDataPreview = async (ctx) => {
 };
 
 export const launchAllEnrichment = async (ctx) => {
+    const datasetColumns = await ctx.dataset.getColumns();
     const enrichments = await ctx.enrichment.findAll();
-    const orderedEnrichments = orderEnrichmentsByDependencies(enrichments);
+    const orderedEnrichments = orderEnrichmentsByDependencies(
+        datasetColumns.map((column) => column.key),
+        enrichments,
+    );
 
-    for (const [i, enrichment] of orderedEnrichments.entries()) {
+    for (const enrichment of orderedEnrichments) {
         if (enrichment.status === 'FINISHED') {
             await ctx.dataset.removeAttribute(enrichment.name);
         }

src/api/controller/api/enrichment.spec.js

@@ -185,6 +185,7 @@ describe('Enrichment controller', () => {
                     updateStatus: jest.fn(async () => {}),
                 },
                 dataset: {
+                    getColumns: jest.fn().mockResolvedValue([]),
                     removeAttribute: jest.fn(async () => {}),
                 },
                 tenant: 'test',
@@ -230,6 +231,7 @@ describe('Enrichment controller', () => {
                     updateStatus: jest.fn(async () => {}),
                 },
                 dataset: {
+                    getColumns: jest.fn().mockResolvedValue([]),
                     removeAttribute: jest.fn(async () => {}),
                 },
                 tenant: 'test',
@@ -267,6 +269,7 @@ describe('Enrichment controller', () => {
                     updateStatus: jest.fn(async () => {}),
                 },
                 dataset: {
+                    getColumns: jest.fn().mockResolvedValue([]),
                     removeAttribute: jest.fn(async () => {}),
                 },
                 tenant: 'test',

src/api/services/orderEnrichmentsByDependencies.js

@@ -8,7 +8,7 @@
  * @param {Enrichment[]} enrichments
  * @returns {Enrichment[]}
  */
-export function orderEnrichmentsByDependencies(enrichments) {
+export function orderEnrichmentsByDependencies(datasetColumns, enrichments) {
     /**
      * @type {Enrichment[]}
      */
@@ -17,7 +17,7 @@ export function orderEnrichmentsByDependencies(enrichments) {
     /**
      * @type {Set<string>}
      */
-    const visitedEnrichments = new Set();
+    const visitedEnrichments = new Set(datasetColumns);
 
     /**
      * @type {Enrichment[]}

src/api/services/orderEnrichmentsByDependencies.spec.js

@@ -2,14 +2,14 @@ import { orderEnrichmentsByDependencies } from './orderEnrichmentsByDependencies
 
 describe('orderEnrichmentsByDependencies', () => {
     it('should return empty array if no enrichments', () => {
-        expect(orderEnrichmentsByDependencies([])).toStrictEqual([]);
+        expect(orderEnrichmentsByDependencies([], [])).toStrictEqual([]);
     });
 
     it('should not change order if no dependencies between enrichments', () => {
-        const A = { name: 'A' };
+        const A = { name: 'A', sourceColumn: '1' };
         const B = { name: 'B' };
         const C = { name: 'C' };
-        expect(orderEnrichmentsByDependencies([C, A, B])).toStrictEqual([
+        expect(orderEnrichmentsByDependencies(['1'], [C, A, B])).toStrictEqual([
             C,
             A,
             B,
@@ -21,7 +21,7 @@ describe('orderEnrichmentsByDependencies', () => {
         const B = { name: 'B' };
         const C = { name: 'C', sourceColumn: 'B' };
         const D = { name: 'D', sourceColumn: 'A' };
-        expect(orderEnrichmentsByDependencies([D, A, B, C])).toStrictEqual([
+        expect(orderEnrichmentsByDependencies([], [D, A, B, C])).toStrictEqual([
             A,
             B,
             C,
@@ -33,7 +33,9 @@ describe('orderEnrichmentsByDependencies', () => {
         const A = { name: 'A' };
         const B = { name: 'B' };
         const C = { name: 'C', sourceColumn: 'D' };
-        expect(() => orderEnrichmentsByDependencies([A, B, C, D])).toThrow();
+        expect(() =>
+            orderEnrichmentsByDependencies([], [A, B, C, D]),
+        ).toThrow();
     });
 
     it('should throw an error if there is a circular dependency', () => {
@@ -42,7 +44,11 @@ describe('orderEnrichmentsByDependencies', () => {
         const C = { name: 'C', sourceColumn: 'D' };
         const D = { name: 'D', sourceColumn: 'C' };
         const E = { name: 'E' };
-        expect(() => orderEnrichmentsByDependencies([A, B, C, D])).toThrow();
-        expect(() => orderEnrichmentsByDependencies([A, B, C, D, E])).toThrow();
+        expect(() =>
+            orderEnrichmentsByDependencies([], [A, B, C, D]),
+        ).toThrow();
+        expect(() =>
+            orderEnrichmentsByDependencies([], [A, B, C, D, E]),
+        ).toThrow();
     });
 });