[pull] master from apache:master

superset-frontend/.eslintrc.js

@@ -16,6 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+
+// Register TypeScript require hook so ESLint can load .ts plugin files
+require('tsx/cjs');
+
 const packageConfig = require('./package.json');
 
 const importCoreModules = [];
@@ -148,7 +152,7 @@ module.exports = {
     // Custom Superset rules
     'theme-colors/no-literal-colors': 'error',
     'icons/no-fa-icons-usage': 'error',
-    'i18n-strings/no-template-vars': ['error', true],
+    'i18n-strings/no-template-vars': 'error',
 
     // Core ESLint overrides for Superset
     'no-console': 'warn',
@@ -195,7 +199,7 @@ module.exports = {
           '**/jest.setup.js',
           '**/webpack.config.js',
           '**/webpack.config.*.js',
-          '**/.eslintrc.js',
+          '**/.eslintrc*.js',
         ],
         optionalDependencies: false,
       },

superset-frontend/.eslintrc.minimal.js

@@ -17,6 +17,9 @@
  * under the License.
  */
 
+// Register TypeScript require hook so ESLint can load .ts plugin files
+require('tsx/cjs');
+
 /**
  * MINIMAL ESLint config - ONLY for rules OXC doesn't support
  * This config is designed to be run alongside OXC linter
@@ -66,7 +69,7 @@ module.exports = {
     // Custom Superset plugins
     'theme-colors/no-literal-colors': 'error',
     'icons/no-fa-icons-usage': 'error',
-    'i18n-strings/no-template-vars': ['error', true],
+    'i18n-strings/no-template-vars': 'error',
     'file-progress/activate': 1,
 
     // Explicitly turn off all other rules to avoid conflicts

superset-frontend/packages/superset-ui-core/src/components/Button/Button.stories.tsx

@@ -105,7 +105,7 @@ export const InteractiveButton = (args: ButtonProps & { children: string }) => (
 );
 
 InteractiveButton.args = {
-  buttonStyle: 'default',
+  buttonStyle: 'primary',
   buttonSize: 'default',
   children: 'Button!',
 };

superset-frontend/packages/superset-ui-core/src/components/Button/index.tsx

@@ -30,6 +30,22 @@ import type {
   OnClickHandler,
 } from './types';
 
+const BUTTON_STYLE_MAP: Record<
+  ButtonStyle,
+  {
+    type?: ButtonType;
+    variant?: ButtonVariantType;
+    color?: ButtonColorType;
+  }
+> = {
+  primary: { type: 'primary', variant: 'solid', color: 'primary' },
+  secondary: { variant: 'filled', color: 'primary' },
+  tertiary: { variant: 'outlined', color: 'default' },
+  dashed: { type: 'dashed', variant: 'dashed', color: 'primary' },
+  danger: { variant: 'solid', color: 'danger' },
+  link: { type: 'link' },
+};
+
 export function Button(props: ButtonProps) {
   const {
     tooltip,
@@ -62,27 +78,11 @@ export function Button(props: ButtonProps) {
     padding = 4;
   }
 
-  let antdType: ButtonType = 'default';
-  let variant: ButtonVariantType = 'solid';
-  let color: ButtonColorType = 'primary';
-
-  if (!buttonStyle || buttonStyle === 'primary') {
-    variant = 'solid';
-    antdType = 'primary';
-  } else if (buttonStyle === 'secondary') {
-    variant = 'filled';
-    color = 'primary';
-  } else if (buttonStyle === 'tertiary') {
-    variant = 'outlined';
-    color = 'default';
-  } else if (buttonStyle === 'dashed') {
-    variant = 'dashed';
-    antdType = 'dashed';
-  } else if (buttonStyle === 'danger') {
-    color = 'danger';
-  } else if (buttonStyle === 'link') {
-    variant = 'link';
-  }
+  const {
+    type: antdType = 'default',
+    variant,
+    color,
+  } = BUTTON_STYLE_MAP[buttonStyle ?? 'primary'];
 
   const element = children as ReactElement;
 

superset-frontend/src/components/Datasource/DatasourceModal/index.tsx

@@ -45,23 +45,14 @@ const DatasourceEditor = AsyncEsmComponent(
 );
 
 const StyledDatasourceModal = styled(Modal)`
-  .modal-content {
+  && .ant-modal-content {
     height: 900px;
-    display: flex;
-    flex-direction: column;
-    align-items: stretch;
   }
 
-  .modal-header {
-    flex: 0 1 auto;
-  }
-  .modal-body {
+  && .ant-modal-body {
     flex: 1 1 auto;
-    overflow: auto;
-  }
-
-  .modal-footer {
-    flex: 0 1 auto;
+    display: flex;
+    flex-direction: column;
   }
 
   .ant-tabs-top {

superset-frontend/src/components/Datasource/FoldersEditor/styles.tsx

@@ -22,7 +22,7 @@ export const FoldersContainer = styled.div`
   display: flex;
   flex-direction: column;
   position: relative;
-  height: 70vh;
+  height: 100%;
   gap: ${({ theme }) => theme.paddingMD}px;
 `;
 

superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx

@@ -319,6 +319,11 @@ interface OwnersSelectorProps {
 }
 
 const DatasourceContainer = styled.div`
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+
   .change-warning {
     margin: 16px 10px 0;
     color: ${({ theme }) => theme.colorWarning};
@@ -347,9 +352,23 @@ const FlexRowContainer = styled.div`
 `;
 
 const StyledTableTabs = styled(Tabs)`
-  overflow: visible;
+  flex: 1;
+  min-height: 0;
+  display: flex;
+  flex-direction: column;
+
   .ant-tabs-content-holder {
-    overflow: visible;
+    flex: 1;
+    min-height: 0;
+    overflow: auto;
+  }
+
+  .ant-tabs-content {
+    height: 100%;
+  }
+
+  .ant-tabs-tabpane-active {
+    height: 100%;
   }
 `;
 

superset-frontend/src/pages/ChartList/ChartList.listview.test.tsx

@@ -342,10 +342,6 @@ test('displays chart data correctly in table rows', async () => {
     within(chartRow).getByText(testChart.changed_on_delta_humanized),
   ).toBeInTheDocument();
 
-  // Check actions column within the specific row
-  const actionsContainer = chartRow.querySelector('.actions');
-  expect(actionsContainer).toBeInTheDocument();
-
   // Verify action buttons exist within the specific row
   expect(within(chartRow).getByTestId('delete')).toBeInTheDocument();
   expect(within(chartRow).getByTestId('upload')).toBeInTheDocument();