fix errors of resolving conflicts

Ortege-xyz · Dec 4, 2024 · 7e33231 · 7e33231
1 parent f9059ca
commit 7e33231
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 49 deletions.
diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts b/superset-frontend/plugins/plugin-chart-echarts/src/Timeseries/transformers.ts
@@ -230,9 +230,6 @@ export function transformSeries(
   if (stackId && stackIdSuffix) {
     stackId += stackIdSuffix;
   }
-  if (stackId && stackIdSuffix) {
-    stackId += stackIdSuffix;
-  }
   let plotType;
   if (
     !isConfidenceBand &&

diff --git a/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx b/superset-frontend/plugins/plugin-chart-echarts/src/Waterfall/controlPanel.tsx
@@ -23,20 +23,18 @@ import {
   D3_TIME_FORMAT_DOCS,
   DEFAULT_TIME_FORMAT,
   formatSelectOptions,
-  sections,
   sharedControls,
 } from '@superset-ui/chart-controls';
 import { showValueControl } from '../controls';
 
 const config: ControlPanelConfig = {
   controlPanelSections: [
-    sections.genericTime,
     {
       label: t('Query'),
       expanded: true,
       controlSetRows: [
-        [hasGenericChartAxes ? 'x_axis' : null],
-        [hasGenericChartAxes ? 'time_grain_sqla' : null],
+        ['x_axis'],
+        ['time_grain_sqla'],
         ['groupby'],
         ['metric'],
         ['adhoc_filters'],

diff --git a/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx b/superset-frontend/plugins/plugin-chart-table/src/TableChart.tsx
@@ -185,7 +185,6 @@ function SearchInput({ count, value, onChange }: SearchInputProps) {
         className="form-control input-sm"
         placeholder={tn('search.num_records', count)}
         value={value}
-        aria-label={t('Search %s records', count)}
         onChange={onChange}
       />
     </span>

diff --git a/superset-frontend/src/components/Slider/Slider.test.tsx b/superset-frontend/src/components/Slider/Slider.test.tsx
@@ -36,4 +36,4 @@ test('should render with default value on tooltip', () => {
   expect(
     screen.getAllByText(`${mockedProps.defaultValue}`)[0],
   ).toBeInTheDocument();
-});
+});
diff --git a/superset-frontend/src/dashboard/reducers/dashboardState.js b/superset-frontend/src/dashboard/reducers/dashboardState.js
@@ -38,6 +38,7 @@ import {
   SET_FOCUSED_FILTER_FIELD,
   UNSET_FOCUSED_FILTER_FIELD,
   SET_ACTIVE_TAB,
+  SET_ACTIVE_TABS,
   SET_FULL_SIZE_CHART_ID,
   ON_FILTERS_REFRESH,
   ON_FILTERS_REFRESH_SUCCESS,
@@ -188,6 +189,12 @@ export default function dashboardStateReducer(state = {}, action) {
         activeTabs: Array.from(newActiveTabs),
       };
     },
+    [SET_ACTIVE_TABS]() {
+      return {
+        ...state,
+        activeTabs: action.activeTabs,
+      };
+    },
     [SET_OVERRIDE_CONFIRM]() {
       return {
         ...state,

diff --git a/superset-frontend/src/dashboard/reducers/dashboardState.test.ts b/superset-frontend/src/dashboard/reducers/dashboardState.test.ts
@@ -18,7 +18,7 @@
  */
 
 import dashboardStateReducer from './dashboardState';
-import { setActiveTab } from '../actions/dashboardState';
+import { setActiveTab, setActiveTabs } from '../actions/dashboardState';
 
 describe('DashboardState reducer', () => {
   it('SET_ACTIVE_TAB', () => {

diff --git a/superset-frontend/src/features/alerts/types.ts b/superset-frontend/src/features/alerts/types.ts
@@ -62,12 +62,6 @@ export type SlackChannel = {
   is_private: boolean;
 };
 
-export type NotificationSetting = {
-  method?: NotificationMethodOption;
-  recipients: string;
-  options: NotificationMethodOption[];
-};
-
 export type Recipient = {
   recipient_config_json: {
     target: string;

diff --git a/superset-frontend/src/pages/RowLevelSecurityList/index.tsx b/superset-frontend/src/pages/RowLevelSecurityList/index.tsx
@@ -299,26 +299,6 @@ function RowLevelSecurityList(props: RLSProps) {
         ),
         paginate: true,
       },
-      {
-        Header: t('Modified by'),
-        key: 'changed_by',
-        id: 'changed_by',
-        input: 'select',
-        operator: FilterOperator.relationOneMany,
-        unfilteredLabel: t('All'),
-        fetchSelects: createFetchRelated(
-          'rowlevelsecurity',
-          'changed_by',
-          createErrorHandler(errMsg =>
-            t(
-              'An error occurred while fetching dataset datasource values: %s',
-              errMsg,
-            ),
-          ),
-          user,
-        ),
-        paginate: true,
-      },
     ],
     [user],
   );

diff --git a/superset-frontend/src/pages/SavedQueryList/index.tsx b/superset-frontend/src/pages/SavedQueryList/index.tsx
@@ -381,19 +381,6 @@ function SavedQueryList({
         accessor: 'changed_on_delta_humanized',
         size: 'xl',
       },
-      {
-        Cell: ({
-          row: {
-            original: {
-              changed_by: changedBy,
-              changed_on_delta_humanized: changedOn,
-            },
-          },
-        }: any) => <ModifiedInfo user={changedBy} date={changedOn} />,
-        Header: t('Last modified'),
-        accessor: 'changed_on_delta_humanized',
-        size: 'xl',
-      },
       {
         Cell: ({ row: { original } }: any) => {
           const handlePreview = () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,4 +36,4 @@ test('should render with default value on tooltip', () => { @@
       expect(
         screen.getAllByText(`${mockedProps.defaultValue}`)[0],
       ).toBeInTheDocument();
-    });
+    });