cleanup

packages/grafana-data/src/transformations/transformDataFrame.ts

@@ -23,7 +23,7 @@ const getOperator =
     }
 
     const defaultOptions = info.transformation.defaultOptions ?? {};
-    const options = { ...defaultOptions, ...config.options, refId: config.refId };
+    const options = { ...defaultOptions, refId: config.refId, ...config.options };
 
     // when running within Scenes, we can skip var interpolation, since it's already handled upstream
     const isScenes = window.__grafanaSceneContext != null;

public/app/features/correlations/Forms/TransformationEditorRow.tsx

@@ -1,4 +1,3 @@
-/* eslint-disable no-restricted-syntax */
 import { css } from '@emotion/css';
 import { useState } from 'react';
 import { useFormContext, useWatch } from 'react-hook-form';

public/app/features/dashboard-scene/panel-edit/PanelDataPane/PanelDataTransformationsTab.test.tsx

@@ -123,7 +123,7 @@ describe('PanelDataTransformationsTab', () => {
     const button = transformationCard.getElementsByTagName('button').item(0);
     await userEvent.click(button!);
     expect(onChangeTransformation).toHaveBeenCalledWith([
-      { id: 'calculateField', options: {} },
+      { id: 'calculateField', options: {}, refId: 'T-A' },
       { id: 'calculateField', options: {} },
     ]);
   });

public/app/features/dashboard/components/TransformationsEditor/TransformationOperationRow.tsx

@@ -1,4 +1,3 @@
-import { css, cx } from '@emotion/css';
 import { useCallback, useEffect, useState } from 'react';
 import { useToggle } from 'react-use';
 import { mergeMap } from 'rxjs';
@@ -11,12 +10,11 @@ import {
   getFrameMatchers,
   transformDataFrame,
   DataFrame,
-  GrafanaTheme2,
 } from '@grafana/data';
 import { selectors } from '@grafana/e2e-selectors';
 import { t } from '@grafana/i18n';
 import { getTemplateSrv, reportInteraction } from '@grafana/runtime';
-import { ConfirmModal, useStyles2 } from '@grafana/ui';
+import { ConfirmModal } from '@grafana/ui';
 import {
   QueryOperationAction,
   QueryOperationToggleAction,
@@ -166,7 +164,7 @@ export const TransformationOperationRow = ({
         index={index}
         transformation={configs[index].transformation}
         transformations={configs.map((config) => config.transformation)}
-        transformationTypeName={uiConfig.name}
+        transformationTypeName={`${index + 1} - ${uiConfig.name}`}
         disabled
         onChange={onChange}
       />