👌 Integrated feedback

dej611 · dej611 · commit a5c8bdfe0259 · 2021-02-23T18:20:50.000+01:00
diff --git a/src/plugins/expressions/common/expression_functions/specs/map_column.ts b/src/plugins/expressions/common/expression_functions/specs/map_column.ts
@@ -61,7 +61,7 @@ export const mapColumn: ExpressionFunctionDefinition<
       aliases: ['exp', 'fn', 'function'],
       help: i18n.translate('expressions.functions.mapColumn.args.expressionHelpText', {
         defaultMessage:
-          'A {CANVAS} expression that is passed to each row as a single row {DATATABLE}.',
+          'An expression that is executed on every row, provided with a single-row {DATATABLE} context and returning the cell value.',
         values: {
           CANVAS: 'canvas',
           DATATABLE: '`datatable`',
@@ -73,7 +73,7 @@ export const mapColumn: ExpressionFunctionDefinition<
       types: ['string', 'null'],
       help: i18n.translate('expressions.functions.mapColumn.args.copyMetaFromHelpText', {
         defaultMessage:
-          "If set, the meta object from the specified column id is copied over to the specified target column. Throws an exception if the column doesn't exist",
+          "If set, the meta object from the specified column id is copied over to the specified target column. If the column doesn't exist it silently fails.",
       }),
       required: false,
       default: null,
@@ -104,7 +104,7 @@ export const mapColumn: ExpressionFunctionDefinition<
         meta: { type },
       };
       if (args.copyMetaFrom) {
-        const metaSourceFrom = columns.find(({ name }) => name === args.copyMetaFrom);
+        const metaSourceFrom = columns.find(({ id }) => id === args.copyMetaFrom);
         newColumn.meta = { ...newColumn.meta, ...(metaSourceFrom?.meta || {}) };
       }
 
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts
@@ -84,17 +84,30 @@ describe('mapColumn', () => {
   });
 
   it('should copy over the meta information from the specified column', () => {
-    return runFn(testTable, { name: 'name', copyMetaFrom: 'time', expression: pricePlusTwo }).then(
-      (result) => {
-        const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');
-        expect(result.type).toBe('datatable');
-        expect(result.columns[nameColumnIndex]).toEqual({
-          id: 'name',
-          name: 'name',
-          meta: { type: 'date' },
-        });
-      }
-    );
+    return runFn(
+      {
+        ...testTable,
+        columns: [
+          ...testTable.columns,
+          // add a new entry
+          {
+            id: 'myId',
+            name: 'myName',
+            meta: { type: 'date' },
+          },
+        ],
+        rows: testTable.rows.map((row) => ({ ...row, myId: Date.now() })),
+      },
+      { name: 'name', copyMetaFrom: 'myId', expression: pricePlusTwo }
+    ).then((result) => {
+      const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');
+      expect(result.type).toBe('datatable');
+      expect(result.columns[nameColumnIndex]).toEqual({
+        id: 'name',
+        name: 'name',
+        meta: { type: 'date' },
+      });
+    });
   });
 
   it('should be resilient if the references column for meta information does not exists', () => {
