refactor(date picker): Migrate Date Picker to Ant Design 5 (#31019)

Co-authored-by: Geido <[email protected]>
apache · Jan 13, 2025 · b5e6275 · b5e6275
1 parent aae8fda
commit b5e6275
Show file tree

Hide file tree

Showing 26 changed files with 529 additions and 486 deletions.
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
@@ -161,8 +161,6 @@
     "markdown-to-jsx": "^7.7.2",
     "match-sorter": "^6.3.4",
     "memoize-one": "^5.2.1",
-    "moment": "^2.30.1",
-    "moment-timezone": "^0.5.44",
     "mousetrap": "^1.6.5",
     "mustache": "^4.2.0",
     "nanoid": "^5.0.9",
@@ -337,7 +335,6 @@
     "less-loader": "^12.2.0",
     "mini-css-extract-plugin": "^2.9.0",
     "mock-socket": "^9.3.1",
-    "moment-locales-webpack-plugin": "^1.2.0",
     "node-fetch": "^2.6.7",
     "open-cli": "^8.0.0",
     "po2json": "^0.4.5",

diff --git a/superset-frontend/packages/superset-ui-chart-controls/src/constants.ts b/superset-frontend/packages/superset-ui-chart-controls/src/constants.ts
@@ -81,5 +81,5 @@ export const DEFAULT_XAXIS_SORT_SERIES_DATA: SortSeriesData = {
 
 export const DEFAULT_DATE_PATTERN = /\d{4}-\d{2}-\d{2}/g;
 
-// When moment fails to parse a date
+// When it fails to parse a date
 export const INVALID_DATE = 'Invalid date';
diff --git a/superset-frontend/src/components/AntdThemeProvider/index.tsx b/superset-frontend/src/components/AntdThemeProvider/index.tsx
@@ -20,8 +20,16 @@
 import { ConfigProvider, type ConfigProviderProps } from 'antd-v5';
 import { getTheme, ThemeType } from 'src/theme/index';
 
-export const AntdThemeProvider = ({ theme, children }: ConfigProviderProps) => (
-  <ConfigProvider theme={theme || getTheme(ThemeType.LIGHT)} prefixCls="antd5">
+export const AntdThemeProvider = ({
+  theme,
+  children,
+  ...rest
+}: ConfigProviderProps) => (
+  <ConfigProvider
+    theme={theme || getTheme(ThemeType.LIGHT)}
+    prefixCls="antd5"
+    {...rest}
+  >
     {children}
   </ConfigProvider>
 );
diff --git a/superset-frontend/src/components/DatePicker/DatePicker.stories.tsx b/superset-frontend/src/components/DatePicker/DatePicker.stories.tsx
@@ -16,22 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DatePickerProps, RangePickerProps } from 'antd/lib/date-picker';
+import { DatePickerProps } from 'antd-v5';
+import { RangePickerProps } from 'antd-v5/es/date-picker';
 import { DatePicker, RangePicker } from '.';
 
 export default {
   title: 'DatePicker',
   component: DatePicker,
 };
 
-const commonArgs = {
-  allowClear: true,
+const commonArgs: DatePickerProps = {
+  allowClear: false,
   autoFocus: true,
-  bordered: true,
   disabled: false,
+  format: 'YYYY-MM-DD hh:mm a',
   inputReadOnly: false,
+  order: true,
+  picker: 'date',
+  placement: 'bottomLeft',
   size: 'middle',
-  format: 'YYYY-MM-DD hh:mm a',
+  showNow: true,
   showTime: { format: 'hh:mm a' },
 };
 
@@ -49,6 +53,25 @@ const interactiveTypes = {
     },
     options: ['large', 'middle', 'small'],
   },
+  placement: {
+    control: {
+      type: 'select',
+    },
+    options: ['bottomLeft', 'bottomRight', 'topLeft', 'topRight'],
+  },
+  status: {
+    control: {
+      type: 'select',
+    },
+    options: ['error', 'warning'],
+  },
+
+  variant: {
+    control: {
+      type: 'select',
+    },
+    options: ['outlined', 'borderless', 'filled'],
+  },
 };
 
 export const InteractiveDatePicker = (args: DatePickerProps) => (
@@ -57,9 +80,9 @@ export const InteractiveDatePicker = (args: DatePickerProps) => (
 
 InteractiveDatePicker.args = {
   ...commonArgs,
-  picker: 'date',
   placeholder: 'Placeholder',
   showToday: true,
+  showTime: { format: 'hh:mm a', needConfirm: false },
 };
 
 InteractiveDatePicker.argTypes = interactiveTypes;
@@ -70,9 +93,8 @@ export const InteractiveRangePicker = (args: RangePickerProps) => (
 
 InteractiveRangePicker.args = {
   ...commonArgs,
-  allowEmpty: true,
-  showNow: true,
   separator: '-',
+  showTime: { format: 'hh:mm a', needConfirm: false },
 };
 
 InteractiveRangePicker.argTypes = interactiveTypes;