This is an automated email from the ASF dual-hosted git repository.

msyavuz pushed a commit to branch template_less
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/template_less by this push:
     new 18c3f0adb6 fix(theming): Fix various ci issues (#33147)
18c3f0adb6 is described below

commit 18c3f0adb669038400311ca573dd1f6ecdb7bfe9
Author: Mehmet Salih Yavuz <salih.ya...@proton.me>
AuthorDate: Wed Apr 16 12:46:57 2025 +0300

    fix(theming): Fix various ci issues (#33147)
---
 superset-frontend/cypress-base/cypress/e2e/explore/utils.ts      | 6 ------
 superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx | 4 ++--
 superset-frontend/src/pages/UsersList/index.tsx                  | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts 
b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
index 994f260e70..5f70348a8f 100644
--- a/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/explore/utils.ts
@@ -58,10 +58,6 @@ export function interceptExploreGet() {
   }).as('getExplore');
 }
 
-export const interceptChartDashboardsGet = () => {
-  cy.intercept('GET', '/api/v1/dashboard/?q=*').as('chartDashboards');
-};
-
 export function setFilter(filter: string, option: string) {
   interceptFiltering();
 
@@ -75,7 +71,6 @@ export function saveChartToDashboard(chartName: string, 
dashboardName: string) {
   interceptDashboardGet();
   interceptUpdate();
   interceptExploreGet();
-  interceptChartDashboardsGet();
 
   cy.getBySel('query-save-button')
     .should('be.enabled')
@@ -91,7 +86,6 @@ export function saveChartToDashboard(chartName: string, 
dashboardName: string) {
           '.antd5-select-selection-search-input[aria-label="Select a 
dashboard"]',
         )
         .type(dashboardName, { force: true });
-      cy.wait('@chartDashboards');
       cy.wrap($modal)
         .find(`.antd5-select-item-option[title="${dashboardName}"]`)
         .click();
diff --git a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx 
b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
index 850801b217..54b060e8bd 100644
--- a/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
+++ b/superset-frontend/src/pages/ChartCreation/ChartCreation.test.tsx
@@ -38,7 +38,7 @@ jest.mock('src/components/DynamicPlugins', () => ({
 const mockDatasourceResponse = {
   result: [
     {
-      id: 1,
+      id: 'table_1',
       table_name: 'table',
       datasource_type: 'table',
       database: { database_name: 'test_db' },
@@ -190,6 +190,6 @@ test('double-click viz type submits with formatted URL if 
datasource is selected
   expect(
     screen.getByRole('button', { name: 'Create new chart' }),
   ).toBeEnabled();
-  const formattedUrl = '/explore/?viz_type=table&datasource=1__table';
+  const formattedUrl = '/explore/?viz_type=table&datasource=table_1__table';
   expect(history.push).toHaveBeenCalledWith(formattedUrl);
 });
diff --git a/superset-frontend/src/pages/UsersList/index.tsx 
b/superset-frontend/src/pages/UsersList/index.tsx
index e3baaef931..2bfe2574f2 100644
--- a/superset-frontend/src/pages/UsersList/index.tsx
+++ b/superset-frontend/src/pages/UsersList/index.tsx
@@ -294,7 +294,7 @@ function UsersList({ user }: UsersListProps) {
       },
       {
         accessor: 'fail_login_count',
-        id: 'login_count',
+        id: 'fail_login_count',
         Header: t('Fail login count'),
         hidden: true,
         Cell: ({ row: { original } }: any) => original.fail_login_count,

Reply via email to