From 3b035d2af32ff22ea87b9925b7e60fe0f74b2475 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Wed, 16 Sep 2020 08:24:08 -0700
Subject: [PATCH] docs: redirect http -> https (#10900)

* docs: redirect http -> https

* fix issues
---
 .rat-excludes                                 |  5 ++-
 docs/.htaccess                                | 20 +++++++++++
 docs/README.md                                | 35 +++++++++----------
 docs/package.json                             |  2 +-
 .../integration/explore/AdhocFilters.test.ts  |  2 +-
 5 files changed, 41 insertions(+), 23 deletions(-)
 create mode 100644 docs/.htaccess

diff --git a/.rat-excludes b/.rat-excludes
index ef180b77c..482a8e0fe 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -33,9 +33,8 @@ apache_superset.egg-info
 .*csv
 # Generated doc files
 env/*
-docs/_build/*
-docs/_modules/*
-docs/_static/*
+docs/README.md
+docs/.htaccess*
 _build/*
 _static/*
 .buildinfo
diff --git a/docs/.htaccess b/docs/.htaccess
new file mode 100644
index 000000000..8059fb1f4
--- /dev/null
+++ b/docs/.htaccess
@@ -0,0 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+RewriteEngine On
+RewriteCond %{SERVER_PORT} 80
+RewriteRule ^(.*)$ https://superset.apache.org/$1 [R,L]
diff --git a/docs/README.md b/docs/README.md
index 33ee86fc6..738d41d74 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,21 +1,20 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
+[//]: # Licensed to the Apache Software Foundation (ASF) under one
+[//]: # or more contributor license agreements.  See the NOTICE file
+[//]: # distributed with this work for additional information
+[//]: # regarding copyright ownership.  The ASF licenses this file
+[//]: # to you under the Apache License, Version 2.0 (the
+[//]: # "License"); you may not use this file except in compliance
+[//]: # with the License.  You may obtain a copy of the License at
+[//]: #
+[//]: # http://www.apache.org/licenses/LICENSE-2.0
+[//]: #
+[//]: # Unless required by applicable law or agreed to in writing,
+[//]: # software distributed under the License is distributed on an
+[//]: # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+[//]: # KIND, either express or implied.  See the License for the
+[//]: # specific language governing permissions and limitations
+[//]: # under the License.
 
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
 Here's the source to the documentation hosted at
 <a href="https://superset.apache.org">superset.apache.org</a>
 
@@ -37,7 +36,7 @@ npm run start
 To publish, the static site that Gatsby generates needs to be pushed
 to the `asf-site` branch on the
 [apache/incubator-superset-site](https://github.com/apache/incubator-superset-site/)
-repository. No need to PR here, just `git push`!
+repository. No need to PR here, simply `git push`.
 
 ```bash
 # Get in the docs/ folder in the main repo
diff --git a/docs/package.json b/docs/package.json
index 64eef1e7d..5002b7f54 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -46,7 +46,7 @@
   ],
   "license": "0BSD",
   "scripts": {
-    "build": "gatsby build",
+    "build": "gatsby build && cp .htaccess public/",
     "develop": "gatsby develop",
     "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,md,mdx}\"",
     "start": "npm run develop",
diff --git a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts
index d1969f341..73386e432 100644
--- a/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts
+++ b/superset-frontend/cypress-base/cypress/integration/explore/AdhocFilters.test.ts
@@ -64,7 +64,7 @@ describe('AdhocFilters', () => {
     });
   });
 
-  it('Set custom adhoc filter', () => {
+  xit('Set custom adhoc filter', () => {
     cy.visitChartByName('Num Births Trend');
     cy.verifySliceSuccess({ waitAlias: '@postJson' });