diff --git a/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx index 7d07e97c8e5..60b6cc1ad7d 100644 --- a/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx +++ b/superset-frontend/packages/superset-ui-core/src/components/PopoverDropdown/index.tsx @@ -45,7 +45,7 @@ interface HandleSelectProps { } const menuItemStyles = (theme: any) => css` - &.antd5-menu-item { + &.ant-menu-item { height: auto; line-height: 1.4; diff --git a/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx b/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx index 9f5d3e83642..0d007db7ce4 100644 --- a/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx +++ b/superset-frontend/packages/superset-ui-core/src/components/Radio/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import { - Radio as Antd5Radio, + Radio as AntRadio, type CheckboxOptionType, type RadioGroupProps, } from 'antd'; @@ -40,19 +40,19 @@ const RadioGroup = ({ ...props }: RadioGroupWrapperProps) => { const content = options.map((option: CheckboxOptionType) => ( - + {option.label} - + )); return ( - + {spaceConfig ? {content} : content} - + ); }; -export const Radio = Object.assign(Antd5Radio, { +export const Radio = Object.assign(AntRadio, { GroupWrapper: RadioGroup, - Button: Antd5Radio.Button, + Button: AntRadio.Button, }); export type { RadioChangeEvent, diff --git a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx index debf8d18307..8834a0cd2fa 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx +++ b/superset-frontend/src/SqlLab/components/SqlEditor/index.tsx @@ -926,7 +926,7 @@ const SqlEditor: FC = ({ css={css` margin-bottom: ${theme.sizeUnit * 2}px; padding-top: ${theme.sizeUnit * 4}px; - .antd5-alert-action { + .ant-alert-action { align-self: center; } `} diff --git a/superset-frontend/src/features/groups/GroupListModal.tsx b/superset-frontend/src/features/groups/GroupListModal.tsx index d20e9066c9a..baf728f5b89 100644 --- a/superset-frontend/src/features/groups/GroupListModal.tsx +++ b/superset-frontend/src/features/groups/GroupListModal.tsx @@ -132,7 +132,7 @@ function GroupListModal({ value: role.id, label: role.name, }))} - getPopupContainer={trigger => trigger.closest('.antd5-modal-content')} + getPopupContainer={trigger => trigger.closest('.ant-modal-content')} /> diff --git a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx index 8e6504d9544..a4bdd434809 100644 --- a/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx +++ b/superset-frontend/src/filters/components/Range/RangeFilterPlugin.tsx @@ -54,7 +54,7 @@ const Wrapper = styled.div` justify-content: space-between; width: 100%; - .antd5-input-number { + .ant-input-number { min-width: 80px; position: relative; } diff --git a/superset-frontend/src/pages/ActionLog/index.tsx b/superset-frontend/src/pages/ActionLog/index.tsx index f48d583b830..1087c192911 100644 --- a/superset-frontend/src/pages/ActionLog/index.tsx +++ b/superset-frontend/src/pages/ActionLog/index.tsx @@ -196,10 +196,10 @@ function ActionLogList() { }: any) => ( ( css` - .antd5-row { + .ant-row { margin: 0px ${theme.sizeUnit * 3}px ${theme.sizeUnit * 6}px ${theme.sizeUnit * 3}px; } - && .menu > .antd5-menu { + && .menu > .ant-menu { padding: 0px; } && .nav-right { diff --git a/superset/utils/webdriver.py b/superset/utils/webdriver.py index 0ad2c5eb6b7..3216521bf10 100644 --- a/superset/utils/webdriver.py +++ b/superset/utils/webdriver.py @@ -108,8 +108,8 @@ class WebDriverPlaywright(WebDriverProxy): alert_div.get_by_role("button").click() # wait for modal to show up - page.locator(".antd5-modal-content").wait_for(state="visible") - err_msg_div = page.locator(".antd5-modal-content .antd5-modal-body") + page.locator(".ant-modal-content").wait_for(state="visible") + err_msg_div = page.locator(".ant-modal-content .ant-modal-body") # # # collect error message error_messages.append(err_msg_div.text_content()) @@ -118,10 +118,10 @@ class WebDriverPlaywright(WebDriverProxy): error_as_html = err_msg_div.inner_html().replace("'", "\\'") # # # close modal after collecting error messages - page.locator(".antd5-modal-content .antd5-modal-close").click() + page.locator(".ant-modal-content .ant-modal-close").click() # # # wait until the modal becomes invisible - page.locator(".antd5-modal-content").wait_for(state="detached") + page.locator(".ant-modal-content").wait_for(state="detached") try: # Even if some errors can't be updated in the screenshot, # keep all the errors in the server log and do not fail the loop @@ -347,17 +347,17 @@ class WebDriverSelenium(WebDriverProxy): current_app.config["SCREENSHOT_WAIT_FOR_ERROR_MODAL_VISIBLE"], ).until( EC.visibility_of_any_elements_located( - (By.CLASS_NAME, "antd5-modal-content") + (By.CLASS_NAME, "ant-modal-content") ) )[0] - err_msg_div = modal.find_element(By.CLASS_NAME, "antd5-modal-body") + err_msg_div = modal.find_element(By.CLASS_NAME, "ant-modal-body") # collect error message error_messages.append(err_msg_div.text) # close modal after collecting error messages - modal.find_element(By.CLASS_NAME, "antd5-modal-close").click() + modal.find_element(By.CLASS_NAME, "ant-modal-close").click() # wait until the modal becomes invisible WebDriverWait(