Fixes CI errors

apache · Mar 20, 2024 · 3177f66 · 3177f66
1 parent 35835e7
commit 3177f66
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx b/superset-frontend/src/components/Chart/DrillDetail/DrillDetailMenuItems.tsx
@@ -113,7 +113,7 @@ const DrillDetailMenuItems = ({
 }: DrillDetailMenuItemsProps) => {
   const drillToDetailDisabled = useSelector<RootState, boolean | undefined>(
     ({ datasources }) =>
-      datasources[formData.datasource]?.database.disable_drill_to_detail,
+      datasources[formData.datasource]?.database?.disable_drill_to_detail,
   );
 
   const [modalFilters, setFilters] = useState<BinaryQueryObjectFilterClause[]>(

diff --git a/superset-frontend/src/dashboard/types.ts b/superset-frontend/src/dashboard/types.ts
@@ -144,7 +144,7 @@ export type Datasource = Dataset & {
   uid: string;
   column_types: GenericDataType[];
   table_name: string;
-  database: Database;
+  database?: Database;
 };
 export type DatasourcesState = {
   [key: string]: Datasource;

diff --git a/superset/databases/api.py b/superset/databases/api.py
@@ -1364,9 +1364,9 @@ def available(self) -> Response:
                 and getattr(engine_spec, "default_driver") in drivers
             ):
                 payload["parameters"] = engine_spec.parameters_json_schema()
-                payload["sqlalchemy_uri_placeholder"] = (
-                    engine_spec.sqlalchemy_uri_placeholder
-                )
+                payload[
+                    "sqlalchemy_uri_placeholder"
+                ] = engine_spec.sqlalchemy_uri_placeholder
 
             available_databases.append(payload)
 

diff --git a/superset/models/core.py b/superset/models/core.py
@@ -375,7 +375,9 @@ def get_effective_user(self, object_url: URL) -> str | None:
         return (
             username
             if (username := get_username())
-            else object_url.username if self.impersonate_user else None
+            else object_url.username
+            if self.impersonate_user
+            else None
         )
 
     @contextmanager