geido commented on code in PR #36955:
URL: https://github.com/apache/superset/pull/36955#discussion_r2675717495
##########
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:
##########
@@ -364,8 +375,73 @@ const FilterBar: FC<FiltersBarProps> = ({
dispatch(setChartCustomization(mergedCustomizations));
- if (chartIds.length > 0) {
- chartIds.forEach(chartId => {
+ const customizationsWithColumns = mergedCustomizations.filter(item => {
+ if (item.removed) return false;
+ const column = item.customization?.column;
+ if (!column) return false;
+
+ if (typeof column === 'string') {
+ return column.trim() !== '';
+ }
+ if (Array.isArray(column)) {
+ return column.length > 0;
+ }
+ return true;
+ });
+
+ const newAffectedChartIds = getAffectedChartIdsFromCustomizations(
+ customizationsWithColumns,
+ slices,
+ );
+
+ const previouslyAffectedChartIds: number[] = [];
+ const originalCustomizations = chartCustomizationItems || [];
+
+ originalCustomizations.forEach(oldItem => {
+ const oldColumn = oldItem.customization?.column;
+ const hadColumnBefore =
+ oldColumn !== null &&
+ oldColumn !== undefined &&
+ (typeof oldColumn === 'string'
Review Comment:
Can we centralize these checks in an util? You are repeating the same logic
later
##########
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:
##########
@@ -364,8 +375,73 @@ const FilterBar: FC<FiltersBarProps> = ({
dispatch(setChartCustomization(mergedCustomizations));
- if (chartIds.length > 0) {
- chartIds.forEach(chartId => {
+ const customizationsWithColumns = mergedCustomizations.filter(item => {
+ if (item.removed) return false;
+ const column = item.customization?.column;
+ if (!column) return false;
+
+ if (typeof column === 'string') {
+ return column.trim() !== '';
+ }
+ if (Array.isArray(column)) {
+ return column.length > 0;
+ }
+ return true;
+ });
+
+ const newAffectedChartIds = getAffectedChartIdsFromCustomizations(
+ customizationsWithColumns,
+ slices,
+ );
+
+ const previouslyAffectedChartIds: number[] = [];
+ const originalCustomizations = chartCustomizationItems || [];
+
+ originalCustomizations.forEach(oldItem => {
Review Comment:
This whole logic seems fragile to me. It definitely needs some drying up
also.
##########
superset-frontend/src/dashboard/components/nativeFilters/FilterBar/index.tsx:
##########
@@ -320,26 +325,37 @@ const FilterBar: FC<FiltersBarProps> = ({
pendingChartCustomizations &&
Object.keys(pendingChartCustomizations).length > 0
) {
- Object.values(pendingChartCustomizations).forEach(
- (customization: any) => {
- if (customization) {
- const customizationFilterId =
`chart_customization_${customization.id}`;
- const dataMask = {
- extraFormData: {},
- filterState: {},
- ownState: {
- column: customization.customization?.column || null,
- },
- };
- dispatch(updateDataMask(customizationFilterId, dataMask));
- }
- },
- );
-
const pendingItems = Object.values(pendingChartCustomizations).filter(
Boolean,
) as ChartCustomizationSavePayload[];
+ const existingCustomizations = chartCustomizationItems || [];
+ const existingMap = new Map(
+ existingCustomizations.map(item => [item.id, item]),
+ );
+
+ pendingItems.forEach((customization: ChartCustomizationSavePayload) => {
+ const existingItem = existingMap.get(customization.id);
+ const pendingColumn = customization.customization?.column || null;
+ const existingColumn = existingItem?.customization?.column || null;
+
+ const columnChanged =
Review Comment:
I am not sure I understand this check. Can the columns be of different
types? Also, what is that `isEqual` is not capturing that the standard
comparison would be catching?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
