From b354f2265aab1e5569315364ecbcc314049aae5d Mon Sep 17 00:00:00 2001
From: Shubham Sinha <sinhashubham95@gmail.com>
Date: Tue, 30 Aug 2022 12:21:32 +0530
Subject: [PATCH] fix(dev-server run): Check for environment tag not being
 undefined (#21232)

* fixed local dev-server run

* removed console log

* removed console log
---
 .../controls/DndColumnSelectControl/ColumnSelectPopover.tsx    | 3 ---
 superset-frontend/src/views/components/RightMenu.tsx           | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
index bc59fb06e69aa..1eb77afb3e692 100644
--- a/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
+++ b/superset-frontend/src/explore/components/controls/DndColumnSelectControl/ColumnSelectPopover.tsx
@@ -103,7 +103,6 @@ const ColumnSelectPopover = ({
   const datasourceType = useSelector<ExplorePageState, string | undefined>(
     state => state.explore.datasource.type,
   );
-  console.log('datasource', datasourceType);
   const [initialLabel] = useState(label);
   const [initialAdhocColumn, initialCalculatedColumn, initialSimpleColumn] =
     getInitialColumnValues(editedColumn);
@@ -248,8 +247,6 @@ const ColumnSelectPopover = ({
   const savedExpressionsLabel = t('Saved expressions');
   const simpleColumnsLabel = t('Column');
 
-  console.log(calculatedColumns.length > 0);
-  console.log(datasourceType === DatasourceType.Query);
   return (
     <Form layout="vertical" id="metrics-edit-popover">
       <Tabs
diff --git a/superset-frontend/src/views/components/RightMenu.tsx b/superset-frontend/src/views/components/RightMenu.tsx
index fabf071eb60b9..27f84a0be697d 100644
--- a/superset-frontend/src/views/components/RightMenu.tsx
+++ b/superset-frontend/src/views/components/RightMenu.tsx
@@ -281,7 +281,7 @@ const RightMenu = ({
           onDatabaseAdd={handleDatabaseAdd}
         />
       )}
-      {environmentTag.text && (
+      {environmentTag && environmentTag.text && (
         <Label
           css={{ borderRadius: `${theme.gridUnit * 125}px` }}
           color={