From 4491aef15b73eec6041a4eac2c44da6142217773 Mon Sep 17 00:00:00 2001
From: saghatelian <armen@10web.io>
Date: Sat, 9 Dec 2023 20:55:16 +0400
Subject: [PATCH] Deploying the new version to live with new calendar picker
 and Superset version 3.0.2 Also, added a global style to hide the calendar
 container.

---
 docker-compose-10web.yml                                   | 2 +-
 superset-frontend/.eslintignore                            | 1 +
 superset-frontend/package-lock.json                        | 6 +++---
 superset-frontend/src/GlobalStyles.tsx                     | 3 +++
 superset-frontend/src/visualizations/presets/MainPreset.js | 2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/docker-compose-10web.yml b/docker-compose-10web.yml
index ad90a7b4b3c12..01cc8042a2f81 100644
--- a/docker-compose-10web.yml
+++ b/docker-compose-10web.yml
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-x-superset-image: &superset-image dc.10web.io:5050/reporting/superset:3.0.1.0
+x-superset-image: &superset-image dc.10web.io:5050/reporting/superset:3.0.2.1
 x-superset-depends-on: &superset-depends-on
   - db
   - redis
diff --git a/superset-frontend/.eslintignore b/superset-frontend/.eslintignore
index 77a260ef08ce7..991aef334c1ea 100644
--- a/superset-frontend/.eslintignore
+++ b/superset-frontend/.eslintignore
@@ -34,3 +34,4 @@ lib/
 tmp/
 storybook-static/
 plugins/funnel-chart-plugin/*
+plugins/calendar-picker/*
diff --git a/superset-frontend/package-lock.json b/superset-frontend/package-lock.json
index 285aaaa36c9aa..f88f751b0b5c6 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "superset",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "superset",
-      "version": "3.0.1",
+      "version": "3.0.2",
       "license": "Apache-2.0",
       "workspaces": [
         "packages/*",
@@ -68686,7 +68686,7 @@
     },
     "plugins/calendar-picker/package": {
       "name": "calendar-picker",
-      "version": "0.1.4",
+      "version": "0.1.5",
       "license": "Apache-2.0",
       "dependencies": {
         "@types/node": "^20.8.9",
diff --git a/superset-frontend/src/GlobalStyles.tsx b/superset-frontend/src/GlobalStyles.tsx
index f983c262d7c20..8f6b5fd33162f 100644
--- a/superset-frontend/src/GlobalStyles.tsx
+++ b/superset-frontend/src/GlobalStyles.tsx
@@ -90,6 +90,9 @@ export const GlobalStyles = () => (
           margin-right: 0;
         }
       }
+      div[data-test-viz-type='calendar-picker'] {
+        display: none;
+      }
     `}
   />
 );
diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js
index 0172e3dcea191..47025a9e33ed6 100644
--- a/superset-frontend/src/visualizations/presets/MainPreset.js
+++ b/superset-frontend/src/visualizations/presets/MainPreset.js
@@ -165,7 +165,7 @@ export default class MainPreset extends Preset {
         new HandlebarsChartPlugin().configure({ key: 'handlebars' }),
         new CalendarRangePlugin().configure({ key: 'calendar_range' }),
         new SupersetxFunnelChartPlugin().configure({ key: 'funnel_chart' }),
-	new CalendarPicker().configure({ key: 'calendar-picker' }), 
+        new CalendarPicker().configure({ key: 'calendar-picker' }),
         ...experimentalplugins,
       ],
     });