From 2d505ce35910ce991253ca34c0fe73f3a55a814d Mon Sep 17 00:00:00 2001
From: Scott Bishel <scott.bishel@mattermost.com>
Date: Fri, 26 Nov 2021 08:51:01 -0700
Subject: [PATCH] CalendarView Remove Feature flag (#1865)

* Updating table row css (#1787)

* remove calendarView Feature flag

* remove unused imports

Co-authored-by: Asaad Mahmood <asaadmahmood@users.noreply.github.com>
---
 webapp/src/components/centerPanel.tsx |  2 +-
 webapp/src/components/viewMenu.tsx    | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/webapp/src/components/centerPanel.tsx b/webapp/src/components/centerPanel.tsx
index 5fc6081da..58c260529 100644
--- a/webapp/src/components/centerPanel.tsx
+++ b/webapp/src/components/centerPanel.tsx
@@ -195,7 +195,7 @@ class CenterPanel extends React.Component<Props, State> {
                         addCard={this.addCard}
                         onCardClicked={this.cardClicked}
                     />}
-                {activeView.fields.viewType === 'calendar' && this.props.clientConfig?.featureFlags.CalendarView &&
+                {activeView.fields.viewType === 'calendar' &&
                     <CalendarFullView
                         board={this.props.board}
                         cards={this.props.cards}
diff --git a/webapp/src/components/viewMenu.tsx b/webapp/src/components/viewMenu.tsx
index 551a3394a..e44f4b2ee 100644
--- a/webapp/src/components/viewMenu.tsx
+++ b/webapp/src/components/viewMenu.tsx
@@ -19,8 +19,6 @@ import DuplicateIcon from '../widgets/icons/duplicate'
 import GalleryIcon from '../widgets/icons/gallery'
 import TableIcon from '../widgets/icons/table'
 import Menu from '../widgets/menu'
-import {useAppSelector} from '../store/hooks'
-import {getClientConfig} from '../store/clientConfig'
 
 type Props = {
     board: Board,
@@ -33,7 +31,6 @@ type Props = {
 const ViewMenu = React.memo((props: Props) => {
     const history = useHistory()
     const match = useRouteMatch()
-    const clientConfig = useAppSelector(getClientConfig)
 
     const showView = useCallback((viewId) => {
         let newPath = generatePath(match.path, {...match.params, viewId: viewId || ''})
@@ -291,14 +288,12 @@ const ViewMenu = React.memo((props: Props) => {
                         icon={<GalleryIcon/>}
                         onClick={handleAddViewGallery}
                     />
-                    {clientConfig?.featureFlags.CalendarView &&
-                        <Menu.Text
-                            id='calendar'
-                            name='Calendar'
-                            icon={<CalendarIcon/>}
-                            onClick={handleAddViewCalendar}
-                        />
-                    }
+                    <Menu.Text
+                        id='calendar'
+                        name='Calendar'
+                        icon={<CalendarIcon/>}
+                        onClick={handleAddViewCalendar}
+                    />
                 </Menu.SubMenu>
             }
         </Menu>