Merge branch 'apache:master' into master

Musa10 · Jan 8, 2024 · 59d0f72 · 59d0f72
2 parents 16e1db6 + 6d58566
commit 59d0f72
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 182 deletions.
diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml
@@ -150,7 +150,9 @@ jobs:
       SUPERSET_CONFIG: tests.integration_tests.superset_test_config
       REDIS_PORT: 16379
       SUPERSET__SQLALCHEMY_DATABASE_URI: |
-        sqlite:///${{ github.workspace }}/.temp/unittest.db
+        sqlite:///${{ github.workspace }}/.temp/superset.db?check_same_thread=true
+      SUPERSET__SQLALCHEMY_EXAMPLES_URI: |
+        sqlite:///${{ github.workspace }}/.temp/examples.db?check_same_thread=true
     services:
       redis:
         image: redis:7-alpine

diff --git a/docs/docs/frequently-asked-questions.mdx b/docs/docs/frequently-asked-questions.mdx
@@ -175,10 +175,6 @@ non-OLTP databases are not designed for this type of workload.
 You can take a look at this Flask-AppBuilder
 [configuration example](https://github.com/dpgaspar/Flask-AppBuilder/blob/master/examples/oauth/config.py).
 
-### How can I set a default filter on my dashboard?
-
-Simply apply the filter and save the dashboard while the filter is active.
-
 ### Is there a way to force the dashboard to use specific colors?
 
 It is possible on a per-dashboard basis by providing a mapping of labels to colors in the JSON

diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeGallery.tsx
@@ -849,10 +849,18 @@ export default function VizTypeGallery(props: VizTypeGalleryProps) {
                 grid-area: examples-header;
               `}
             >
-              {!!selectedVizMetadata?.exampleGallery?.length && t('Examples')}
+              {t('Examples')}
             </SectionTitle>
             <Examples>
-              {(selectedVizMetadata?.exampleGallery || []).map(example => (
+              {(selectedVizMetadata?.exampleGallery?.length
+                ? selectedVizMetadata.exampleGallery
+                : [
+                    {
+                      url: selectedVizMetadata?.thumbnail,
+                      caption: selectedVizMetadata?.name,
+                    },
+                  ]
+              ).map(example => (
                 <img
                   key={example.url}
                   src={example.url}

diff --git a/superset-websocket/package-lock.json b/superset-websocket/package-lock.json
diff --git a/superset-websocket/package.json b/superset-websocket/package.json
@@ -31,7 +31,7 @@
     "@types/ioredis": "^4.27.8",
     "@types/jest": "^27.0.2",
     "@types/jsonwebtoken": "^9.0.5",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.10.7",
     "@types/uuid": "^9.0.7",
     "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^5.61.0",