Add paginated_update to migration

superset-frontend/src/dashboard/actions/dashboardInfo.ts

@@ -67,9 +67,9 @@ export function dashboardInfoChanged(newInfo: { metadata: any }) {
 
   return { type: DASHBOARD_INFO_UPDATED, newInfo };
 }
-export const SET_CHART_CONFIG_BEGIN = 'SET_CHART_CONFIG_BEGIN';
-export const SET_CHART_CONFIG_COMPLETE = 'SET_CHART_CONFIG_COMPLETE';
-export const SET_CHART_CONFIG_FAIL = 'SET_CHART_CONFIG_FAIL';
+export const SAVE_CHART_CONFIG_BEGIN = 'SAVE_CHART_CONFIG_BEGIN';
+export const SAVE_CHART_CONFIG_COMPLETE = 'SAVE_CHART_CONFIG_COMPLETE';
+export const SAVE_CHART_CONFIG_FAIL = 'SAVE_CHART_CONFIG_FAIL';
 
 export const saveChartConfiguration =
   ({
@@ -81,7 +81,7 @@ export const saveChartConfiguration =
   }) =>
   async (dispatch: Dispatch, getState: () => RootState) => {
     dispatch({
-      type: SET_CHART_CONFIG_BEGIN,
+      type: SAVE_CHART_CONFIG_BEGIN,
       chartConfiguration,
       globalChartConfiguration,
     });
@@ -112,13 +112,13 @@ export const saveChartConfiguration =
         }),
       );
       dispatch({
-        type: SET_CHART_CONFIG_COMPLETE,
+        type: SAVE_CHART_CONFIG_COMPLETE,
         chartConfiguration,
         globalChartConfiguration,
       });
     } catch (err) {
       dispatch({
-        type: SET_CHART_CONFIG_FAIL,
+        type: SAVE_CHART_CONFIG_FAIL,
         chartConfiguration,
         globalChartConfiguration,
       });

superset-frontend/src/dashboard/actions/dashboardState.js

@@ -58,7 +58,7 @@ import { UPDATE_COMPONENTS_PARENTS_LIST } from './dashboardLayout';
 import {
   saveChartConfiguration,
   dashboardInfoChanged,
-  SET_CHART_CONFIG_COMPLETE,
+  SAVE_CHART_CONFIG_COMPLETE,
 } from './dashboardInfo';
 import { fetchDatasourceMetadata } from './datasources';
 import {
@@ -327,7 +327,7 @@ export function saveDashboardRequest(data, id, saveType) {
         );
         if (metadata.chart_configuration) {
           dispatch({
-            type: SET_CHART_CONFIG_COMPLETE,
+            type: SAVE_CHART_CONFIG_COMPLETE,
             chartConfiguration: metadata.chart_configuration,
           });
         }

superset-frontend/src/dashboard/util/charts/useChartIds.ts

@@ -16,13 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
+import isEqual from 'lodash/isEqual';
+import { createSelector } from '@reduxjs/toolkit';
 import { RootState } from 'src/dashboard/types';
+import { useMemoCompare } from 'src/hooks/useMemoCompare';
+
+const chartIdsSelector = createSelector(
+  (state: RootState) => state.charts,
+  charts => Object.values(charts).map(chart => chart.id),
+);
 
 export const useChartIds = () => {
-  const chartIds = useSelector<RootState, number[]>(state =>
-    Object.values(state.charts).map(chart => chart.id),
+  const chartIds = useSelector<RootState, number[]>(chartIdsSelector);
+  return useMemoCompare(
+    chartIds,
+    (prev, next) => prev === next || isEqual(prev, next),
   );
-  return useMemo(() => chartIds, [chartIds]);
 };

superset-frontend/src/hooks/useMemoCompare.ts

@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { useEffect, useRef } from 'react';
+
+export const useMemoCompare = <T>(
+  next: T,
+  compare: (prev: T | undefined, next: T) => boolean,
+) => {
+  const previousRef = useRef<T>();
+  const previous = previousRef.current;
+  const isEqual = compare(previous, next);
+  useEffect(() => {
+    if (!isEqual) {
+      previousRef.current = next;
+    }
+  });
+  return isEqual ? previous : next;
+};

superset/migrations/versions/2023-05-11_12-41_4ea966691069_cross_filter_global_scoping.py

@@ -34,6 +34,7 @@
 from sqlalchemy.ext.declarative import declarative_base
 
 from superset import db
+from superset.migrations.shared.utils import paginated_update
 
 Base = declarative_base()
 
@@ -48,7 +49,7 @@ class Dashboard(Base):
 def upgrade():
     bind = op.get_bind()
     session = db.Session(bind=bind)
-    for dashboard in session.query(Dashboard).all():
+    for dashboard in paginated_update(session.query(Dashboard).all()):
         try:
             json_metadata = json.loads(dashboard.json_metadata)
             new_chart_configuration = {}
@@ -82,7 +83,7 @@ def downgrade():
     bind = op.get_bind()
     session = db.Session(bind=bind)
 
-    for dashboard in session.query(Dashboard).all():
+    for dashboard in paginated_update(session.query(Dashboard).all()):
         try:
             json_metadata = json.loads(dashboard.json_metadata)
             new_chart_configuration = {}