From eaa17a073dfc4b99a20dc5f0dedbf168a5d33db1 Mon Sep 17 00:00:00 2001
From: Chris Collins <chriscollins3456@gmail.com>
Date: Wed, 26 Feb 2025 09:53:33 -0500
Subject: [PATCH] fix(ui) Fix bug with date dropdown in deprecation modal
 (#12633)

---
 .../EntityDropdown/EntityMenuActions.tsx      |  5 ++++-
 datahub-web-react/src/conf/index.ts           | 20 +++++++++++++++++--
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
index 0a3d8a4ff4..ec6a3186e0 100644
--- a/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
+++ b/datahub-web-react/src/app/entityV2/shared/EntityDropdown/EntityMenuActions.tsx
@@ -1,6 +1,7 @@
 import { MoreOutlined } from '@ant-design/icons';
 import React, { useContext } from 'react';
 import styled from 'styled-components';
+import { useAppConfig } from '@src/app/useAppConfig';
 import { useEntityData, useRefetch } from '../../../entity/shared/EntityContext';
 import ShareMenuAction from '../../../shared/share/v2/ShareMenuAction';
 import EntitySidebarContext from '../../../sharedV2/EntitySidebarContext';
@@ -63,6 +64,8 @@ function EntityMenuActions(props: Props) {
 
     const refetch = useRefetch();
 
+    const { entityVersioningEnabled } = useAppConfig().config.featureFlags;
+
     const hasVersioningActions = !!(menuItems.has(EntityMenuItems.LINK_VERSION) || entityData?.versionProperties);
     return (
         <>
@@ -76,7 +79,7 @@ function EntityMenuActions(props: Props) {
                         <DeleteEntityMenuItem onDelete={onDelete} options={options} />
                     )}
                     {menuItems.has(EntityMenuItems.RAISE_INCIDENT) && <RaiseIncidentMenuAction />}
-                    {hasVersioningActions && (
+                    {entityVersioningEnabled && hasVersioningActions && (
                         <MoreOptionsContainer>
                             <MoreOptionsMenuAction
                                 menuItems={
diff --git a/datahub-web-react/src/conf/index.ts b/datahub-web-react/src/conf/index.ts
index 771f4e1bc8..796f5773e4 100644
--- a/datahub-web-react/src/conf/index.ts
+++ b/datahub-web-react/src/conf/index.ts
@@ -1,7 +1,23 @@
+// Dayjs is missing core functionality without this. It causes issues in setting default value of antd datepicker without.
+import dayjs from 'dayjs';
+import advancedFormat from 'dayjs/plugin/advancedFormat';
+import customParseFormat from 'dayjs/plugin/customParseFormat';
+import localeData from 'dayjs/plugin/localeData';
+import weekday from 'dayjs/plugin/weekday';
+import weekOfYear from 'dayjs/plugin/weekOfYear';
+import weekYear from 'dayjs/plugin/weekYear';
+
+import * as Browse from './Browse';
 import * as Global from './Global';
 import * as Search from './Search';
-import * as Browse from './Browse';
+
+dayjs.extend(customParseFormat);
+dayjs.extend(advancedFormat);
+dayjs.extend(weekday);
+dayjs.extend(localeData);
+dayjs.extend(weekOfYear);
+dayjs.extend(weekYear);
 
 // TODO: A way to populate configs without code changes?
 // TOOD: Entity-oriented configurations?
-export { Global as GlobalCfg, Search as SearchCfg, Browse as BrowseCfg };
+export { Browse as BrowseCfg, Global as GlobalCfg, Search as SearchCfg };