Fix duplicate chart fields when replacing a dataset (#1776)

Author: kuzmadom

src/ui/units/wizard/actions/preview.ts

@@ -72,7 +72,7 @@ export function setUpdates({updates}: {updates: Update[]}): SetUpdatesAction {
 
 type ActualizeAndSetUpdatesArgs = {
     updates: Update[];
-    onUpdateItemsGuids?: string[];
+    onUpdateItemsGuids?: {guid: string; datasetId?: string}[];
     shouldMergeUpdatesFromState?: boolean;
 };
 

src/ui/units/wizard/actions/utils/getDatasetUpdates.ts

@@ -67,10 +67,19 @@ function isDeleteUpdate(update: Update) {
     return update.action === 'delete' || update.action === 'delete_field';
 }
 
-function mergeUpdates(prevUpdates: Update[], updates: Update[], datasetId: string) {
+function mergeUpdates(args: {
+    prevUpdates: Update[];
+    updates: Update[];
+    datasetId: string;
+    availableDatasetIds: string[];
+}) {
+    const {prevUpdates, updates, datasetId, availableDatasetIds} = args;
+    const usedDatasetIds = new Set([...availableDatasetIds, datasetId]);
     // Here we delete the old updates that are not relevant, so as not to store them,
     const filteredOldUpdates = prevUpdates.reduceRight((acc: Update[], newestOldUpdate) => {
         const needsDelete =
+            (newestOldUpdate.field.datasetId &&
+                !usedDatasetIds.has(newestOldUpdate.field.datasetId)) ||
             isDeleteUpdate(newestOldUpdate) ||
             updates.some((newUpdate: Update) => {
                 const fieldDatasetId = newUpdate.field.datasetId || datasetId;
@@ -353,7 +362,12 @@ export function getDatasetUpdates(args: UpdateDatasetArgs) {
     });
 
     result.schema = newResultSchema;
-    result.updates = mergeUpdates(oldUpdates, updates, dataset.id);
+    result.updates = mergeUpdates({
+        prevUpdates: oldUpdates,
+        updates,
+        datasetId: dataset.id,
+        availableDatasetIds: prevDatasets.map((d) => d.id),
+    });
     result.dimensions = dimensions;
     result.measures = measures;
     result.hierarchies = validateHierarchies({

src/ui/units/wizard/containers/Wizard/SectionVisualization/PlaceholdersContainer/Placeholder/Placeholder.tsx

@@ -4,6 +4,7 @@ import {Gear} from '@gravity-ui/icons';
 import type {IconData, IconProps} from '@gravity-ui/uikit';
 import {Icon, Popover} from '@gravity-ui/uikit';
 import {i18n} from 'i18n';
+import pick from 'lodash/pick';
 import type {ConnectableElement} from 'react-dnd';
 import {connect} from 'react-redux';
 import type {Dispatch} from 'redux';
@@ -223,7 +224,7 @@ class PlaceholderComponent extends React.PureComponent<Props> {
     ) => {
         const items = args[0];
 
-        const onUpdateItemsGuids = items.map((item: Field) => item.guid);
+        const onUpdateItemsGuids = items.map((item: Field) => pick(item, 'guid', 'datasetId'));
 
         this.props.actualizeAndSetUpdates({updates: this.props.updates, onUpdateItemsGuids});
         this.props.onUpdate(...args);

src/ui/units/wizard/utils/__tests__/helpers.test.ts

@@ -187,7 +187,7 @@ describe('actualizeUpdates', () => {
 
         const expectedResult = [{field: {guid: '7', quickFormula: true}}, {field: {guid: '4'}}];
 
-        const MOCKED_ON_UPDATES_ITEMS_GUIDS = ['4', '7'];
+        const MOCKED_ON_UPDATES_ITEMS_GUIDS = [{guid: '4'}, {guid: '7'}];
 
         const result = actualizeUpdates({
             updates,

src/ui/units/wizard/utils/helpers.ts

@@ -11,6 +11,7 @@ import {
     SquareLetterT,
 } from '@gravity-ui/icons';
 import {i18n} from 'i18n';
+import {pick} from 'lodash';
 import isEqual from 'lodash/isEqual';
 import type {
     CommonNumberFormattingOptions,
@@ -440,7 +441,7 @@ type ActualizaeUpdatesArgs = {
     visualization?: Shared['visualization'];
     sectionDatasetFields: Field[];
     visualizationFields: Field[];
-    onUpdateItemsGuids?: string[];
+    onUpdateItemsGuids?: {guid: string; datasetId?: string}[];
 };
 
 export function actualizeUpdates({
@@ -456,28 +457,42 @@ export function actualizeUpdates({
         return updates;
     }
 
-    const sectionDatasetFieldsGuids = new Set(sectionDatasetFields.map((field) => field.guid));
+    const getFieldKey = (field: {guid: string; datasetId?: string}) =>
+        `${field.datasetId}__${field.guid}`;
 
-    const placeholders: Placeholder[] = currentVisualization?.placeholders || [];
+    const sectionDatasetFieldsGuids = sectionDatasetFields.reduce<Record<string, Field>>(
+        (acc, field) => {
+            acc[getFieldKey(field)] = field;
+
+            return acc;
+        },
+        {},
+    );
 
+    const placeholders: Placeholder[] = currentVisualization?.placeholders || [];
     const placeholdersItems = placeholders.reduce((acc: Field[], placeholder: Placeholder) => {
         const items = placeholder.items || [];
 
         return [...acc, ...items];
     }, [] as Field[]);
 
-    const sectionVisualizationFieldsGuids = new Set([
-        ...placeholdersItems.map((field: Field) => field.guid),
-        ...visualizationFields.map((field: Field) => field.guid),
+    const sectionVisualizationFields = [
+        ...placeholdersItems.map((field: Field) => pick(field, 'guid', 'datasetId')),
+        ...visualizationFields.map((field: Field) => pick(field, 'guid', 'datasetId')),
         ...onUpdateItemsGuids,
-    ]);
+    ].reduce<Record<string, unknown>>((acc, field) => {
+        acc[getFieldKey(field)] = field;
+
+        return acc;
+    }, {});
 
     return updates.filter((update: Update) => {
         const field = update.field;
+        const key = getFieldKey(field);
 
         return (
-            (sectionDatasetFieldsGuids.has(field.guid) && isFieldVisible(field as Field)) ||
-            sectionVisualizationFieldsGuids.has(field.guid)
+            (sectionDatasetFieldsGuids[key] && isFieldVisible(field as Field)) ||
+            sectionVisualizationFields[key]
         );
     });
 }