From a0164e930a623703423764f969a494f035f195e7 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Wed, 3 Nov 2021 16:56:00 +0000
Subject: [PATCH 01/20] Certify charts

---
 .../src/components/ListView/types.ts          |   1 +
 .../components/PropertiesModal/index.tsx      | 109 +++++++++++-------
 superset-frontend/src/types/Chart.ts          |   4 +
 .../src/views/CRUD/chart/ChartList.tsx        |  28 ++++-
 superset-frontend/src/views/CRUD/hooks.ts     |   2 +
 superset/charts/api.py                        |  44 ++++---
 superset/charts/filters.py                    |  29 ++++-
 superset/charts/schemas.py                    |  63 +++++++---
 ...53d_add_certifications_columns_to_slice.py |  36 ++++++
 superset/models/slice.py                      |   4 +
 superset/views/base_api.py                    |  24 ++--
 11 files changed, 261 insertions(+), 83 deletions(-)
 create mode 100644 superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py

diff --git a/superset-frontend/src/components/ListView/types.ts b/superset-frontend/src/components/ListView/types.ts
index ade33df610242..89824885480f9 100644
--- a/superset-frontend/src/components/ListView/types.ts
+++ b/superset-frontend/src/components/ListView/types.ts
@@ -111,4 +111,5 @@ export enum FilterOperator {
   between = 'between',
   dashboardIsFav = 'dashboard_is_favorite',
   chartIsFav = 'chart_is_favorite',
+  chartIsCertified = 'chart_is_certified',
 }
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 723f77bfdc5bd..8c6eccd4645a2 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -18,14 +18,13 @@
  */
 import React, { useMemo, useState, useEffect, useCallback } from 'react';
 import Modal from 'src/components/Modal';
-import { Row, Col, Input, TextArea } from 'src/common/components';
+import { Form, Row, Col, Input, TextArea } from 'src/common/components';
 import Button from 'src/components/Button';
 import { Select } from 'src/components';
 import { SelectValue } from 'antd/lib/select';
 import rison from 'rison';
-import { t, SupersetClient } from '@superset-ui/core';
+import { t, SupersetClient, styled } from '@superset-ui/core';
 import Chart, { Slice } from 'src/types/Chart';
-import { Form, FormItem } from 'src/components/Form';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 
 type PropertiesModalProps = {
@@ -35,6 +34,12 @@ type PropertiesModalProps = {
   onSave: (chart: Chart) => void;
 };
 
+const FormItem = Form.Item;
+
+const StyledFormItem = styled(Form.Item)`
+  margin-bottom: 0;
+`;
+
 export default function PropertiesModal({
   slice,
   onHide,
@@ -42,13 +47,9 @@ export default function PropertiesModal({
   show,
 }: PropertiesModalProps) {
   const [submitting, setSubmitting] = useState(false);
-
+  const [form] = Form.useForm();
   // values of form inputs
   const [name, setName] = useState(slice.slice_name || '');
-  const [description, setDescription] = useState(slice.description || '');
-  const [cacheTimeout, setCacheTimeout] = useState(
-    slice.cache_timeout != null ? slice.cache_timeout : '',
-  );
   const [selectedOwners, setSelectedOwners] = useState<SelectValue | null>(
     null,
   );
@@ -104,14 +105,25 @@ export default function PropertiesModal({
     [],
   );
 
-  const onSubmit = async (event: React.FormEvent) => {
-    event.stopPropagation();
-    event.preventDefault();
+  const onSubmit = async (values: {
+    certified_by?: string;
+    certification_details?: string;
+    description?: string;
+    cache_timeout?: number;
+  }) => {
     setSubmitting(true);
+    const {
+      certified_by,
+      certification_details,
+      description,
+      cache_timeout,
+    } = values;
     const payload: { [key: string]: any } = {
       slice_name: name || null,
       description: description || null,
-      cache_timeout: cacheTimeout || null,
+      cache_timeout: cache_timeout || null,
+      certified_by: certified_by || null,
+      certification_details: certification_details || null,
     };
     if (selectedOwners) {
       payload.owners = (selectedOwners as {
@@ -169,11 +181,10 @@ export default function PropertiesModal({
           </Button>
           <Button
             data-test="properties-modal-save-button"
-            htmlType="button"
+            htmlType="submit"
             buttonSize="small"
             buttonStyle="primary"
-            // @ts-ignore
-            onClick={onSubmit}
+            onClick={() => form.submit()}
             disabled={submitting || !name}
             cta
           >
@@ -184,7 +195,18 @@ export default function PropertiesModal({
       responsive
       wrapProps={{ 'data-test': 'properties-edit-modal' }}
     >
-      <Form onFinish={onSubmit} layout="vertical">
+      <Form
+        form={form}
+        onFinish={onSubmit}
+        layout="vertical"
+        initialValues={{
+          name: slice.slice_name || '',
+          description: slice.description || '',
+          cache_timeout: slice.cache_timeout != null ? slice.cache_timeout : '',
+          certified_by: slice.certified_by || '',
+          certification_details: slice.certification_details || '',
+        }}
+      >
         <Row gutter={16}>
           <Col xs={24} md={12}>
             <h3>{t('Basic information')}</h3>
@@ -199,40 +221,47 @@ export default function PropertiesModal({
                 }
               />
             </FormItem>
-            <FormItem label={t('Description')}>
-              <TextArea
-                rows={3}
-                name="description"
-                value={description}
-                onChange={(event: React.ChangeEvent<HTMLTextAreaElement>) =>
-                  setDescription(event.target.value ?? '')
-                }
-                style={{ maxWidth: '100%' }}
-              />
-              <p className="help-block">
+            <FormItem>
+              <StyledFormItem label={t('Description')} name="description">
+                <TextArea rows={3} style={{ maxWidth: '100%' }} />
+              </StyledFormItem>
+              <span className="help-block">
                 {t(
                   'The description can be displayed as widget headers in the dashboard view. Supports markdown.',
                 )}
-              </p>
+              </span>
+            </FormItem>
+            <FormItem>
+              <StyledFormItem label={t('Certified by')} name="certified_by">
+                <Input />
+              </StyledFormItem>
+              <span className="help-block">
+                {t('Person or group that has certified this chart.')}
+              </span>
+            </FormItem>
+            <FormItem>
+              <StyledFormItem
+                label={t('Certification details')}
+                name="certification_details"
+              >
+                <Input />
+              </StyledFormItem>
+              <span className="help-block">
+                {t('Details of the certification.')}
+              </span>
             </FormItem>
           </Col>
           <Col xs={24} md={12}>
             <h3>{t('Configuration')}</h3>
-            <FormItem label={t('Cache timeout')}>
-              <Input
-                name="cacheTimeout"
-                type="text"
-                value={cacheTimeout}
-                onChange={(event: React.ChangeEvent<HTMLInputElement>) => {
-                  const targetValue = event.target.value ?? '';
-                  setCacheTimeout(targetValue.replace(/[^0-9]/, ''));
-                }}
-              />
-              <p className="help-block">
+            <FormItem>
+              <StyledFormItem label={t('Cache timeout')} name="cacheTimeout">
+                <Input />
+              </StyledFormItem>
+              <span className="help-block">
                 {t(
                   "Duration (in seconds) of the caching timeout for this chart. Note this defaults to the dataset's timeout if undefined.",
                 )}
-              </p>
+              </span>
             </FormItem>
             <h3 style={{ marginTop: '1em' }}>{t('Access')}</h3>
             <FormItem label={ownersLabel}>
diff --git a/superset-frontend/src/types/Chart.ts b/superset-frontend/src/types/Chart.ts
index 4c670482b43b2..3fff96ad6d986 100644
--- a/superset-frontend/src/types/Chart.ts
+++ b/superset-frontend/src/types/Chart.ts
@@ -33,6 +33,8 @@ export interface Chart {
   changed_on: string;
   changed_on_delta_humanized?: string;
   changed_on_utc?: string;
+  certified_by: string | null;
+  certification_details: string | null;
   description: string | null;
   cache_timeout: number | null;
   thumbnail_url?: string;
@@ -46,6 +48,8 @@ export type Slice = {
   slice_name: string;
   description: string | null;
   cache_timeout: number | null;
+  certified_by: string | null;
+  certification_details: string | null;
   form_data?: QueryFormData;
   query_context?: object;
 };
diff --git a/superset-frontend/src/views/CRUD/chart/ChartList.tsx b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
index 6eed27e6c21d8..32cd6e197ace7 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartList.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartList.tsx
@@ -58,6 +58,7 @@ import { Tooltip } from 'src/components/Tooltip';
 import Icons from 'src/components/Icons';
 import { nativeFilterGate } from 'src/dashboard/components/nativeFilters/utils';
 import setupPlugins from 'src/setup/setupPlugins';
+import CertifiedIcon from 'src/components/CertifiedIcon';
 import ChartCard from './ChartCard';
 
 const PAGE_SIZE = 25;
@@ -237,11 +238,22 @@ function ChartList(props: ChartListProps) {
       {
         Cell: ({
           row: {
-            original: { url, slice_name: sliceName },
+            original: {
+              url,
+              slice_name: sliceName,
+              certified_by: certifiedBy,
+              certification_details: certificationDetails,
+            },
           },
         }: any) => (
           <a href={url} data-test={`${sliceName}-list-chart-title`}>
-            {sliceName}
+            {sliceName}{' '}
+            {certifiedBy && (
+              <CertifiedIcon
+                certifiedBy={certifiedBy}
+                details={certificationDetails}
+              />
+            )}
           </a>
         ),
         Header: t('Chart'),
@@ -512,6 +524,18 @@ function ChartList(props: ChartListProps) {
         paginate: true,
       },
       ...(props.user.userId ? [favoritesFilter] : []),
+      {
+        Header: t('Certified'),
+        id: 'id',
+        urlDisplay: 'certified',
+        input: 'select',
+        operator: FilterOperator.chartIsCertified,
+        unfilteredLabel: t('Any'),
+        selects: [
+          { label: t('Yes'), value: 'certified' },
+          { label: t('No'), value: 'not-certified' },
+        ],
+      },
       {
         Header: t('Search'),
         id: 'slice_name',
diff --git a/superset-frontend/src/views/CRUD/hooks.ts b/superset-frontend/src/views/CRUD/hooks.ts
index 7a546baa8cca1..85f560f8ea1f5 100644
--- a/superset-frontend/src/views/CRUD/hooks.ts
+++ b/superset-frontend/src/views/CRUD/hooks.ts
@@ -566,6 +566,8 @@ export const useChartEditModal = (
       slice_name: chart.slice_name,
       description: chart.description,
       cache_timeout: chart.cache_timeout,
+      certified_by: chart.certified_by,
+      certification_details: chart.certification_details,
     });
   }
 
diff --git a/superset/charts/api.py b/superset/charts/api.py
index 07fe642fbfb95..a98b5cda942bf 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -52,7 +52,7 @@
 from superset.charts.commands.importers.dispatcher import ImportChartsCommand
 from superset.charts.commands.update import UpdateChartCommand
 from superset.charts.dao import ChartDAO
-from superset.charts.filters import ChartAllTextFilter, ChartFavoriteFilter, ChartFilter
+from superset.charts.filters import ChartAllTextFilter, ChartCertifiedFilter, ChartFavoriteFilter, ChartFilter
 from superset.charts.post_processing import apply_post_process
 from superset.charts.schemas import (
     CHART_SCHEMAS,
@@ -121,6 +121,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     method_permission_name = MODEL_API_RW_METHOD_PERMISSION_MAP
     show_columns = [
         "cache_timeout",
+        "certified_by",
+        "certification_details",
         "dashboards.dashboard_title",
         "dashboards.id",
         "description",
@@ -135,6 +137,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     ]
     show_select_columns = show_columns + ["table.id"]
     list_columns = [
+        "certified_by",
+        "certification_details",
         "cache_timeout",
         "changed_by.first_name",
         "changed_by.last_name",
@@ -201,7 +205,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     base_order = ("changed_on", "desc")
     base_filters = [["id", ChartFilter, lambda: []]]
     search_filters = {
-        "id": [ChartFavoriteFilter],
+        "id": [ChartFavoriteFilter, ChartCertifiedFilter],
         "slice_name": [ChartAllTextFilter],
     }
 
@@ -384,7 +388,8 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,
     )
     def delete(self, pk: int) -> Response:
@@ -441,7 +446,8 @@ def delete(self, pk: int) -> Response:
     @statsd_metrics
     @rison(get_delete_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
         log_to_statsd=False,
     )
     def bulk_delete(self, **kwargs: Any) -> Response:
@@ -614,7 +620,8 @@ def get_data(self, pk: int) -> Response:
         json_body["result_format"] = request.args.get(
             "format", ChartDataResultFormat.JSON
         )
-        json_body["result_type"] = request.args.get("type", ChartDataResultType.FULL)
+        json_body["result_type"] = request.args.get(
+            "type", ChartDataResultType.FULL)
 
         try:
             command = ChartDataCommand()
@@ -802,7 +809,8 @@ def data_from_cache(self, cache_key: str) -> Response:
             return self.response_404()
         except ValidationError as error:
             return self.response_400(
-                message=_("Request is incorrect: %(error)s", error=error.messages)
+                message=_("Request is incorrect: %(error)s",
+                          error=error.messages)
             )
 
         return self.get_data_response(command, True)
@@ -861,7 +869,8 @@ def cache_screenshot(self, pk: int, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        chart_url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
+        chart_url = get_url_path(
+            "Superset.slice", slice_id=chart.id, standalone="true")
         screenshot_obj = ChartScreenshot(chart_url, chart.digest)
         cache_key = screenshot_obj.cache_key(window_size, thumb_size)
         image_url = get_url_path(
@@ -889,7 +898,8 @@ def trigger_celery() -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.screenshot",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.screenshot",
         log_to_statsd=False,
     )
     def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
@@ -946,7 +956,8 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
     def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
@@ -986,10 +997,12 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
+        url = get_url_path(
+            "Superset.slice", slice_id=chart.id, standalone="true")
         if kwargs["rison"].get("force", False):
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
+                    chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -1001,7 +1014,8 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not screenshot:
             self.incr_stats("async", self.thumbnail.__name__)
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
+                    chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -1024,7 +1038,8 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
     @statsd_metrics
     @rison(get_export_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
     )
     def export(self, **kwargs: Any) -> Response:
@@ -1137,7 +1152,8 @@ def favorite_status(self, **kwargs: Any) -> Response:
     @protect()
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.import_",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.import_",
         log_to_statsd=False,
     )
     def import_(self) -> Response:
diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index 7d8338edd32ea..557254d21563c 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -17,7 +17,7 @@
 from typing import Any
 
 from flask_babel import lazy_gettext as _
-from sqlalchemy import or_
+from sqlalchemy import or_, and_
 from sqlalchemy.orm.query import Query
 
 from superset import security_manager
@@ -55,6 +55,30 @@ class ChartFavoriteFilter(BaseFavoriteFilter):  # pylint: disable=too-few-public
     model = Slice
 
 
+class ChartCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-methods
+    """
+    Custom filter for the GET list that filters all certified charts
+    """
+
+    name = _("Is certified")
+    arg_name = "chart_is_certified"
+
+    def apply(self, query: Query, value: Any) -> Query:
+        if not value:
+            return query
+        if value == 'certified':
+            return query.filter(
+                and_(
+                    Slice.certified_by.isnot(None)
+                )
+            )
+        return query.filter(
+            and_(
+                Slice.certified_by.is_(None)
+            )
+        )
+
+
 class ChartFilter(BaseFilter):  # pylint: disable=too-few-public-methods
     def apply(self, query: Query, value: Any) -> Query:
         if security_manager.can_access_all_datasources():
@@ -62,5 +86,6 @@ def apply(self, query: Query, value: Any) -> Query:
         perms = security_manager.user_view_menu_names("datasource_access")
         schema_perms = security_manager.user_view_menu_names("schema_access")
         return query.filter(
-            or_(self.model.perm.in_(perms), self.model.schema_perm.in_(schema_perms))
+            or_(self.model.perm.in_(perms),
+                self.model.schema_perm.in_(schema_perms))
         )
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index af9bc8d62f99c..685d7e51e7aa9 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -114,6 +114,8 @@
 )
 description_markeddown_description = "Sanitized HTML version of the chart description."
 owners_name_description = "Name of an owner of the chart."
+certified_by_description = "Person or group that has certified this chart"
+certification_details_description = "Details of the certification"
 
 #
 # OpenAPI method specification overrides
@@ -157,6 +159,9 @@ class ChartEntityResponseSchema(Schema):
     )
     form_data = fields.Dict(description=form_data_description)
     slice_url = fields.String(description=slice_url_description)
+    certified_by = fields.String(description=certified_by_description)
+    certification_details = fields.String(
+        description=certification_details_description)
 
 
 class ChartPostSchema(Schema):
@@ -167,7 +172,8 @@ class ChartPostSchema(Schema):
     slice_name = fields.String(
         description=slice_name_description, required=True, validate=Length(1, 250)
     )
-    description = fields.String(description=description_description, allow_none=True)
+    description = fields.String(
+        description=description_description, allow_none=True)
     viz_type = fields.String(
         description=viz_type_description,
         validate=Length(0, 250),
@@ -188,7 +194,8 @@ class ChartPostSchema(Schema):
     cache_timeout = fields.Integer(
         description=cache_timeout_description, allow_none=True
     )
-    datasource_id = fields.Integer(description=datasource_id_description, required=True)
+    datasource_id = fields.Integer(
+        description=datasource_id_description, required=True)
     datasource_type = fields.String(
         description=datasource_type_description,
         validate=validate.OneOf(choices=("druid", "table", "view")),
@@ -197,7 +204,12 @@ class ChartPostSchema(Schema):
     datasource_name = fields.String(
         description=datasource_name_description, allow_none=True
     )
-    dashboards = fields.List(fields.Integer(description=dashboards_description))
+    dashboards = fields.List(fields.Integer(
+        description=dashboards_description))
+    certified_by = fields.String(
+        description=certified_by_description, allow_none=True)
+    certification_details = fields.String(
+        description=certification_details_description, allow_none=True)
 
 
 class ChartPutSchema(Schema):
@@ -208,7 +220,8 @@ class ChartPutSchema(Schema):
     slice_name = fields.String(
         description=slice_name_description, allow_none=True, validate=Length(0, 250)
     )
-    description = fields.String(description=description_description, allow_none=True)
+    description = fields.String(
+        description=description_description, allow_none=True)
     viz_type = fields.String(
         description=viz_type_description,
         allow_none=True,
@@ -234,7 +247,12 @@ class ChartPutSchema(Schema):
         validate=validate.OneOf(choices=("druid", "table", "view")),
         allow_none=True,
     )
-    dashboards = fields.List(fields.Integer(description=dashboards_description))
+    dashboards = fields.List(fields.Integer(
+        description=dashboards_description))
+    certified_by = fields.String(
+        description=certified_by_description, allow_none=True)
+    certification_details = fields.String(
+        description=certification_details_description, allow_none=True)
 
 
 class ChartGetDatasourceObjectDataResponseSchema(Schema):
@@ -765,7 +783,7 @@ class ChartDataPostProcessingOperationSchema(Schema):
                     "column": "age",
                     "options": {"q": 0.25},
                 },
-                "age_mean": {"operator": "mean", "column": "age",},
+                "age_mean": {"operator": "mean", "column": "age", },
             },
         },
     )
@@ -799,7 +817,8 @@ class ChartDataFilterSchema(Schema):
 
 class ChartDataExtrasSchema(Schema):
 
-    time_range_endpoints = fields.List(EnumField(TimeRangeEndpoint, by_value=True))
+    time_range_endpoints = fields.List(
+        EnumField(TimeRangeEndpoint, by_value=True))
     relative_start = fields.String(
         description="Start time for relative time deltas. "
         'Default: `config["DEFAULT_RELATIVE_START_TIME"]`',
@@ -876,14 +895,16 @@ class AnnotationLayerSchema(Schema):
         keys=fields.String(
             desciption="Name of property to be overridden",
             validate=validate.OneOf(
-                choices=("granularity", "time_grain_sqla", "time_range", "time_shift"),
+                choices=("granularity", "time_grain_sqla",
+                         "time_range", "time_shift"),
             ),
         ),
         values=fields.Raw(allow_none=True),
         description="which properties should be overridable",
         allow_none=True,
     )
-    show = fields.Boolean(description="Should the layer be shown", required=True)
+    show = fields.Boolean(
+        description="Should the layer be shown", required=True)
     showMarkers = fields.Boolean(
         description="Should markers be shown. Only applies to line annotations.",
         required=True,
@@ -894,12 +915,14 @@ class AnnotationLayerSchema(Schema):
     )
     style = fields.String(
         description="Line style. Only applies to time-series annotations",
-        validate=validate.OneOf(choices=("dashed", "dotted", "solid", "longDashed",)),
+        validate=validate.OneOf(
+            choices=("dashed", "dotted", "solid", "longDashed",)),
     )
     timeColumn = fields.String(
         description="Column with event date or interval start date", allow_none=True,
     )
-    titleColumn = fields.String(description="Column with title", allow_none=True,)
+    titleColumn = fields.String(
+        description="Column with title", allow_none=True,)
     width = fields.Float(
         description="Width of annotation line",
         validate=[
@@ -931,7 +954,8 @@ class Meta:  # pylint: disable=too-few-public-methods
         unknown = EXCLUDE
 
     datasource = fields.Nested(ChartDataDatasourceSchema, allow_none=True)
-    result_type = EnumField(ChartDataResultType, by_value=True, allow_none=True)
+    result_type = EnumField(ChartDataResultType,
+                            by_value=True, allow_none=True)
 
     annotation_layers = fields.List(
         fields.Nested(AnnotationLayerSchema),
@@ -948,7 +972,8 @@ class Meta:  # pylint: disable=too-few-public-methods
         "if defined in datasource",
         allow_none=True,
     )
-    filters = fields.List(fields.Nested(ChartDataFilterSchema), allow_none=True)
+    filters = fields.List(fields.Nested(
+        ChartDataFilterSchema), allow_none=True)
     granularity = fields.String(
         description="Name of temporal column used for time filtering. For legacy Druid "
         "datasources this defines the time grain.",
@@ -1072,7 +1097,8 @@ class Meta:  # pylint: disable=too-few-public-methods
             (
                 fields.Raw(
                     validate=[
-                        Length(min=1, error=_("orderby column must be populated"))
+                        Length(min=1, error=_(
+                            "orderby column must be populated"))
                     ],
                     allow_none=False,
                 ),
@@ -1227,9 +1253,11 @@ class ChartDataAsyncResponseSchema(Schema):
     channel_id = fields.String(
         description="Unique session async channel ID", allow_none=False,
     )
-    job_id = fields.String(description="Unique async job ID", allow_none=False,)
+    job_id = fields.String(
+        description="Unique async job ID", allow_none=False,)
     user_id = fields.String(description="Requesting user ID", allow_none=True,)
-    status = fields.String(description="Status value for async job", allow_none=False,)
+    status = fields.String(
+        description="Status value for async job", allow_none=False,)
     result_url = fields.String(
         description="Unique result URL for fetching async query data", allow_none=False,
     )
@@ -1251,7 +1279,8 @@ class ImportV1ChartSchema(Schema):
     slice_name = fields.String(required=True)
     viz_type = fields.String(required=True)
     params = fields.Dict()
-    query_context = fields.String(allow_none=True, validate=utils.validate_json)
+    query_context = fields.String(
+        allow_none=True, validate=utils.validate_json)
     cache_timeout = fields.Integer(allow_none=True)
     uuid = fields.UUID(required=True)
     version = fields.String(required=True)
diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
new file mode 100644
index 0000000000000..e924da3d959da
--- /dev/null
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -0,0 +1,36 @@
+# 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.
+"""add_certifications_columns_to_slice
+
+Revision ID: f9847149153d
+Revises: b92d69a6643c
+Create Date: 2021-11-03 14:07:09.905194
+
+"""
+
+# revision identifiers, used by Alembic.
+import sqlalchemy as sa
+from alembic import op
+revision = 'f9847149153d'
+down_revision = 'b92d69a6643c'
+
+
+def upgrade():
+    op.add_column('slices', sa.Column(
+        'certified_by', sa.Text(), nullable=True))
+    op.add_column('slices', sa.Column(
+        'certification_details', sa.Text(), nullable=True))
diff --git a/superset/models/slice.py b/superset/models/slice.py
index 6bf05ffc87fdd..9dcdca40285b0 100644
--- a/superset/models/slice.py
+++ b/superset/models/slice.py
@@ -75,6 +75,8 @@ class Slice(  # pylint: disable=too-many-public-methods
     # when the database row was last written
     last_saved_at = Column(DateTime, nullable=True)
     last_saved_by_fk = Column(Integer, ForeignKey("ab_user.id"), nullable=True)
+    certified_by = Column(Text)
+    certification_details = Column(Text)
     last_saved_by = relationship(
         security_manager.user_model, foreign_keys=[last_saved_by_fk]
     )
@@ -205,6 +207,8 @@ def data(self) -> Dict[str, Any]:
             "slice_id": self.id,
             "slice_name": self.slice_name,
             "slice_url": self.slice_url,
+            "certified_by": self.certified_by,
+            "certification_details": self.certification_details,
         }
 
     @property
diff --git a/superset/views/base_api.py b/superset/views/base_api.py
index e80134605f54b..6c9a38a530c9f 100644
--- a/superset/views/base_api.py
+++ b/superset/views/base_api.py
@@ -268,7 +268,8 @@ def _get_related_filter(
     ) -> Filters:
         filter_field = self.related_field_filters.get(column_name)
         if isinstance(filter_field, str):
-            filter_field = RelatedFieldFilter(cast(str, filter_field), FilterStartsWith)
+            filter_field = RelatedFieldFilter(
+                cast(str, filter_field), FilterStartsWith)
         filter_field = cast(RelatedFieldFilter, filter_field)
         search_columns = [filter_field.field_name] if filter_field else None
         filters = datamodel.get_filters(search_columns)
@@ -324,8 +325,10 @@ def _add_extra_ids_to_result(
             ids = [id_ for id_ in ids if id_ not in values]
             pk_col = datamodel.get_pk()
             # Fetch requested values from ids
-            extra_rows = db.session.query(datamodel.obj).filter(pk_col.in_(ids)).all()
-            result += self._get_result_from_rows(datamodel, extra_rows, column_name)
+            extra_rows = db.session.query(
+                datamodel.obj).filter(pk_col.in_(ids)).all()
+            result += self._get_result_from_rows(
+                datamodel, extra_rows, column_name)
 
     def incr_stats(self, action: str, func_name: str) -> None:
         """
@@ -334,7 +337,8 @@ def incr_stats(self, action: str, func_name: str) -> None:
         :param action: String with an action name eg: error, success
         :param func_name: The function name
         """
-        self.stats_logger.incr(f"{self.__class__.__name__}.{func_name}.{action}")
+        self.stats_logger.incr(
+            f"{self.__class__.__name__}.{func_name}.{action}")
 
     def timing_stats(self, action: str, func_name: str, value: float) -> None:
         """
@@ -392,7 +396,8 @@ def get_headless(self, pk: int, **kwargs: Any) -> Response:
         return response
 
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_list",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.get_list",
         object_ref=False,
         log_to_statsd=False,
     )
@@ -431,7 +436,8 @@ def put_headless(self, pk: int) -> Response:
         return response
 
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.delete",
         object_ref=False,
         log_to_statsd=False,
     )
@@ -505,7 +511,8 @@ def related(self, column_name: str, **kwargs: Any) -> FlaskResponse:
         else:
             order_column, order_direction = "", ""
         # handle filters
-        filters = self._get_related_filter(datamodel, column_name, args.get("filter"))
+        filters = self._get_related_filter(
+            datamodel, column_name, args.get("filter"))
         # Make the query
         total_rows, rows = datamodel.query(
             filters, order_column, order_direction, page=page, page_size=page_size
@@ -563,7 +570,8 @@ def distinct(self, column_name: str, **kwargs: Any) -> FlaskResponse:
             return self.response_404()
         args = kwargs.get("rison", {})
         # handle pagination
-        page, page_size = self._sanitize_page_args(*self._handle_page_args(args))
+        page, page_size = self._sanitize_page_args(
+            *self._handle_page_args(args))
         # Create generic base filters with added request filter
         filters = self._get_distinct_filter(column_name, args.get("filter"))
         # Make the query

From b6e35ca7649e647f61f79bf3c57c3d00c845f53c Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Wed, 3 Nov 2021 17:10:26 +0000
Subject: [PATCH 02/20] Format

---
 superset/charts/api.py                        | 43 +++++-------
 superset/charts/filters.py                    | 19 ++----
 superset/charts/schemas.py                    | 65 +++++++------------
 ...53d_add_certifications_columns_to_slice.py | 13 ++--
 superset/views/base_api.py                    | 24 +++----
 5 files changed, 62 insertions(+), 102 deletions(-)

diff --git a/superset/charts/api.py b/superset/charts/api.py
index a98b5cda942bf..8608ebdf3f5c4 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -52,7 +52,12 @@
 from superset.charts.commands.importers.dispatcher import ImportChartsCommand
 from superset.charts.commands.update import UpdateChartCommand
 from superset.charts.dao import ChartDAO
-from superset.charts.filters import ChartAllTextFilter, ChartCertifiedFilter, ChartFavoriteFilter, ChartFilter
+from superset.charts.filters import (
+    ChartAllTextFilter,
+    ChartCertifiedFilter,
+    ChartFavoriteFilter,
+    ChartFilter,
+)
 from superset.charts.post_processing import apply_post_process
 from superset.charts.schemas import (
     CHART_SCHEMAS,
@@ -388,8 +393,7 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,
     )
     def delete(self, pk: int) -> Response:
@@ -446,8 +450,7 @@ def delete(self, pk: int) -> Response:
     @statsd_metrics
     @rison(get_delete_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
         log_to_statsd=False,
     )
     def bulk_delete(self, **kwargs: Any) -> Response:
@@ -620,8 +623,7 @@ def get_data(self, pk: int) -> Response:
         json_body["result_format"] = request.args.get(
             "format", ChartDataResultFormat.JSON
         )
-        json_body["result_type"] = request.args.get(
-            "type", ChartDataResultType.FULL)
+        json_body["result_type"] = request.args.get("type", ChartDataResultType.FULL)
 
         try:
             command = ChartDataCommand()
@@ -809,8 +811,7 @@ def data_from_cache(self, cache_key: str) -> Response:
             return self.response_404()
         except ValidationError as error:
             return self.response_400(
-                message=_("Request is incorrect: %(error)s",
-                          error=error.messages)
+                message=_("Request is incorrect: %(error)s", error=error.messages)
             )
 
         return self.get_data_response(command, True)
@@ -869,8 +870,7 @@ def cache_screenshot(self, pk: int, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        chart_url = get_url_path(
-            "Superset.slice", slice_id=chart.id, standalone="true")
+        chart_url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
         screenshot_obj = ChartScreenshot(chart_url, chart.digest)
         cache_key = screenshot_obj.cache_key(window_size, thumb_size)
         image_url = get_url_path(
@@ -898,8 +898,7 @@ def trigger_celery() -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.screenshot",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.screenshot",
         log_to_statsd=False,
     )
     def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
@@ -956,8 +955,7 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.thumbnail",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
     def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
@@ -997,12 +995,10 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        url = get_url_path(
-            "Superset.slice", slice_id=chart.id, standalone="true")
+        url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
         if kwargs["rison"].get("force", False):
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
-                    chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -1014,8 +1010,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not screenshot:
             self.incr_stats("async", self.thumbnail.__name__)
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
-                    chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -1038,8 +1033,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
     @statsd_metrics
     @rison(get_export_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.export",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
     )
     def export(self, **kwargs: Any) -> Response:
@@ -1152,8 +1146,7 @@ def favorite_status(self, **kwargs: Any) -> Response:
     @protect()
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.import_",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.import_",
         log_to_statsd=False,
     )
     def import_(self) -> Response:
diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index 557254d21563c..598bb4f864dd2 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -17,7 +17,7 @@
 from typing import Any
 
 from flask_babel import lazy_gettext as _
-from sqlalchemy import or_, and_
+from sqlalchemy import and_, or_
 from sqlalchemy.orm.query import Query
 
 from superset import security_manager
@@ -66,17 +66,9 @@ class ChartCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-method
     def apply(self, query: Query, value: Any) -> Query:
         if not value:
             return query
-        if value == 'certified':
-            return query.filter(
-                and_(
-                    Slice.certified_by.isnot(None)
-                )
-            )
-        return query.filter(
-            and_(
-                Slice.certified_by.is_(None)
-            )
-        )
+        if value == "certified":
+            return query.filter(and_(Slice.certified_by.isnot(None)))
+        return query.filter(and_(Slice.certified_by.is_(None)))
 
 
 class ChartFilter(BaseFilter):  # pylint: disable=too-few-public-methods
@@ -86,6 +78,5 @@ def apply(self, query: Query, value: Any) -> Query:
         perms = security_manager.user_view_menu_names("datasource_access")
         schema_perms = security_manager.user_view_menu_names("schema_access")
         return query.filter(
-            or_(self.model.perm.in_(perms),
-                self.model.schema_perm.in_(schema_perms))
+            or_(self.model.perm.in_(perms), self.model.schema_perm.in_(schema_perms))
         )
diff --git a/superset/charts/schemas.py b/superset/charts/schemas.py
index 685d7e51e7aa9..3ae3dfddca65b 100644
--- a/superset/charts/schemas.py
+++ b/superset/charts/schemas.py
@@ -160,8 +160,7 @@ class ChartEntityResponseSchema(Schema):
     form_data = fields.Dict(description=form_data_description)
     slice_url = fields.String(description=slice_url_description)
     certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(
-        description=certification_details_description)
+    certification_details = fields.String(description=certification_details_description)
 
 
 class ChartPostSchema(Schema):
@@ -172,8 +171,7 @@ class ChartPostSchema(Schema):
     slice_name = fields.String(
         description=slice_name_description, required=True, validate=Length(1, 250)
     )
-    description = fields.String(
-        description=description_description, allow_none=True)
+    description = fields.String(description=description_description, allow_none=True)
     viz_type = fields.String(
         description=viz_type_description,
         validate=Length(0, 250),
@@ -194,8 +192,7 @@ class ChartPostSchema(Schema):
     cache_timeout = fields.Integer(
         description=cache_timeout_description, allow_none=True
     )
-    datasource_id = fields.Integer(
-        description=datasource_id_description, required=True)
+    datasource_id = fields.Integer(description=datasource_id_description, required=True)
     datasource_type = fields.String(
         description=datasource_type_description,
         validate=validate.OneOf(choices=("druid", "table", "view")),
@@ -204,12 +201,11 @@ class ChartPostSchema(Schema):
     datasource_name = fields.String(
         description=datasource_name_description, allow_none=True
     )
-    dashboards = fields.List(fields.Integer(
-        description=dashboards_description))
-    certified_by = fields.String(
-        description=certified_by_description, allow_none=True)
+    dashboards = fields.List(fields.Integer(description=dashboards_description))
+    certified_by = fields.String(description=certified_by_description, allow_none=True)
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True)
+        description=certification_details_description, allow_none=True
+    )
 
 
 class ChartPutSchema(Schema):
@@ -220,8 +216,7 @@ class ChartPutSchema(Schema):
     slice_name = fields.String(
         description=slice_name_description, allow_none=True, validate=Length(0, 250)
     )
-    description = fields.String(
-        description=description_description, allow_none=True)
+    description = fields.String(description=description_description, allow_none=True)
     viz_type = fields.String(
         description=viz_type_description,
         allow_none=True,
@@ -247,12 +242,11 @@ class ChartPutSchema(Schema):
         validate=validate.OneOf(choices=("druid", "table", "view")),
         allow_none=True,
     )
-    dashboards = fields.List(fields.Integer(
-        description=dashboards_description))
-    certified_by = fields.String(
-        description=certified_by_description, allow_none=True)
+    dashboards = fields.List(fields.Integer(description=dashboards_description))
+    certified_by = fields.String(description=certified_by_description, allow_none=True)
     certification_details = fields.String(
-        description=certification_details_description, allow_none=True)
+        description=certification_details_description, allow_none=True
+    )
 
 
 class ChartGetDatasourceObjectDataResponseSchema(Schema):
@@ -783,7 +777,7 @@ class ChartDataPostProcessingOperationSchema(Schema):
                     "column": "age",
                     "options": {"q": 0.25},
                 },
-                "age_mean": {"operator": "mean", "column": "age", },
+                "age_mean": {"operator": "mean", "column": "age",},
             },
         },
     )
@@ -817,8 +811,7 @@ class ChartDataFilterSchema(Schema):
 
 class ChartDataExtrasSchema(Schema):
 
-    time_range_endpoints = fields.List(
-        EnumField(TimeRangeEndpoint, by_value=True))
+    time_range_endpoints = fields.List(EnumField(TimeRangeEndpoint, by_value=True))
     relative_start = fields.String(
         description="Start time for relative time deltas. "
         'Default: `config["DEFAULT_RELATIVE_START_TIME"]`',
@@ -895,16 +888,14 @@ class AnnotationLayerSchema(Schema):
         keys=fields.String(
             desciption="Name of property to be overridden",
             validate=validate.OneOf(
-                choices=("granularity", "time_grain_sqla",
-                         "time_range", "time_shift"),
+                choices=("granularity", "time_grain_sqla", "time_range", "time_shift"),
             ),
         ),
         values=fields.Raw(allow_none=True),
         description="which properties should be overridable",
         allow_none=True,
     )
-    show = fields.Boolean(
-        description="Should the layer be shown", required=True)
+    show = fields.Boolean(description="Should the layer be shown", required=True)
     showMarkers = fields.Boolean(
         description="Should markers be shown. Only applies to line annotations.",
         required=True,
@@ -915,14 +906,12 @@ class AnnotationLayerSchema(Schema):
     )
     style = fields.String(
         description="Line style. Only applies to time-series annotations",
-        validate=validate.OneOf(
-            choices=("dashed", "dotted", "solid", "longDashed",)),
+        validate=validate.OneOf(choices=("dashed", "dotted", "solid", "longDashed",)),
     )
     timeColumn = fields.String(
         description="Column with event date or interval start date", allow_none=True,
     )
-    titleColumn = fields.String(
-        description="Column with title", allow_none=True,)
+    titleColumn = fields.String(description="Column with title", allow_none=True,)
     width = fields.Float(
         description="Width of annotation line",
         validate=[
@@ -954,8 +943,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         unknown = EXCLUDE
 
     datasource = fields.Nested(ChartDataDatasourceSchema, allow_none=True)
-    result_type = EnumField(ChartDataResultType,
-                            by_value=True, allow_none=True)
+    result_type = EnumField(ChartDataResultType, by_value=True, allow_none=True)
 
     annotation_layers = fields.List(
         fields.Nested(AnnotationLayerSchema),
@@ -972,8 +960,7 @@ class Meta:  # pylint: disable=too-few-public-methods
         "if defined in datasource",
         allow_none=True,
     )
-    filters = fields.List(fields.Nested(
-        ChartDataFilterSchema), allow_none=True)
+    filters = fields.List(fields.Nested(ChartDataFilterSchema), allow_none=True)
     granularity = fields.String(
         description="Name of temporal column used for time filtering. For legacy Druid "
         "datasources this defines the time grain.",
@@ -1097,8 +1084,7 @@ class Meta:  # pylint: disable=too-few-public-methods
             (
                 fields.Raw(
                     validate=[
-                        Length(min=1, error=_(
-                            "orderby column must be populated"))
+                        Length(min=1, error=_("orderby column must be populated"))
                     ],
                     allow_none=False,
                 ),
@@ -1253,11 +1239,9 @@ class ChartDataAsyncResponseSchema(Schema):
     channel_id = fields.String(
         description="Unique session async channel ID", allow_none=False,
     )
-    job_id = fields.String(
-        description="Unique async job ID", allow_none=False,)
+    job_id = fields.String(description="Unique async job ID", allow_none=False,)
     user_id = fields.String(description="Requesting user ID", allow_none=True,)
-    status = fields.String(
-        description="Status value for async job", allow_none=False,)
+    status = fields.String(description="Status value for async job", allow_none=False,)
     result_url = fields.String(
         description="Unique result URL for fetching async query data", allow_none=False,
     )
@@ -1279,8 +1263,7 @@ class ImportV1ChartSchema(Schema):
     slice_name = fields.String(required=True)
     viz_type = fields.String(required=True)
     params = fields.Dict()
-    query_context = fields.String(
-        allow_none=True, validate=utils.validate_json)
+    query_context = fields.String(allow_none=True, validate=utils.validate_json)
     cache_timeout = fields.Integer(allow_none=True)
     uuid = fields.UUID(required=True)
     version = fields.String(required=True)
diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index e924da3d959da..c300c5a4a93f6 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -25,12 +25,13 @@
 # revision identifiers, used by Alembic.
 import sqlalchemy as sa
 from alembic import op
-revision = 'f9847149153d'
-down_revision = 'b92d69a6643c'
+
+revision = "f9847149153d"
+down_revision = "b92d69a6643c"
 
 
 def upgrade():
-    op.add_column('slices', sa.Column(
-        'certified_by', sa.Text(), nullable=True))
-    op.add_column('slices', sa.Column(
-        'certification_details', sa.Text(), nullable=True))
+    op.add_column("slices", sa.Column("certified_by", sa.Text(), nullable=True))
+    op.add_column(
+        "slices", sa.Column("certification_details", sa.Text(), nullable=True)
+    )
diff --git a/superset/views/base_api.py b/superset/views/base_api.py
index 6c9a38a530c9f..e80134605f54b 100644
--- a/superset/views/base_api.py
+++ b/superset/views/base_api.py
@@ -268,8 +268,7 @@ def _get_related_filter(
     ) -> Filters:
         filter_field = self.related_field_filters.get(column_name)
         if isinstance(filter_field, str):
-            filter_field = RelatedFieldFilter(
-                cast(str, filter_field), FilterStartsWith)
+            filter_field = RelatedFieldFilter(cast(str, filter_field), FilterStartsWith)
         filter_field = cast(RelatedFieldFilter, filter_field)
         search_columns = [filter_field.field_name] if filter_field else None
         filters = datamodel.get_filters(search_columns)
@@ -325,10 +324,8 @@ def _add_extra_ids_to_result(
             ids = [id_ for id_ in ids if id_ not in values]
             pk_col = datamodel.get_pk()
             # Fetch requested values from ids
-            extra_rows = db.session.query(
-                datamodel.obj).filter(pk_col.in_(ids)).all()
-            result += self._get_result_from_rows(
-                datamodel, extra_rows, column_name)
+            extra_rows = db.session.query(datamodel.obj).filter(pk_col.in_(ids)).all()
+            result += self._get_result_from_rows(datamodel, extra_rows, column_name)
 
     def incr_stats(self, action: str, func_name: str) -> None:
         """
@@ -337,8 +334,7 @@ def incr_stats(self, action: str, func_name: str) -> None:
         :param action: String with an action name eg: error, success
         :param func_name: The function name
         """
-        self.stats_logger.incr(
-            f"{self.__class__.__name__}.{func_name}.{action}")
+        self.stats_logger.incr(f"{self.__class__.__name__}.{func_name}.{action}")
 
     def timing_stats(self, action: str, func_name: str, value: float) -> None:
         """
@@ -396,8 +392,7 @@ def get_headless(self, pk: int, **kwargs: Any) -> Response:
         return response
 
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.get_list",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_list",
         object_ref=False,
         log_to_statsd=False,
     )
@@ -436,8 +431,7 @@ def put_headless(self, pk: int) -> Response:
         return response
 
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
         object_ref=False,
         log_to_statsd=False,
     )
@@ -511,8 +505,7 @@ def related(self, column_name: str, **kwargs: Any) -> FlaskResponse:
         else:
             order_column, order_direction = "", ""
         # handle filters
-        filters = self._get_related_filter(
-            datamodel, column_name, args.get("filter"))
+        filters = self._get_related_filter(datamodel, column_name, args.get("filter"))
         # Make the query
         total_rows, rows = datamodel.query(
             filters, order_column, order_direction, page=page, page_size=page_size
@@ -570,8 +563,7 @@ def distinct(self, column_name: str, **kwargs: Any) -> FlaskResponse:
             return self.response_404()
         args = kwargs.get("rison", {})
         # handle pagination
-        page, page_size = self._sanitize_page_args(
-            *self._handle_page_args(args))
+        page, page_size = self._sanitize_page_args(*self._handle_page_args(args))
         # Create generic base filters with added request filter
         filters = self._get_distinct_filter(column_name, args.get("filter"))
         # Make the query

From 4e5ff07bb506b3ac1dbb096dc4007be31e533833 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 13:04:52 +0000
Subject: [PATCH 03/20] Certify dashboards

---
 .../src/components/ListView/types.ts          |  1 +
 .../src/dashboard/components/Header/index.jsx |  2 +
 .../components/PropertiesModal/index.jsx      | 49 +++++++++++++++++++
 .../components/PropertiesModal/index.tsx      |  2 +-
 .../views/CRUD/dashboard/DashboardCard.tsx    | 15 +++++-
 .../views/CRUD/dashboard/DashboardList.tsx    | 38 +++++++++++++-
 superset-frontend/src/views/CRUD/types.ts     |  2 +
 superset/dashboards/api.py                    | 46 +++++++++++------
 superset/dashboards/filters.py                | 22 ++++++++-
 superset/dashboards/schemas.py                | 17 ++++++-
 ...add_certifications_columns_to_dashboard.py | 37 ++++++++++++++
 superset/models/dashboard.py                  | 31 ++++++++----
 12 files changed, 231 insertions(+), 31 deletions(-)
 create mode 100644 superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py

diff --git a/superset-frontend/src/components/ListView/types.ts b/superset-frontend/src/components/ListView/types.ts
index 89824885480f9..53710b84d271d 100644
--- a/superset-frontend/src/components/ListView/types.ts
+++ b/superset-frontend/src/components/ListView/types.ts
@@ -112,4 +112,5 @@ export enum FilterOperator {
   dashboardIsFav = 'dashboard_is_favorite',
   chartIsFav = 'chart_is_favorite',
   chartIsCertified = 'chart_is_certified',
+  dashboardIsCertified = 'dashboard_is_certified',
 }
diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index d7930566793ee..e48aaa20de1dc 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -612,6 +612,8 @@ class Header extends React.PureComponent {
                 dashboardInfoChanged({
                   slug: updates.slug,
                   metadata: JSON.parse(updates.jsonMetadata),
+                  certifiedBy: updates.certifiedBy,
+                  certification_details: updates.certificationDetails,
                 });
                 setColorSchemeAndUnsavedChanges(updates.colorScheme);
                 dashboardTitleChanged(updates.title);
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index aa9bef7efd50b..c8355f8b48531 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -119,6 +119,8 @@ class PropertiesModal extends React.PureComponent {
         roles: [],
         json_metadata: '',
         colorScheme: props.colorScheme,
+        certified_by: '',
+        certification_details: '',
       },
       isDashboardLoaded: false,
       isAdvancedOpen: false,
@@ -208,6 +210,8 @@ class PropertiesModal extends React.PureComponent {
             ? jsonStringify(jsonMetadataObj)
             : '',
           colorScheme: jsonMetadataObj.color_scheme,
+          certified_by: dashboard.certified_by || '',
+          certification_details: dashboard.certification_details || '',
         },
       }));
       const initialSelectedOwners = dashboard.owners.map(owner => ({
@@ -247,6 +251,8 @@ class PropertiesModal extends React.PureComponent {
         slug,
         dashboard_title: dashboardTitle,
         colorScheme,
+        certified_by: certifiedBy,
+        certification_details: certificationDetails,
         owners: ownersValue,
         roles: rolesValue,
       },
@@ -281,6 +287,8 @@ class PropertiesModal extends React.PureComponent {
         jsonMetadata,
         ownerIds: owners,
         colorScheme: currentColorScheme,
+        certifiedBy,
+        certificationDetails,
         ...moreProps,
       });
       this.props.onHide();
@@ -293,6 +301,8 @@ class PropertiesModal extends React.PureComponent {
           slug: slug || null,
           json_metadata: jsonMetadata || null,
           owners,
+          certified_by: certifiedBy,
+          certification_details: certificationDetails,
           ...morePutProps,
         }),
       }).then(({ json: { result } }) => {
@@ -308,6 +318,8 @@ class PropertiesModal extends React.PureComponent {
           jsonMetadata: result.json_metadata,
           ownerIds: result.owners,
           colorScheme: currentColorScheme,
+          certifiedBy: result.certified_by,
+          certificationDetails: result.certification_details,
           ...moreResultProps,
         });
         this.props.onHide();
@@ -490,6 +502,43 @@ class PropertiesModal extends React.PureComponent {
           {isFeatureEnabled(FeatureFlag.DASHBOARD_RBAC)
             ? this.getRowsWithRoles()
             : this.getRowsWithoutRoles()}
+          <Row>
+            <Col xs={24} md={24}>
+              <h3>{t('Certification')}</h3>
+            </Col>
+          </Row>
+          <Row gutter={16}>
+            <Col xs={24} md={12}>
+              <FormItem label={t('Certified by')}>
+                <Input
+                  name="certified_by"
+                  type="text"
+                  value={values.certified_by}
+                  onChange={this.onChange}
+                  disabled={!isDashboardLoaded}
+                />
+                <p className="help-block">
+                  {t('Person or group that has certified this chart.')}
+                </p>
+              </FormItem>
+            </Col>
+            <Col xs={24} md={12}>
+              <FormItem label={t('Certification details')}>
+                <Input
+                  name="certification_details"
+                  type="text"
+                  value={values.certification_details || ''}
+                  onChange={this.onChange}
+                  disabled={!isDashboardLoaded}
+                />
+                <p className="help-block">
+                  {t(
+                    'Any additional detail to show in the certification tooltip.',
+                  )}
+                </p>
+              </FormItem>
+            </Col>
+          </Row>
           <Row>
             <Col xs={24} md={24}>
               <h3 style={{ marginTop: '1em' }}>
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 4deb6938fb8bf..67fadede05794 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -190,7 +190,7 @@ export default function PropertiesModal({
             htmlType="submit"
             buttonSize="small"
             buttonStyle="primary"
-            onClick={() => form.submit()}
+            onClick={form.submit}
             disabled={submitting || !name}
             cta
           >
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
index 5f84e41a41d2f..85fa0249b918a 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
@@ -29,6 +29,7 @@ import Label from 'src/components/Label';
 import FacePile from 'src/components/FacePile';
 import FaveStar from 'src/components/FaveStar';
 import { Dashboard } from 'src/views/CRUD/types';
+import CertifiedIcon from 'src/components/CertifiedIcon';
 
 interface DashboardCardProps {
   isChart?: boolean;
@@ -146,7 +147,19 @@ function DashboardCard({
     >
       <ListViewCard
         loading={dashboard.loading || false}
-        title={dashboard.dashboard_title}
+        title={
+          dashboard.certified_by ? (
+            <>
+              <CertifiedIcon
+                certifiedBy={dashboard.certified_by}
+                details={dashboard.certification_details}
+              />{' '}
+              {dashboard.dashboard_title}
+            </>
+          ) : (
+            dashboard.dashboard_title
+          )
+        }
         titleRight={
           <Label>{dashboard.published ? t('published') : t('draft')}</Label>
         }
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
index 9ae2e4aa254fd..59a14b754bf3a 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardList.tsx
@@ -49,6 +49,7 @@ import ImportModelsModal from 'src/components/ImportModal/index';
 import OmniContainer from 'src/components/OmniContainer';
 
 import Dashboard from 'src/dashboard/containers/Dashboard';
+import CertifiedIcon from 'src/components/CertifiedIcon';
 import DashboardCard from './DashboardCard';
 import { DashboardStatus } from './types';
 
@@ -173,6 +174,8 @@ function DashboardList(props: DashboardListProps) {
                 json_metadata = '',
                 changed_on_delta_humanized,
                 url = '',
+                certified_by = '',
+                certification_details = '',
               } = json.result;
               return {
                 ...dashboard,
@@ -184,6 +187,8 @@ function DashboardList(props: DashboardListProps) {
                 json_metadata,
                 changed_on_delta_humanized,
                 url,
+                certified_by,
+                certification_details,
               };
             }
             return dashboard;
@@ -250,9 +255,26 @@ function DashboardList(props: DashboardListProps) {
       {
         Cell: ({
           row: {
-            original: { url, dashboard_title: dashboardTitle },
+            original: {
+              url,
+              dashboard_title: dashboardTitle,
+              certified_by: certifiedBy,
+              certification_details: certificationDetails,
+            },
           },
-        }: any) => <Link to={url}>{dashboardTitle}</Link>,
+        }: any) => (
+          <Link to={url}>
+            {certifiedBy && (
+              <>
+                <CertifiedIcon
+                  certifiedBy={certifiedBy}
+                  details={certificationDetails}
+                />{' '}
+              </>
+            )}
+            {dashboardTitle}
+          </Link>
+        ),
         Header: t('Title'),
         accessor: 'dashboard_title',
       },
@@ -478,6 +500,18 @@ function DashboardList(props: DashboardListProps) {
         ],
       },
       ...(props.user.userId ? [favoritesFilter] : []),
+      {
+        Header: t('Certified'),
+        id: 'id',
+        urlDisplay: 'certified',
+        input: 'select',
+        operator: FilterOperator.dashboardIsCertified,
+        unfilteredLabel: t('Any'),
+        selects: [
+          { label: t('Yes'), value: true },
+          { label: t('No'), value: false },
+        ],
+      },
       {
         Header: t('Search'),
         id: 'dashboard_title',
diff --git a/superset-frontend/src/views/CRUD/types.ts b/superset-frontend/src/views/CRUD/types.ts
index 35cfc55161a60..0090697747ac5 100644
--- a/superset-frontend/src/views/CRUD/types.ts
+++ b/superset-frontend/src/views/CRUD/types.ts
@@ -48,6 +48,8 @@ export interface DashboardTableProps {
 }
 
 export interface Dashboard {
+  certified_by?: string;
+  certification_details?: string;
   changed_by_name: string;
   changed_by_url: string;
   changed_on_delta_humanized?: string;
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index d248afd514f80..dd1fb5f58f581 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -53,6 +53,7 @@
 from superset.dashboards.dao import DashboardDAO
 from superset.dashboards.filters import (
     DashboardAccessFilter,
+    DashboardCertifiedFilter,
     DashboardFavoriteFilter,
     DashboardTitleOrSlugFilter,
     FilterRelatedRoles,
@@ -121,6 +122,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
         "position_json",
         "json_metadata",
         "thumbnail_url",
+        "certified_by",
+        "certification_details",
         "changed_by.first_name",
         "changed_by.last_name",
         "changed_by.username",
@@ -150,6 +153,8 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     ]
 
     add_columns = [
+        "certified_by",
+        "certification_details",
         "dashboard_title",
         "slug",
         "owners",
@@ -173,7 +178,7 @@ def ensure_thumbnails_enabled(self) -> Optional[Response]:
     )
     search_filters = {
         "dashboard_title": [DashboardTitleOrSlugFilter],
-        "id": [DashboardFavoriteFilter],
+        "id": [DashboardFavoriteFilter, DashboardCertifiedFilter],
     }
     base_order = ("changed_on", "desc")
 
@@ -229,7 +234,8 @@ def __repr__(self) -> str:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled(
+            "DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>", methods=["GET"])
     @protect()
@@ -286,14 +292,16 @@ def get(self, id_or_slug: str) -> Response:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled(
+            "DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>/datasets", methods=["GET"])
     @protect()
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_datasets",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.get_datasets",
         log_to_statsd=False,
     )
     def get_datasets(self, id_or_slug: str) -> Response:
@@ -347,14 +355,16 @@ def get_datasets(self, id_or_slug: str) -> Response:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled(
+            "DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>/charts", methods=["GET"])
     @protect()
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_charts",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.get_charts",
         log_to_statsd=False,
     )
     def get_charts(self, id_or_slug: str) -> Response:
@@ -391,7 +401,8 @@ def get_charts(self, id_or_slug: str) -> Response:
         """
         try:
             charts = DashboardDAO.get_charts_for_dashboard(id_or_slug)
-            result = [self.chart_entity_response_schema.dump(chart) for chart in charts]
+            result = [self.chart_entity_response_schema.dump(
+                chart) for chart in charts]
 
             if is_feature_enabled("REMOVE_SLICE_LEVEL_LABEL_COLORS"):
                 # dashboard metadata has dashboard-level label_colors,
@@ -551,7 +562,8 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,
     )
     def delete(self, pk: int) -> Response:
@@ -608,7 +620,8 @@ def delete(self, pk: int) -> Response:
     @statsd_metrics
     @rison(get_delete_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
         log_to_statsd=False,
     )
     def bulk_delete(self, **kwargs: Any) -> Response:
@@ -669,7 +682,8 @@ def bulk_delete(self, **kwargs: Any) -> Response:
     @statsd_metrics
     @rison(get_export_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
     )  # pylint: disable=too-many-locals
     def export(self, **kwargs: Any) -> Response:
@@ -752,7 +766,8 @@ def export(self, **kwargs: Any) -> Response:
     @safe
     @rison(thumbnail_query_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
     def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
@@ -812,7 +827,8 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         )
         # If force, request a screenshot from the workers
         if kwargs["rison"].get("force", False):
-            cache_dashboard_thumbnail.delay(dashboard_url, dashboard.digest, force=True)
+            cache_dashboard_thumbnail.delay(
+                dashboard_url, dashboard.digest, force=True)
             return self.response(202, message="OK Async")
         # fetch the dashboard screenshot using the current user and cache if set
         screenshot = DashboardScreenshot(
@@ -821,7 +837,8 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         # If the screenshot does not exist, request one from the workers
         if not screenshot:
             self.incr_stats("async", self.thumbnail.__name__)
-            cache_dashboard_thumbnail.delay(dashboard_url, dashboard.digest, force=True)
+            cache_dashboard_thumbnail.delay(
+                dashboard_url, dashboard.digest, force=True)
             return self.response(202, message="OK Async")
         # If digests
         if dashboard.digest != digest:
@@ -894,7 +911,8 @@ def favorite_status(self, **kwargs: Any) -> Response:
     @protect()
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.import_",
+        action=lambda self, *
+        args, **kwargs: f"{self.__class__.__name__}.import_",
         log_to_statsd=False,
     )
     def import_(self) -> Response:
diff --git a/superset/dashboards/filters.py b/superset/dashboards/filters.py
index db20ec7004ee8..d8df5f759bd97 100644
--- a/superset/dashboards/filters.py
+++ b/superset/dashboards/filters.py
@@ -73,7 +73,8 @@ def apply(self, query: Query, value: Any) -> Query:
         if is_user_admin():
             return query
 
-        datasource_perms = security_manager.user_view_menu_names("datasource_access")
+        datasource_perms = security_manager.user_view_menu_names(
+            "datasource_access")
         schema_perms = security_manager.user_view_menu_names("schema_access")
 
         is_rbac_disabled_filter = []
@@ -126,7 +127,8 @@ def apply(self, query: Query, value: Any) -> Query:
                 )
             )
 
-            dashboard_rbac_or_filters.append(Dashboard.id.in_(roles_based_query))
+            dashboard_rbac_or_filters.append(
+                Dashboard.id.in_(roles_based_query))
 
         query = query.filter(
             or_(
@@ -158,3 +160,19 @@ def apply(self, query: Query, value: Optional[Any]) -> Query:
         if value:
             return query.filter(role_model.name.ilike(f"%{value}%"),)
         return query
+
+
+class DashboardCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-methods
+    """
+    Custom filter for the GET list that filters all certified dashboards
+    """
+
+    name = _("Is certified")
+    arg_name = "dashboard_is_certified"
+
+    def apply(self, query: Query, value: Any) -> Query:
+        if value == True:
+            return query.filter(and_(Dashboard.certified_by.isnot(None)))
+        if value == False:
+            return query.filter(and_(Dashboard.certified_by.is_(None)))
+        return query
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 9c48d472557e6..f39abc1d0f99e 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -64,6 +64,8 @@
 charts_description = (
     "The names of the dashboard's charts. Names are used for legacy reasons."
 )
+certified_by_description = "Person or group that has certified this dashboard"
+certification_details_description = "Details of the certification"
 
 openapi_spec_methods_override = {
     "get": {"get": {"description": "Get a dashboard detail information."}},
@@ -151,6 +153,9 @@ class DashboardGetResponseSchema(Schema):
     css = fields.String(description=css_description)
     json_metadata = fields.String(description=json_metadata_description)
     position_json = fields.String(description=position_json_description)
+    certified_by = fields.String(description=certified_by_description)
+    certification_details = fields.String(
+        description=certification_details_description)
     changed_by_name = fields.String()
     changed_by_url = fields.String()
     changed_by = fields.Nested(UserSchema)
@@ -237,6 +242,9 @@ class DashboardPostSchema(BaseDashboardSchema):
         description=json_metadata_description, validate=validate_json_metadata,
     )
     published = fields.Boolean(description=published_description)
+    certified_by = fields.String(description=certified_by_description)
+    certification_details = fields.String(
+        description=certification_details_description)
 
 
 class DashboardPutSchema(BaseDashboardSchema):
@@ -251,7 +259,8 @@ class DashboardPutSchema(BaseDashboardSchema):
     owners = fields.List(
         fields.Integer(description=owners_description, allow_none=True)
     )
-    roles = fields.List(fields.Integer(description=roles_description, allow_none=True))
+    roles = fields.List(fields.Integer(
+        description=roles_description, allow_none=True))
     position_json = fields.String(
         description=position_json_description, allow_none=True, validate=validate_json
     )
@@ -261,7 +270,11 @@ class DashboardPutSchema(BaseDashboardSchema):
         allow_none=True,
         validate=validate_json_metadata,
     )
-    published = fields.Boolean(description=published_description, allow_none=True)
+    published = fields.Boolean(
+        description=published_description, allow_none=True)
+    certified_by = fields.String(description=certified_by_description)
+    certification_details = fields.String(
+        description=certification_details_description)
 
 
 class ChartFavStarResponseResult(Schema):
diff --git a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
new file mode 100644
index 0000000000000..f480a3ee5808f
--- /dev/null
+++ b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
@@ -0,0 +1,37 @@
+# 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.
+"""add_certifications_columns_to_dashboard
+
+Revision ID: aea15018d53b
+Revises: f9847149153d
+Create Date: 2021-11-05 11:11:55.496618
+
+"""
+
+# revision identifiers, used by Alembic.
+import sqlalchemy as sa
+from alembic import op
+revision = 'aea15018d53b'
+down_revision = 'f9847149153d'
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('dashboards', sa.Column(
+        'certified_by', sa.Text(), nullable=True))
+    op.add_column('dashboards', sa.Column(
+        'certification_details', sa.Text(), nullable=True))
diff --git a/superset/models/dashboard.py b/superset/models/dashboard.py
index 0db1ddf15048d..e634c8febb5f6 100644
--- a/superset/models/dashboard.py
+++ b/superset/models/dashboard.py
@@ -127,7 +127,8 @@ def copy_dashboard(
     "dashboard_roles",
     metadata,
     Column("id", Integer, primary_key=True),
-    Column("dashboard_id", Integer, ForeignKey("dashboards.id"), nullable=False),
+    Column("dashboard_id", Integer, ForeignKey(
+        "dashboards.id"), nullable=False),
     Column("role_id", Integer, ForeignKey("ab_role.id"), nullable=False),
 )
 
@@ -142,10 +143,14 @@ class Dashboard(Model, AuditMixinNullable, ImportExportMixin):
     position_json = Column(utils.MediumText())
     description = Column(Text)
     css = Column(Text)
+    certified_by = Column(Text)
+    certification_details = Column(Text)
     json_metadata = Column(Text)
     slug = Column(String(255), unique=True)
-    slices = relationship(Slice, secondary=dashboard_slices, backref="dashboards")
-    owners = relationship(security_manager.user_model, secondary=dashboard_user)
+    slices = relationship(
+        Slice, secondary=dashboard_slices, backref="dashboards")
+    owners = relationship(security_manager.user_model,
+                          secondary=dashboard_user)
     published = Column(Boolean, default=False)
     roles = relationship(security_manager.role_model, secondary=DashboardRoles)
     _filter_sets = relationship(
@@ -194,7 +199,8 @@ def filter_sets_lst(self) -> Dict[int, FilterSet]:
         if is_user_admin():
             return self._filter_sets
         current_user = g.user.id
-        filter_sets_by_owner_type: Dict[str, List[Any]] = {"Dashboard": [], "User": []}
+        filter_sets_by_owner_type: Dict[str, List[Any]] = {
+            "Dashboard": [], "User": []}
         for fs in self._filter_sets:
             filter_sets_by_owner_type[fs.owner_type].append(fs)
         user_filter_sets = list(
@@ -265,6 +271,8 @@ def data(self) -> Dict[str, Any]:
         return {
             "id": self.id,
             "metadata": self.params_dict,
+            "certified_by": self.certified_by,
+            "certification_details": self.certification_details,
             "css": self.css,
             "dashboard_title": self.dashboard_title,
             "published": self.published,
@@ -292,7 +300,8 @@ def datasets_trimmed_for_slices(self) -> List[Dict[str, Any]]:
 
         for (cls_model, datasource_id), slices in slices_by_datasource.items():
             datasource = (
-                db.session.query(cls_model).filter_by(id=datasource_id).one_or_none()
+                db.session.query(cls_model).filter_by(
+                    id=datasource_id).one_or_none()
             )
 
             if datasource:
@@ -321,7 +330,8 @@ def update_thumbnail(self) -> None:
 
     @debounce(0.1)
     def clear_cache(self) -> None:
-        cache_manager.cache.delete_memoized(Dashboard.datasets_trimmed_for_slices, self)
+        cache_manager.cache.delete_memoized(
+            Dashboard.datasets_trimmed_for_slices, self)
 
     @classmethod
     @debounce(0.1)
@@ -392,7 +402,8 @@ def export_dashboards(  # pylint: disable=too-many-locals
                     id_ = target.get("datasetId")
                     if id_ is None:
                         continue
-                    datasource = ConnectorRegistry.get_datasource_by_id(session, id_)
+                    datasource = ConnectorRegistry.get_datasource_by_id(
+                        session, id_)
                     datasource_ids.add((datasource.id, datasource.type))
 
             copied_dashboard.alter_params(remote_id=dashboard_id)
@@ -472,11 +483,13 @@ def clear_dashboard_cache(
         elif isinstance(obj, (SqlMetric, TableColumn)):
             Dashboard.clear_cache_for_datasource(datasource_id=obj.table_id)
         elif isinstance(obj, (DruidMetric, DruidColumn)):
-            Dashboard.clear_cache_for_datasource(datasource_id=obj.datasource_id)
+            Dashboard.clear_cache_for_datasource(
+                datasource_id=obj.datasource_id)
 
     sqla.event.listen(Dashboard, "after_update", clear_dashboard_cache)
     sqla.event.listen(
-        Dashboard, "after_delete", partial(clear_dashboard_cache, check_modified=False)
+        Dashboard, "after_delete", partial(
+            clear_dashboard_cache, check_modified=False)
     )
     sqla.event.listen(Slice, "after_update", clear_dashboard_cache)
     sqla.event.listen(Slice, "after_delete", clear_dashboard_cache)

From 07b96ca88dc657b0dfb2eb4dee140e3901e96b5c Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 13:11:35 +0000
Subject: [PATCH 04/20] Format

---
 superset/charts/filters.py                    |  3 +-
 superset/dashboards/api.py                    | 39 +++++++------------
 superset/dashboards/filters.py                |  6 +--
 superset/dashboards/schemas.py                | 15 +++----
 ...add_certifications_columns_to_dashboard.py | 13 ++++---
 superset/models/dashboard.py                  | 27 +++++--------
 6 files changed, 37 insertions(+), 66 deletions(-)

diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index f8833b4e0ac9c..76c521d27b20a 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -78,6 +78,5 @@ def apply(self, query: Query, value: Any) -> Query:
         perms = security_manager.user_view_menu_names("datasource_access")
         schema_perms = security_manager.user_view_menu_names("schema_access")
         return query.filter(
-            or_(self.model.perm.in_(perms),
-                self.model.schema_perm.in_(schema_perms))
+            or_(self.model.perm.in_(perms), self.model.schema_perm.in_(schema_perms))
         )
diff --git a/superset/dashboards/api.py b/superset/dashboards/api.py
index dd1fb5f58f581..c4fff75e30c25 100644
--- a/superset/dashboards/api.py
+++ b/superset/dashboards/api.py
@@ -234,8 +234,7 @@ def __repr__(self) -> str:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled(
-            "DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>", methods=["GET"])
     @protect()
@@ -292,16 +291,14 @@ def get(self, id_or_slug: str) -> Response:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled(
-            "DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>/datasets", methods=["GET"])
     @protect()
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.get_datasets",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_datasets",
         log_to_statsd=False,
     )
     def get_datasets(self, id_or_slug: str) -> Response:
@@ -355,16 +352,14 @@ def get_datasets(self, id_or_slug: str) -> Response:
         raise_for_access=lambda _self, id_or_slug: DashboardDAO.get_by_id_or_slug(
             id_or_slug
         ),
-        skip=lambda _self, id_or_slug: not is_feature_enabled(
-            "DASHBOARD_CACHE"),
+        skip=lambda _self, id_or_slug: not is_feature_enabled("DASHBOARD_CACHE"),
     )
     @expose("/<id_or_slug>/charts", methods=["GET"])
     @protect()
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.get_charts",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.get_charts",
         log_to_statsd=False,
     )
     def get_charts(self, id_or_slug: str) -> Response:
@@ -401,8 +396,7 @@ def get_charts(self, id_or_slug: str) -> Response:
         """
         try:
             charts = DashboardDAO.get_charts_for_dashboard(id_or_slug)
-            result = [self.chart_entity_response_schema.dump(
-                chart) for chart in charts]
+            result = [self.chart_entity_response_schema.dump(chart) for chart in charts]
 
             if is_feature_enabled("REMOVE_SLICE_LEVEL_LABEL_COLORS"):
                 # dashboard metadata has dashboard-level label_colors,
@@ -562,8 +556,7 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,
     )
     def delete(self, pk: int) -> Response:
@@ -620,8 +613,7 @@ def delete(self, pk: int) -> Response:
     @statsd_metrics
     @rison(get_delete_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
         log_to_statsd=False,
     )
     def bulk_delete(self, **kwargs: Any) -> Response:
@@ -682,8 +674,7 @@ def bulk_delete(self, **kwargs: Any) -> Response:
     @statsd_metrics
     @rison(get_export_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.export",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
     )  # pylint: disable=too-many-locals
     def export(self, **kwargs: Any) -> Response:
@@ -766,8 +757,7 @@ def export(self, **kwargs: Any) -> Response:
     @safe
     @rison(thumbnail_query_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.thumbnail",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
     def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
@@ -827,8 +817,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         )
         # If force, request a screenshot from the workers
         if kwargs["rison"].get("force", False):
-            cache_dashboard_thumbnail.delay(
-                dashboard_url, dashboard.digest, force=True)
+            cache_dashboard_thumbnail.delay(dashboard_url, dashboard.digest, force=True)
             return self.response(202, message="OK Async")
         # fetch the dashboard screenshot using the current user and cache if set
         screenshot = DashboardScreenshot(
@@ -837,8 +826,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         # If the screenshot does not exist, request one from the workers
         if not screenshot:
             self.incr_stats("async", self.thumbnail.__name__)
-            cache_dashboard_thumbnail.delay(
-                dashboard_url, dashboard.digest, force=True)
+            cache_dashboard_thumbnail.delay(dashboard_url, dashboard.digest, force=True)
             return self.response(202, message="OK Async")
         # If digests
         if dashboard.digest != digest:
@@ -911,8 +899,7 @@ def favorite_status(self, **kwargs: Any) -> Response:
     @protect()
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.import_",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.import_",
         log_to_statsd=False,
     )
     def import_(self) -> Response:
diff --git a/superset/dashboards/filters.py b/superset/dashboards/filters.py
index d8df5f759bd97..b28ea1cf2da89 100644
--- a/superset/dashboards/filters.py
+++ b/superset/dashboards/filters.py
@@ -73,8 +73,7 @@ def apply(self, query: Query, value: Any) -> Query:
         if is_user_admin():
             return query
 
-        datasource_perms = security_manager.user_view_menu_names(
-            "datasource_access")
+        datasource_perms = security_manager.user_view_menu_names("datasource_access")
         schema_perms = security_manager.user_view_menu_names("schema_access")
 
         is_rbac_disabled_filter = []
@@ -127,8 +126,7 @@ def apply(self, query: Query, value: Any) -> Query:
                 )
             )
 
-            dashboard_rbac_or_filters.append(
-                Dashboard.id.in_(roles_based_query))
+            dashboard_rbac_or_filters.append(Dashboard.id.in_(roles_based_query))
 
         query = query.filter(
             or_(
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index f39abc1d0f99e..990434139b8cc 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -154,8 +154,7 @@ class DashboardGetResponseSchema(Schema):
     json_metadata = fields.String(description=json_metadata_description)
     position_json = fields.String(description=position_json_description)
     certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(
-        description=certification_details_description)
+    certification_details = fields.String(description=certification_details_description)
     changed_by_name = fields.String()
     changed_by_url = fields.String()
     changed_by = fields.Nested(UserSchema)
@@ -243,8 +242,7 @@ class DashboardPostSchema(BaseDashboardSchema):
     )
     published = fields.Boolean(description=published_description)
     certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(
-        description=certification_details_description)
+    certification_details = fields.String(description=certification_details_description)
 
 
 class DashboardPutSchema(BaseDashboardSchema):
@@ -259,8 +257,7 @@ class DashboardPutSchema(BaseDashboardSchema):
     owners = fields.List(
         fields.Integer(description=owners_description, allow_none=True)
     )
-    roles = fields.List(fields.Integer(
-        description=roles_description, allow_none=True))
+    roles = fields.List(fields.Integer(description=roles_description, allow_none=True))
     position_json = fields.String(
         description=position_json_description, allow_none=True, validate=validate_json
     )
@@ -270,11 +267,9 @@ class DashboardPutSchema(BaseDashboardSchema):
         allow_none=True,
         validate=validate_json_metadata,
     )
-    published = fields.Boolean(
-        description=published_description, allow_none=True)
+    published = fields.Boolean(description=published_description, allow_none=True)
     certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(
-        description=certification_details_description)
+    certification_details = fields.String(description=certification_details_description)
 
 
 class ChartFavStarResponseResult(Schema):
diff --git a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
index f480a3ee5808f..d4cc35726892e 100644
--- a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
+++ b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
@@ -25,13 +25,14 @@
 # revision identifiers, used by Alembic.
 import sqlalchemy as sa
 from alembic import op
-revision = 'aea15018d53b'
-down_revision = 'f9847149153d'
+
+revision = "aea15018d53b"
+down_revision = "f9847149153d"
 
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column('dashboards', sa.Column(
-        'certified_by', sa.Text(), nullable=True))
-    op.add_column('dashboards', sa.Column(
-        'certification_details', sa.Text(), nullable=True))
+    op.add_column("dashboards", sa.Column("certified_by", sa.Text(), nullable=True))
+    op.add_column(
+        "dashboards", sa.Column("certification_details", sa.Text(), nullable=True)
+    )
diff --git a/superset/models/dashboard.py b/superset/models/dashboard.py
index e634c8febb5f6..defe720012dac 100644
--- a/superset/models/dashboard.py
+++ b/superset/models/dashboard.py
@@ -127,8 +127,7 @@ def copy_dashboard(
     "dashboard_roles",
     metadata,
     Column("id", Integer, primary_key=True),
-    Column("dashboard_id", Integer, ForeignKey(
-        "dashboards.id"), nullable=False),
+    Column("dashboard_id", Integer, ForeignKey("dashboards.id"), nullable=False),
     Column("role_id", Integer, ForeignKey("ab_role.id"), nullable=False),
 )
 
@@ -147,10 +146,8 @@ class Dashboard(Model, AuditMixinNullable, ImportExportMixin):
     certification_details = Column(Text)
     json_metadata = Column(Text)
     slug = Column(String(255), unique=True)
-    slices = relationship(
-        Slice, secondary=dashboard_slices, backref="dashboards")
-    owners = relationship(security_manager.user_model,
-                          secondary=dashboard_user)
+    slices = relationship(Slice, secondary=dashboard_slices, backref="dashboards")
+    owners = relationship(security_manager.user_model, secondary=dashboard_user)
     published = Column(Boolean, default=False)
     roles = relationship(security_manager.role_model, secondary=DashboardRoles)
     _filter_sets = relationship(
@@ -199,8 +196,7 @@ def filter_sets_lst(self) -> Dict[int, FilterSet]:
         if is_user_admin():
             return self._filter_sets
         current_user = g.user.id
-        filter_sets_by_owner_type: Dict[str, List[Any]] = {
-            "Dashboard": [], "User": []}
+        filter_sets_by_owner_type: Dict[str, List[Any]] = {"Dashboard": [], "User": []}
         for fs in self._filter_sets:
             filter_sets_by_owner_type[fs.owner_type].append(fs)
         user_filter_sets = list(
@@ -300,8 +296,7 @@ def datasets_trimmed_for_slices(self) -> List[Dict[str, Any]]:
 
         for (cls_model, datasource_id), slices in slices_by_datasource.items():
             datasource = (
-                db.session.query(cls_model).filter_by(
-                    id=datasource_id).one_or_none()
+                db.session.query(cls_model).filter_by(id=datasource_id).one_or_none()
             )
 
             if datasource:
@@ -330,8 +325,7 @@ def update_thumbnail(self) -> None:
 
     @debounce(0.1)
     def clear_cache(self) -> None:
-        cache_manager.cache.delete_memoized(
-            Dashboard.datasets_trimmed_for_slices, self)
+        cache_manager.cache.delete_memoized(Dashboard.datasets_trimmed_for_slices, self)
 
     @classmethod
     @debounce(0.1)
@@ -402,8 +396,7 @@ def export_dashboards(  # pylint: disable=too-many-locals
                     id_ = target.get("datasetId")
                     if id_ is None:
                         continue
-                    datasource = ConnectorRegistry.get_datasource_by_id(
-                        session, id_)
+                    datasource = ConnectorRegistry.get_datasource_by_id(session, id_)
                     datasource_ids.add((datasource.id, datasource.type))
 
             copied_dashboard.alter_params(remote_id=dashboard_id)
@@ -483,13 +476,11 @@ def clear_dashboard_cache(
         elif isinstance(obj, (SqlMetric, TableColumn)):
             Dashboard.clear_cache_for_datasource(datasource_id=obj.table_id)
         elif isinstance(obj, (DruidMetric, DruidColumn)):
-            Dashboard.clear_cache_for_datasource(
-                datasource_id=obj.datasource_id)
+            Dashboard.clear_cache_for_datasource(datasource_id=obj.datasource_id)
 
     sqla.event.listen(Dashboard, "after_update", clear_dashboard_cache)
     sqla.event.listen(
-        Dashboard, "after_delete", partial(
-            clear_dashboard_cache, check_modified=False)
+        Dashboard, "after_delete", partial(clear_dashboard_cache, check_modified=False)
     )
     sqla.event.listen(Slice, "after_update", clear_dashboard_cache)
     sqla.event.listen(Slice, "after_delete", clear_dashboard_cache)

From bafd7f5bb186e7e57161c4cc6a11959188f096f9 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 13:23:54 +0000
Subject: [PATCH 05/20] Refactor card certification

---
 .../src/components/ListViewCard/index.tsx       | 17 ++++++++++++++++-
 superset-frontend/src/types/Chart.ts            |  8 ++++----
 .../src/views/CRUD/chart/ChartCard.tsx          |  2 ++
 .../src/views/CRUD/dashboard/DashboardCard.tsx  | 17 +++--------------
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/superset-frontend/src/components/ListViewCard/index.tsx b/superset-frontend/src/components/ListViewCard/index.tsx
index bfd6d6a82da31..f40cead9c81d2 100644
--- a/superset-frontend/src/components/ListViewCard/index.tsx
+++ b/superset-frontend/src/components/ListViewCard/index.tsx
@@ -21,6 +21,7 @@ import { styled, useTheme } from '@superset-ui/core';
 import { AntdCard, Skeleton, ThinSkeleton } from 'src/common/components';
 import { Tooltip } from 'src/components/Tooltip';
 import ImageLoader, { BackgroundPosition } from './ImageLoader';
+import CertifiedIcon from '../CertifiedIcon';
 
 const ActionsWrapper = styled.div`
   width: 64px;
@@ -161,6 +162,8 @@ interface CardProps {
   rows?: number | string;
   avatar?: React.ReactElement | null;
   cover?: React.ReactNode | null;
+  certifiedBy?: string;
+  certificationDetails?: string;
 }
 
 function ListViewCard({
@@ -178,6 +181,8 @@ function ListViewCard({
   loading,
   imgPosition = 'top',
   cover,
+  certifiedBy,
+  certificationDetails,
 }: CardProps) {
   const Link = url && linkComponent ? linkComponent : AnchorLink;
   const theme = useTheme();
@@ -249,7 +254,17 @@ function ListViewCard({
             <TitleContainer>
               <Tooltip title={title}>
                 <TitleLink>
-                  <Link to={url!}>{title}</Link>
+                  <Link to={url!}>
+                    {certifiedBy && (
+                      <>
+                        <CertifiedIcon
+                          certifiedBy={certifiedBy}
+                          details={certificationDetails}
+                        />{' '}
+                      </>
+                    )}
+                    {title}
+                  </Link>
                 </TitleLink>
               </Tooltip>
               {titleRight && <TitleRight>{titleRight}</TitleRight>}
diff --git a/superset-frontend/src/types/Chart.ts b/superset-frontend/src/types/Chart.ts
index 3fff96ad6d986..45a6b1cfc838b 100644
--- a/superset-frontend/src/types/Chart.ts
+++ b/superset-frontend/src/types/Chart.ts
@@ -33,8 +33,8 @@ export interface Chart {
   changed_on: string;
   changed_on_delta_humanized?: string;
   changed_on_utc?: string;
-  certified_by: string | null;
-  certification_details: string | null;
+  certified_by?: string;
+  certification_details?: string;
   description: string | null;
   cache_timeout: number | null;
   thumbnail_url?: string;
@@ -48,8 +48,8 @@ export type Slice = {
   slice_name: string;
   description: string | null;
   cache_timeout: number | null;
-  certified_by: string | null;
-  certification_details: string | null;
+  certified_by?: string;
+  certification_details?: string;
   form_data?: QueryFormData;
   query_context?: object;
 };
diff --git a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
index 96a384e5e7f77..c387ca7253085 100644
--- a/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
+++ b/superset-frontend/src/views/CRUD/chart/ChartCard.tsx
@@ -142,6 +142,8 @@ export default function ChartCard({
       <ListViewCard
         loading={loading}
         title={chart.slice_name}
+        certifiedBy={chart.certified_by}
+        certificationDetails={chart.certification_details}
         cover={
           !isFeatureEnabled(FeatureFlag.THUMBNAILS) || !showThumbnails ? (
             <></>
diff --git a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
index 85fa0249b918a..b51ec1d10b3ec 100644
--- a/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
+++ b/superset-frontend/src/views/CRUD/dashboard/DashboardCard.tsx
@@ -29,7 +29,6 @@ import Label from 'src/components/Label';
 import FacePile from 'src/components/FacePile';
 import FaveStar from 'src/components/FaveStar';
 import { Dashboard } from 'src/views/CRUD/types';
-import CertifiedIcon from 'src/components/CertifiedIcon';
 
 interface DashboardCardProps {
   isChart?: boolean;
@@ -147,19 +146,9 @@ function DashboardCard({
     >
       <ListViewCard
         loading={dashboard.loading || false}
-        title={
-          dashboard.certified_by ? (
-            <>
-              <CertifiedIcon
-                certifiedBy={dashboard.certified_by}
-                details={dashboard.certification_details}
-              />{' '}
-              {dashboard.dashboard_title}
-            </>
-          ) : (
-            dashboard.dashboard_title
-          )
-        }
+        title={dashboard.dashboard_title}
+        certifiedBy={dashboard.certified_by}
+        certificationDetails={dashboard.certification_details}
         titleRight={
           <Label>{dashboard.published ? t('published') : t('draft')}</Label>
         }

From 4c4e049e3998bb6f3f083c4d726695872e081416 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 13:31:26 +0000
Subject: [PATCH 06/20] Clear details when certified by empty

---
 .../dashboard/components/PropertiesModal/index.jsx  |  3 ++-
 .../explore/components/PropertiesModal/index.tsx    | 13 +++++++------
 superset/dashboards/schemas.py                      | 12 ++++++++----
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index c8355f8b48531..1cdd0388f4439 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -302,7 +302,8 @@ class PropertiesModal extends React.PureComponent {
           json_metadata: jsonMetadata || null,
           owners,
           certified_by: certifiedBy,
-          certification_details: certificationDetails,
+          certification_details:
+            certifiedBy && certificationDetails ? certificationDetails : null,
           ...morePutProps,
         }),
       }).then(({ json: { result } }) => {
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 67fadede05794..5938f86a250fd 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -119,17 +119,18 @@ export default function PropertiesModal({
   }) => {
     setSubmitting(true);
     const {
-      certified_by,
-      certification_details,
+      certified_by: certifiedBy,
+      certification_details: certificationDetails,
       description,
-      cache_timeout,
+      cache_timeout: cacheTimeout,
     } = values;
     const payload: { [key: string]: any } = {
       slice_name: name || null,
       description: description || null,
-      cache_timeout: cache_timeout || null,
-      certified_by: certified_by || null,
-      certification_details: certification_details || null,
+      cache_timeout: cacheTimeout || null,
+      certified_by: certifiedBy || null,
+      certification_details:
+        certifiedBy && certificationDetails ? certificationDetails : null,
     };
     if (selectedOwners) {
       payload.owners = (selectedOwners as {
diff --git a/superset/dashboards/schemas.py b/superset/dashboards/schemas.py
index 990434139b8cc..694abb231d1fe 100644
--- a/superset/dashboards/schemas.py
+++ b/superset/dashboards/schemas.py
@@ -241,8 +241,10 @@ class DashboardPostSchema(BaseDashboardSchema):
         description=json_metadata_description, validate=validate_json_metadata,
     )
     published = fields.Boolean(description=published_description)
-    certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(description=certification_details_description)
+    certified_by = fields.String(description=certified_by_description, allow_none=True)
+    certification_details = fields.String(
+        description=certification_details_description, allow_none=True
+    )
 
 
 class DashboardPutSchema(BaseDashboardSchema):
@@ -268,8 +270,10 @@ class DashboardPutSchema(BaseDashboardSchema):
         validate=validate_json_metadata,
     )
     published = fields.Boolean(description=published_description, allow_none=True)
-    certified_by = fields.String(description=certified_by_description)
-    certification_details = fields.String(description=certification_details_description)
+    certified_by = fields.String(description=certified_by_description, allow_none=True)
+    certification_details = fields.String(
+        description=certification_details_description, allow_none=True
+    )
 
 
 class ChartFavStarResponseResult(Schema):

From 0943197a36ddac4aff0d89895ecb94674796f421 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 14:28:40 +0000
Subject: [PATCH 07/20] Show certification in detail page

---
 .../src/dashboard/components/Header/index.jsx    | 11 ++++++++++-
 .../components/ExploreChartHeader/index.jsx      | 16 ++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/Header/index.jsx b/superset-frontend/src/dashboard/components/Header/index.jsx
index e48aaa20de1dc..6eb75c479cb41 100644
--- a/superset-frontend/src/dashboard/components/Header/index.jsx
+++ b/superset-frontend/src/dashboard/components/Header/index.jsx
@@ -22,6 +22,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { styled, t } from '@superset-ui/core';
 import ButtonGroup from 'src/components/ButtonGroup';
+import CertifiedIcon from 'src/components/CertifiedIcon';
 
 import {
   LOG_ACTIONS_PERIODIC_RENDER_DASHBOARD,
@@ -492,6 +493,14 @@ class Header extends React.PureComponent {
         data-test-id={`${dashboardInfo.id}`}
       >
         <div className="dashboard-component-header header-large">
+          {dashboardInfo.certified_by && (
+            <>
+              <CertifiedIcon
+                certifiedBy={dashboardInfo.certified_by}
+                details={dashboardInfo.certification_details}
+              />{' '}
+            </>
+          )}
           <EditableTitle
             title={dashboardTitle}
             canEdit={userCanEdit && editMode}
@@ -612,7 +621,7 @@ class Header extends React.PureComponent {
                 dashboardInfoChanged({
                   slug: updates.slug,
                   metadata: JSON.parse(updates.jsonMetadata),
-                  certifiedBy: updates.certifiedBy,
+                  certified_by: updates.certifiedBy,
                   certification_details: updates.certificationDetails,
                 });
                 setColorSchemeAndUnsavedChanges(updates.colorScheme);
diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
index 008ff0a5950cf..1f449e67aab51 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
@@ -44,6 +44,7 @@ import Timer from 'src/components/Timer';
 import CachedLabel from 'src/components/CachedLabel';
 import PropertiesModal from 'src/explore/components/PropertiesModal';
 import { sliceUpdated } from 'src/explore/actions/exploreActions';
+import CertifiedIcon from 'src/components/CertifiedIcon';
 import ExploreActionButtons from '../ExploreActionButtons';
 import RowCountLabel from '../RowCountLabel';
 
@@ -165,7 +166,10 @@ export class ExploreChartHeader extends React.PureComponent {
   }
 
   getSliceName() {
-    return this.props.sliceName || t('%s - untitled', this.props.table_name);
+    const { sliceName, table_name: tableName } = this.props;
+    const title = sliceName || t('%s - untitled', tableName);
+
+    return title;
   }
 
   postChartFormData() {
@@ -241,7 +245,7 @@ export class ExploreChartHeader extends React.PureComponent {
   }
 
   render() {
-    const { user, form_data: formData } = this.props;
+    const { user, form_data: formData, slice } = this.props;
     const {
       chartStatus,
       chartUpdateEndTime,
@@ -257,6 +261,14 @@ export class ExploreChartHeader extends React.PureComponent {
     return (
       <StyledHeader id="slice-header" className="panel-title-large">
         <div className="title-panel">
+          {slice.certified_by && (
+            <>
+              <CertifiedIcon
+                certifiedBy={slice.certified_by}
+                details={slice.certification_details}
+              />{' '}
+            </>
+          )}
           <EditableTitle
             title={this.getSliceName()}
             canEdit={

From b63067a0f0ba95b6fa658eb94a389be4980b5937 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 15:01:02 +0000
Subject: [PATCH 08/20] Add RTL tests

---
 .../PropertiesModal/PropertiesModal.test.tsx  | 37 ++++++++++++++++---
 .../components/PropertiesModal/index.jsx      |  2 +
 .../PropertiesModal/PropertiesModal.test.tsx  | 30 ++++++++++++++-
 .../components/PropertiesModal/index.tsx      |  5 ++-
 4 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
index 42b718edadd91..ddfe2f22cdf25 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/PropertiesModal.test.tsx
@@ -88,6 +88,8 @@ fetchMock.get(
 fetchMock.get('http://localhost/api/v1/dashboard/26', {
   body: {
     result: {
+      certified_by: 'John Doe',
+      certification_details: 'Sample certification',
       changed_by: null,
       changed_by_name: '',
       changed_by_url: '',
@@ -121,6 +123,8 @@ fetchMock.get('http://localhost/api/v1/dashboard/26', {
 });
 
 const createProps = () => ({
+  certified_by: 'John Doe',
+  certification_details: 'Sample certification',
   dashboardId: 26,
   show: true,
   colorScheme: 'supersetColors',
@@ -155,7 +159,10 @@ test('should render - FeatureFlag disabled', async () => {
   expect(screen.getByRole('heading', { name: 'Access' })).toBeInTheDocument();
   expect(screen.getByRole('heading', { name: 'Colors' })).toBeInTheDocument();
   expect(screen.getByRole('heading', { name: 'Advanced' })).toBeInTheDocument();
-  expect(screen.getAllByRole('heading')).toHaveLength(4);
+  expect(
+    screen.getByRole('heading', { name: 'Certification' }),
+  ).toBeInTheDocument();
+  expect(screen.getAllByRole('heading')).toHaveLength(5);
 
   expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
   expect(screen.getByRole('button', { name: 'Advanced' })).toBeInTheDocument();
@@ -163,7 +170,7 @@ test('should render - FeatureFlag disabled', async () => {
   expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
   expect(screen.getAllByRole('button')).toHaveLength(4);
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getAllByRole('textbox')).toHaveLength(4);
   expect(screen.getByRole('combobox')).toBeInTheDocument();
 
   expect(spyColorSchemeControlWrapper).toBeCalledTimes(4);
@@ -192,7 +199,10 @@ test('should render - FeatureFlag enabled', async () => {
   ).toBeInTheDocument();
   expect(screen.getByRole('heading', { name: 'Access' })).toBeInTheDocument();
   expect(screen.getByRole('heading', { name: 'Advanced' })).toBeInTheDocument();
-  expect(screen.getAllByRole('heading')).toHaveLength(3);
+  expect(
+    screen.getByRole('heading', { name: 'Certification' }),
+  ).toBeInTheDocument();
+  expect(screen.getAllByRole('heading')).toHaveLength(4);
 
   expect(screen.getByRole('button', { name: 'Close' })).toBeInTheDocument();
   expect(screen.getByRole('button', { name: 'Advanced' })).toBeInTheDocument();
@@ -200,7 +210,7 @@ test('should render - FeatureFlag enabled', async () => {
   expect(screen.getByRole('button', { name: 'Save' })).toBeInTheDocument();
   expect(screen.getAllByRole('button')).toHaveLength(4);
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getAllByRole('textbox')).toHaveLength(4);
   expect(screen.getAllByRole('combobox')).toHaveLength(2);
 
   expect(spyColorSchemeControlWrapper).toBeCalledTimes(4);
@@ -220,10 +230,10 @@ test('should open advance', async () => {
     await screen.findByTestId('dashboard-edit-properties-form'),
   ).toBeInTheDocument();
 
-  expect(screen.getAllByRole('textbox')).toHaveLength(2);
+  expect(screen.getAllByRole('textbox')).toHaveLength(4);
   expect(screen.getAllByRole('combobox')).toHaveLength(2);
   userEvent.click(screen.getByRole('button', { name: 'Advanced' }));
-  expect(screen.getAllByRole('textbox')).toHaveLength(3);
+  expect(screen.getAllByRole('textbox')).toHaveLength(5);
   expect(screen.getAllByRole('combobox')).toHaveLength(2);
 });
 
@@ -319,3 +329,18 @@ test('submitting with onlyApply:true', async () => {
     expect(props.onSubmit).toBeCalledTimes(1);
   });
 });
+
+test('Empty "Certified by" should clear "Certification details"', async () => {
+  const props = createProps();
+  const noCertifiedByProps = {
+    ...props,
+    certified_by: '',
+  };
+  render(<PropertiesModal {...noCertifiedByProps} />, {
+    useRedux: true,
+  });
+
+  expect(
+    screen.getByRole('textbox', { name: 'Certification details' }),
+  ).toHaveValue('');
+});
diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index 1cdd0388f4439..4c4cd29c40e25 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -512,6 +512,7 @@ class PropertiesModal extends React.PureComponent {
             <Col xs={24} md={12}>
               <FormItem label={t('Certified by')}>
                 <Input
+                  aria-label={t('Certified by')}
                   name="certified_by"
                   type="text"
                   value={values.certified_by}
@@ -526,6 +527,7 @@ class PropertiesModal extends React.PureComponent {
             <Col xs={24} md={12}>
               <FormItem label={t('Certification details')}>
                 <Input
+                  aria-label={t('Certification details')}
                   name="certification_details"
                   type="text"
                   value={values.certification_details || ''}
diff --git a/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx b/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx
index c1a3ab94b8f61..a35466196b30e 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/PropertiesModal.test.tsx
@@ -27,6 +27,8 @@ import PropertiesModal from '.';
 const createProps = () => ({
   slice: ({
     cache_timeout: null,
+    certified_by: 'John Doe',
+    certification_details: 'Sample certification',
     changed_on: '2021-03-19T16:30:56.750230',
     changed_on_humanized: '7 days ago',
     datasource: 'FCC 2018 Survey',
@@ -87,6 +89,8 @@ fetchMock.get('http://localhost/api/v1/chart/318', {
     },
     result: {
       cache_timeout: null,
+      certified_by: 'John Doe',
+      certification_details: 'Sample certification',
       dashboards: [
         {
           dashboard_title: 'FCC New Coder Survey 2018',
@@ -145,6 +149,8 @@ fetchMock.put('http://localhost/api/v1/chart/318', {
     id: 318,
     result: {
       cache_timeout: null,
+      certified_by: 'John Doe',
+      certification_details: 'Sample certification',
       description: null,
       owners: [],
       slice_name: 'Age distribution of respondents',
@@ -211,7 +217,7 @@ test('Should render all elements inside modal', async () => {
   const props = createProps();
   render(<PropertiesModal {...props} />);
   await waitFor(() => {
-    expect(screen.getAllByRole('textbox')).toHaveLength(3);
+    expect(screen.getAllByRole('textbox')).toHaveLength(5);
     expect(screen.getByRole('combobox')).toBeInTheDocument();
     expect(
       screen.getByRole('heading', { name: 'Basic information' }),
@@ -226,6 +232,12 @@ test('Should render all elements inside modal', async () => {
 
     expect(screen.getByRole('heading', { name: 'Access' })).toBeVisible();
     expect(screen.getByText('Owners')).toBeVisible();
+
+    expect(
+      screen.getByRole('heading', { name: 'Configuration' }),
+    ).toBeVisible();
+    expect(screen.getByText('Certified by')).toBeVisible();
+    expect(screen.getByText('Certification details')).toBeVisible();
   });
 });
 
@@ -275,3 +287,19 @@ test('"Save" button should call only "onSave"', async () => {
     expect(props.onHide).toBeCalledTimes(1);
   });
 });
+
+test('Empty "Certified by" should clear "Certification details"', async () => {
+  const props = createProps();
+  const noCertifiedByProps = {
+    ...props,
+    slice: {
+      ...props.slice,
+      certified_by: '',
+    },
+  };
+  render(<PropertiesModal {...noCertifiedByProps} />);
+
+  expect(
+    screen.getByRole('textbox', { name: 'Certification details' }),
+  ).toHaveValue('');
+});
diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
index 5938f86a250fd..dc0fd736aa66f 100644
--- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx
+++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -211,7 +211,10 @@ export default function PropertiesModal({
           description: slice.description || '',
           cache_timeout: slice.cache_timeout != null ? slice.cache_timeout : '',
           certified_by: slice.certified_by || '',
-          certification_details: slice.certification_details || '',
+          certification_details:
+            slice.certified_by && slice.certification_details
+              ? slice.certification_details
+              : '',
         }}
       >
         <Row gutter={16}>

From a72a3d7fee5e207d1358e0b229cd438809ebf2fa Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 16:05:48 +0000
Subject: [PATCH 09/20] Test charts api

---
 tests/integration_tests/charts/api_tests.py   | 152 +++++++++++++-----
 tests/integration_tests/insert_chart_mixin.py |   4 +
 2 files changed, 118 insertions(+), 38 deletions(-)

diff --git a/tests/integration_tests/charts/api_tests.py b/tests/integration_tests/charts/api_tests.py
index 4c2eb02d92594..4cf48cc307cdc 100644
--- a/tests/integration_tests/charts/api_tests.py
+++ b/tests/integration_tests/charts/api_tests.py
@@ -125,6 +125,21 @@ def create_charts(self):
                 db.session.delete(fav_chart)
             db.session.commit()
 
+    @pytest.fixture()
+    def create_certified_charts(self):
+        with self.create_app().app_context():
+            charts = []
+            admin = self.get_user("admin")
+            for cx in range(CHARTS_FIXTURE_COUNT - 1):
+                charts.append(self.insert_chart(f"name{cx}", [
+                              admin.id], 1, certified_by="John Doe", certification_details="Sample certification"))
+            yield charts
+
+            # rollback changes
+            for chart in charts:
+                db.session.delete(chart)
+            db.session.commit()
+
     @pytest.fixture()
     def create_chart_with_report(self):
         with self.create_app().app_context():
@@ -230,7 +245,8 @@ def test_delete_bulk_charts(self):
         chart_ids = list()
         for chart_name_index in range(chart_count):
             chart_ids.append(
-                self.insert_chart(f"title{chart_name_index}", [admin.id], 1, admin).id
+                self.insert_chart(f"title{chart_name_index}", [
+                                  admin.id], 1, admin).id
             )
         self.login(username="admin")
         argument = chart_ids
@@ -308,7 +324,8 @@ def test_bulk_delete_chart_with_report(self):
             .one_or_none()
         )
 
-        charts = db.session.query(Slice.id).filter(Slice.slice_name.like("name%")).all()
+        charts = db.session.query(Slice.id).filter(
+            Slice.slice_name.like("name%")).all()
         chart_ids = [chart.id for chart in charts]
         chart_ids.append(chart_with_report.id)
 
@@ -395,7 +412,8 @@ def test_delete_bulk_chart_not_owned(self):
         charts = list()
         for chart_name_index in range(chart_count):
             charts.append(
-                self.insert_chart(f"title{chart_name_index}", [user_alpha1.id], 1)
+                self.insert_chart(f"title{chart_name_index}", [
+                                  user_alpha1.id], 1)
             )
 
         owned_chart = self.insert_chart("title_owned", [user_alpha2.id], 1)
@@ -447,6 +465,8 @@ def test_create_chart(self):
             "datasource_id": 1,
             "datasource_type": "table",
             "dashboards": dashboards_ids,
+            "certified_by": "John Doe",
+            "certification_details": "Sample certification",
         }
         self.login(username="admin")
         uri = f"api/v1/chart/"
@@ -523,7 +543,8 @@ def test_create_chart_validate_datasource(self):
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
             response,
-            {"message": {"datasource_type": ["Must be one of: druid, table, view."]}},
+            {"message": {"datasource_type": [
+                "Must be one of: druid, table, view."]}},
         )
         chart_data = {
             "slice_name": "title1",
@@ -534,7 +555,8 @@ def test_create_chart_validate_datasource(self):
         self.assertEqual(rv.status_code, 422)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
-            response, {"message": {"datasource_id": ["Dataset does not exist"]}}
+            response, {"message": {
+                "datasource_id": ["Dataset does not exist"]}}
         )
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@@ -547,11 +569,13 @@ def test_update_chart(self):
 
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
-        birth_names_table_id = SupersetTestCase.get_table(name="birth_names").id
+        birth_names_table_id = SupersetTestCase.get_table(
+            name="birth_names").id
         chart_id = self.insert_chart(
             "title", [admin.id], birth_names_table_id, admin
         ).id
-        dash_id = db.session.query(Dashboard.id).filter_by(slug="births").first()[0]
+        dash_id = db.session.query(Dashboard.id).filter_by(
+            slug="births").first()[0]
         chart_data = {
             "slice_name": "title1_changed",
             "description": "description1",
@@ -562,13 +586,16 @@ def test_update_chart(self):
             "datasource_id": birth_names_table_id,
             "datasource_type": "table",
             "dashboards": [dash_id],
+            "certified_by": "Mario Rossi",
+            "certification_details": "Edited certification",
         }
         self.login(username="admin")
         uri = f"api/v1/chart/{chart_id}"
         rv = self.put_assert_metric(uri, chart_data, "put")
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Slice).get(chart_id)
-        related_dashboard = db.session.query(Dashboard).filter_by(slug="births").first()
+        related_dashboard = db.session.query(
+            Dashboard).filter_by(slug="births").first()
         self.assertEqual(model.created_by, admin)
         self.assertEqual(model.slice_name, "title1_changed")
         self.assertEqual(model.description, "description1")
@@ -580,7 +607,10 @@ def test_update_chart(self):
         self.assertEqual(model.datasource_id, birth_names_table_id)
         self.assertEqual(model.datasource_type, "table")
         self.assertEqual(model.datasource_name, full_table_name)
-        self.assertIn(model.id, [slice.id for slice in related_dashboard.slices])
+        self.assertEqual(model.certified_by, "Mario Rossi")
+        self.assertEqual(model.certification_details, "Edited certification")
+        self.assertIn(
+            model.id, [slice.id for slice in related_dashboard.slices])
         db.session.delete(model)
         db.session.commit()
 
@@ -680,20 +710,24 @@ def test_update_chart_validate_datasource(self):
         self.login(username="admin")
 
         chart_data = {"datasource_id": 1, "datasource_type": "unknown"}
-        rv = self.put_assert_metric(f"/api/v1/chart/{chart.id}", chart_data, "put")
+        rv = self.put_assert_metric(
+            f"/api/v1/chart/{chart.id}", chart_data, "put")
         self.assertEqual(rv.status_code, 400)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
             response,
-            {"message": {"datasource_type": ["Must be one of: druid, table, view."]}},
+            {"message": {"datasource_type": [
+                "Must be one of: druid, table, view."]}},
         )
 
         chart_data = {"datasource_id": 0, "datasource_type": "table"}
-        rv = self.put_assert_metric(f"/api/v1/chart/{chart.id}", chart_data, "put")
+        rv = self.put_assert_metric(
+            f"/api/v1/chart/{chart.id}", chart_data, "put")
         self.assertEqual(rv.status_code, 422)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
-            response, {"message": {"datasource_id": ["Dataset does not exist"]}}
+            response, {"message": {
+                "datasource_id": ["Dataset does not exist"]}}
         )
 
         db.session.delete(chart)
@@ -730,6 +764,8 @@ def test_get_chart(self):
         self.assertEqual(rv.status_code, 200)
         expected_result = {
             "cache_timeout": None,
+            "certified_by": "John Doe",
+            "certification_details": "Sample certification",
             "dashboards": [],
             "description": None,
             "owners": [
@@ -829,7 +865,8 @@ def test_get_charts_filter(self):
         Chart API: Test get charts filter
         """
         self.login(username="admin")
-        arguments = {"filters": [{"col": "slice_name", "opr": "sw", "value": "G"}]}
+        arguments = {"filters": [
+            {"col": "slice_name", "opr": "sw", "value": "G"}]}
         uri = f"api/v1/chart/?q={prison.dumps(arguments)}"
         rv = self.get_assert_metric(uri, "get_list")
         self.assertEqual(rv.status_code, 200)
@@ -903,15 +940,35 @@ def test_get_charts_custom_filter(self):
             self.assertEqual(
                 item["description"], expected_response[index]["description"]
             )
-            self.assertEqual(item["slice_name"], expected_response[index]["slice_name"])
-            self.assertEqual(item["viz_type"], expected_response[index]["viz_type"])
+            self.assertEqual(item["slice_name"],
+                             expected_response[index]["slice_name"])
+            self.assertEqual(item["viz_type"],
+                             expected_response[index]["viz_type"])
 
     @pytest.mark.usefixtures("load_energy_table_with_slice", "load_energy_charts")
     def test_admin_gets_filtered_energy_slices(self):
         # test filtering on datasource_name
         arguments = {
             "filters": [
-                {"col": "slice_name", "opr": "chart_all_text", "value": "energy",}
+                {"col": "slice_name", "opr": "chart_all_text", "value": "energy", }
+            ],
+            "keys": ["none"],
+            "columns": ["slice_name"],
+        }
+        self.login(username="admin")
+
+        uri = f"api/v1/chart/?q={prison.dumps(arguments)}"
+        rv = self.get_assert_metric(uri, "get_list")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(data["count"], 8)
+
+    @pytest.mark.usefixtures("create_certified_charts")
+    def test_admin_gets_filtered_energy_slices(self):
+        # test filtering on datasource_name
+        arguments = {
+            "filters": [
+                {"col": "slice_name", "opr": "chart_is_certified", "value": True, }
             ],
             "keys": ["none"],
             "columns": ["slice_name"],
@@ -929,7 +986,7 @@ def test_user_gets_none_filtered_energy_slices(self):
         # test filtering on datasource_name
         arguments = {
             "filters": [
-                {"col": "slice_name", "opr": "chart_all_text", "value": "energy",}
+                {"col": "slice_name", "opr": "chart_all_text", "value": "energy", }
             ],
             "keys": ["none"],
             "columns": ["slice_name"],
@@ -1087,7 +1144,8 @@ def test_chart_data_get_no_query_context(self):
         """
         self.login(username="admin")
         chart = db.session.query(Slice).filter_by(slice_name="Genders").one()
-        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/", "get_data")
         data = json.loads(rv.data.decode("utf-8"))
         assert data == {
             "message": "Chart has no query context saved. Please save the chart again."
@@ -1132,7 +1190,8 @@ def test_chart_data_get(self):
                 "result_type": "full",
             }
         )
-        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
+        rv = self.get_assert_metric(
+            f"api/v1/chart/{chart.id}/data/", "get_data")
         data = json.loads(rv.data.decode("utf-8"))
         assert data["result"][0]["status"] == "success"
         assert data["result"][0]["rowcount"] == 2
@@ -1162,7 +1221,7 @@ def test_chart_data_applied_time_extras(self):
         )
         self.assertEqual(
             data["result"][0]["rejected_filters"],
-            [{"column": "__time_origin", "reason": "not_druid_datasource"},],
+            [{"column": "__time_origin", "reason": "not_druid_datasource"}, ],
         )
         expected_row_count = self.get_expected_row_count("client_id_2")
         self.assertEqual(data["result"][0]["rowcount"], expected_row_count)
@@ -1215,7 +1274,8 @@ def test_chart_data_default_row_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.utils.core.current_app.config", {**app.config, "SQL_MAX_ROW": 10},
+        "superset.utils.core.current_app.config", {
+            **app.config, "SQL_MAX_ROW": 10},
     )
     def test_chart_data_sql_max_row_limit(self):
         """
@@ -1231,7 +1291,8 @@ def test_chart_data_sql_max_row_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.common.query_object.config", {**app.config, "SAMPLES_ROW_LIMIT": 5},
+        "superset.common.query_object.config", {
+            **app.config, "SAMPLES_ROW_LIMIT": 5},
     )
     def test_chart_data_sample_default_limit(self):
         """
@@ -1267,7 +1328,8 @@ def test_chart_data_sample_custom_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.utils.core.current_app.config", {**app.config, "SQL_MAX_ROW": 5},
+        "superset.utils.core.current_app.config", {
+            **app.config, "SQL_MAX_ROW": 5},
     )
     def test_chart_data_sql_max_row_sample_limit(self):
         """
@@ -1419,7 +1481,8 @@ def test_chart_data_prophet(self):
         time_grain = "P1Y"
         request_payload["queries"][0]["is_timeseries"] = True
         request_payload["queries"][0]["groupby"] = []
-        request_payload["queries"][0]["extras"] = {"time_grain_sqla": time_grain}
+        request_payload["queries"][0]["extras"] = {
+            "time_grain_sqla": time_grain}
         request_payload["queries"][0]["granularity"] = "ds"
         request_payload["queries"][0]["post_processing"] = [
             {
@@ -1559,7 +1622,8 @@ def test_chart_data_async(self):
         data = json.loads(rv.data.decode("utf-8"))
         keys = list(data.keys())
         self.assertCountEqual(
-            keys, ["channel_id", "job_id", "user_id", "status", "errors", "result_url"]
+            keys, ["channel_id", "job_id", "user_id",
+                   "status", "errors", "result_url"]
         )
 
     @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
@@ -1586,11 +1650,13 @@ class QueryContext:
         ) as patched_run:
             request_payload = get_query_context("birth_names")
             request_payload["result_type"] = utils.ChartDataResultType.FULL
-            rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
+            rv = self.post_assert_metric(
+                CHART_DATA_URI, request_payload, "data")
             self.assertEqual(rv.status_code, 200)
             data = json.loads(rv.data.decode("utf-8"))
             patched_run.assert_called_once_with(force_cached=True)
-            self.assertEqual(data, {"result": [{"query": "select * from foo"}]})
+            self.assertEqual(
+                data, {"result": [{"query": "select * from foo"}]})
 
     @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@@ -1754,14 +1820,16 @@ def test_import_chart(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
         assert response == {"message": "OK"}
 
         database = (
-            db.session.query(Database).filter_by(uuid=database_config["uuid"]).one()
+            db.session.query(Database).filter_by(
+                uuid=database_config["uuid"]).one()
         )
         assert database.database_name == "imported_database"
 
@@ -1770,7 +1838,8 @@ def test_import_chart(self):
         assert dataset.table_name == "imported_dataset"
         assert str(dataset.uuid) == dataset_config["uuid"]
 
-        chart = db.session.query(Slice).filter_by(uuid=chart_config["uuid"]).one()
+        chart = db.session.query(Slice).filter_by(
+            uuid=chart_config["uuid"]).one()
         assert chart.table == dataset
 
         chart.owners = []
@@ -1792,7 +1861,8 @@ def test_import_chart_overwrite(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1803,7 +1873,8 @@ def test_import_chart_overwrite(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -1832,7 +1903,8 @@ def test_import_chart_overwrite(self):
             "formData": (buf, "chart_export.zip"),
             "overwrite": "true",
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1840,10 +1912,12 @@ def test_import_chart_overwrite(self):
 
         # clean up
         database = (
-            db.session.query(Database).filter_by(uuid=database_config["uuid"]).one()
+            db.session.query(Database).filter_by(
+                uuid=database_config["uuid"]).one()
         )
         dataset = database.tables[0]
-        chart = db.session.query(Slice).filter_by(uuid=chart_config["uuid"]).one()
+        chart = db.session.query(Slice).filter_by(
+            uuid=chart_config["uuid"]).one()
 
         chart.owners = []
         dataset.owners = []
@@ -1877,7 +1951,8 @@ def test_import_chart_invalid(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -2033,5 +2108,6 @@ def test_chart_data_series_limit(self):
         self.maxDiff = None
         self.assertEqual(len(unique_names), SERIES_LIMIT)
         self.assertEqual(
-            set(column for column in data[0].keys()), {"state", "name", "sum__num"}
+            set(column for column in data[0].keys()), {
+                "state", "name", "sum__num"}
         )
diff --git a/tests/integration_tests/insert_chart_mixin.py b/tests/integration_tests/insert_chart_mixin.py
index 2aabc4b1a92b3..8fcb33067e351 100644
--- a/tests/integration_tests/insert_chart_mixin.py
+++ b/tests/integration_tests/insert_chart_mixin.py
@@ -36,6 +36,8 @@ def insert_chart(
         viz_type: Optional[str] = None,
         params: Optional[str] = None,
         cache_timeout: Optional[int] = None,
+        certified_by: Optional[str] = None,
+        certification_details: Optional[str] = None,
     ) -> Slice:
         obj_owners = list()
         for owner in owners:
@@ -46,6 +48,8 @@ def insert_chart(
         )
         slice = Slice(
             cache_timeout=cache_timeout,
+            certified_by=certified_by,
+            certification_details=certification_details,
             created_by=created_by,
             datasource_id=datasource.id,
             datasource_name=datasource.name,

From 53d4f12600b9276b419c81b3cfe69826c9da9ed0 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 17:58:25 +0000
Subject: [PATCH 10/20] Enhance integration tests

---
 superset/charts/filters.py                    |   8 +-
 superset/dashboards/filters.py                |  14 +-
 tests/integration_tests/charts/api_tests.py   | 161 ++++++++----------
 .../integration_tests/dashboards/api_tests.py |  40 +++++
 4 files changed, 131 insertions(+), 92 deletions(-)

diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index 76c521d27b20a..08dbdb2955ef8 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -65,9 +65,13 @@ class ChartCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-method
 
     def apply(self, query: Query, value: Any) -> Query:
         if value == True:
-            return query.filter(and_(Slice.certified_by.isnot(None)))
+            return query.filter(
+                and_(Slice.certified_by.isnot(None), Slice.certified_by.isnot(""),)
+            )
         if value == False:
-            return query.filter(and_(Slice.certified_by.is_(None)))
+            return query.filter(
+                and_((Slice.certified_by.is_(None)) | (Slice.certified_by.is_("")),)
+            )
         return query
 
 
diff --git a/superset/dashboards/filters.py b/superset/dashboards/filters.py
index b28ea1cf2da89..810d885f55aac 100644
--- a/superset/dashboards/filters.py
+++ b/superset/dashboards/filters.py
@@ -170,7 +170,17 @@ class DashboardCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-me
 
     def apply(self, query: Query, value: Any) -> Query:
         if value == True:
-            return query.filter(and_(Dashboard.certified_by.isnot(None)))
+            return query.filter(
+                and_(
+                    Dashboard.certified_by.isnot(None),
+                    Dashboard.certified_by.isnot(""),
+                )
+            )
         if value == False:
-            return query.filter(and_(Dashboard.certified_by.is_(None)))
+            return query.filter(
+                and_(
+                    (Dashboard.certified_by.is_(None))
+                    | (Dashboard.certified_by.is_("")),
+                )
+            )
         return query
diff --git a/tests/integration_tests/charts/api_tests.py b/tests/integration_tests/charts/api_tests.py
index 4cf48cc307cdc..befad228a4dd5 100644
--- a/tests/integration_tests/charts/api_tests.py
+++ b/tests/integration_tests/charts/api_tests.py
@@ -107,7 +107,7 @@ def create_charts(self):
             charts = []
             admin = self.get_user("admin")
             for cx in range(CHARTS_FIXTURE_COUNT - 1):
-                charts.append(self.insert_chart(f"name{cx}", [admin.id], 1))
+                charts.append(self.insert_chart(f"name{cx}", [admin.id], 1,))
             fav_charts = []
             for cx in range(round(CHARTS_FIXTURE_COUNT / 2)):
                 fav_star = FavStar(
@@ -128,15 +128,23 @@ def create_charts(self):
     @pytest.fixture()
     def create_certified_charts(self):
         with self.create_app().app_context():
-            charts = []
+            certified_charts = []
             admin = self.get_user("admin")
-            for cx in range(CHARTS_FIXTURE_COUNT - 1):
-                charts.append(self.insert_chart(f"name{cx}", [
-                              admin.id], 1, certified_by="John Doe", certification_details="Sample certification"))
-            yield charts
+            for cx in range(CHARTS_FIXTURE_COUNT):
+                certified_charts.append(
+                    self.insert_chart(
+                        f"certified{cx}",
+                        [admin.id],
+                        1,
+                        certified_by="John Doe",
+                        certification_details="Sample certification",
+                    )
+                )
+
+            yield certified_charts
 
             # rollback changes
-            for chart in charts:
+            for chart in certified_charts:
                 db.session.delete(chart)
             db.session.commit()
 
@@ -245,8 +253,7 @@ def test_delete_bulk_charts(self):
         chart_ids = list()
         for chart_name_index in range(chart_count):
             chart_ids.append(
-                self.insert_chart(f"title{chart_name_index}", [
-                                  admin.id], 1, admin).id
+                self.insert_chart(f"title{chart_name_index}", [admin.id], 1, admin).id
             )
         self.login(username="admin")
         argument = chart_ids
@@ -324,8 +331,7 @@ def test_bulk_delete_chart_with_report(self):
             .one_or_none()
         )
 
-        charts = db.session.query(Slice.id).filter(
-            Slice.slice_name.like("name%")).all()
+        charts = db.session.query(Slice.id).filter(Slice.slice_name.like("name%")).all()
         chart_ids = [chart.id for chart in charts]
         chart_ids.append(chart_with_report.id)
 
@@ -412,8 +418,7 @@ def test_delete_bulk_chart_not_owned(self):
         charts = list()
         for chart_name_index in range(chart_count):
             charts.append(
-                self.insert_chart(f"title{chart_name_index}", [
-                                  user_alpha1.id], 1)
+                self.insert_chart(f"title{chart_name_index}", [user_alpha1.id], 1)
             )
 
         owned_chart = self.insert_chart("title_owned", [user_alpha2.id], 1)
@@ -543,8 +548,7 @@ def test_create_chart_validate_datasource(self):
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
             response,
-            {"message": {"datasource_type": [
-                "Must be one of: druid, table, view."]}},
+            {"message": {"datasource_type": ["Must be one of: druid, table, view."]}},
         )
         chart_data = {
             "slice_name": "title1",
@@ -555,8 +559,7 @@ def test_create_chart_validate_datasource(self):
         self.assertEqual(rv.status_code, 422)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
-            response, {"message": {
-                "datasource_id": ["Dataset does not exist"]}}
+            response, {"message": {"datasource_id": ["Dataset does not exist"]}}
         )
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@@ -569,13 +572,11 @@ def test_update_chart(self):
 
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
-        birth_names_table_id = SupersetTestCase.get_table(
-            name="birth_names").id
+        birth_names_table_id = SupersetTestCase.get_table(name="birth_names").id
         chart_id = self.insert_chart(
             "title", [admin.id], birth_names_table_id, admin
         ).id
-        dash_id = db.session.query(Dashboard.id).filter_by(
-            slug="births").first()[0]
+        dash_id = db.session.query(Dashboard.id).filter_by(slug="births").first()[0]
         chart_data = {
             "slice_name": "title1_changed",
             "description": "description1",
@@ -594,8 +595,7 @@ def test_update_chart(self):
         rv = self.put_assert_metric(uri, chart_data, "put")
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Slice).get(chart_id)
-        related_dashboard = db.session.query(
-            Dashboard).filter_by(slug="births").first()
+        related_dashboard = db.session.query(Dashboard).filter_by(slug="births").first()
         self.assertEqual(model.created_by, admin)
         self.assertEqual(model.slice_name, "title1_changed")
         self.assertEqual(model.description, "description1")
@@ -609,8 +609,7 @@ def test_update_chart(self):
         self.assertEqual(model.datasource_name, full_table_name)
         self.assertEqual(model.certified_by, "Mario Rossi")
         self.assertEqual(model.certification_details, "Edited certification")
-        self.assertIn(
-            model.id, [slice.id for slice in related_dashboard.slices])
+        self.assertIn(model.id, [slice.id for slice in related_dashboard.slices])
         db.session.delete(model)
         db.session.commit()
 
@@ -710,24 +709,20 @@ def test_update_chart_validate_datasource(self):
         self.login(username="admin")
 
         chart_data = {"datasource_id": 1, "datasource_type": "unknown"}
-        rv = self.put_assert_metric(
-            f"/api/v1/chart/{chart.id}", chart_data, "put")
+        rv = self.put_assert_metric(f"/api/v1/chart/{chart.id}", chart_data, "put")
         self.assertEqual(rv.status_code, 400)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
             response,
-            {"message": {"datasource_type": [
-                "Must be one of: druid, table, view."]}},
+            {"message": {"datasource_type": ["Must be one of: druid, table, view."]}},
         )
 
         chart_data = {"datasource_id": 0, "datasource_type": "table"}
-        rv = self.put_assert_metric(
-            f"/api/v1/chart/{chart.id}", chart_data, "put")
+        rv = self.put_assert_metric(f"/api/v1/chart/{chart.id}", chart_data, "put")
         self.assertEqual(rv.status_code, 422)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(
-            response, {"message": {
-                "datasource_id": ["Dataset does not exist"]}}
+            response, {"message": {"datasource_id": ["Dataset does not exist"]}}
         )
 
         db.session.delete(chart)
@@ -764,8 +759,8 @@ def test_get_chart(self):
         self.assertEqual(rv.status_code, 200)
         expected_result = {
             "cache_timeout": None,
-            "certified_by": "John Doe",
-            "certification_details": "Sample certification",
+            "certified_by": None,
+            "certification_details": None,
             "dashboards": [],
             "description": None,
             "owners": [
@@ -865,8 +860,7 @@ def test_get_charts_filter(self):
         Chart API: Test get charts filter
         """
         self.login(username="admin")
-        arguments = {"filters": [
-            {"col": "slice_name", "opr": "sw", "value": "G"}]}
+        arguments = {"filters": [{"col": "slice_name", "opr": "sw", "value": "G"}]}
         uri = f"api/v1/chart/?q={prison.dumps(arguments)}"
         rv = self.get_assert_metric(uri, "get_list")
         self.assertEqual(rv.status_code, 200)
@@ -940,17 +934,15 @@ def test_get_charts_custom_filter(self):
             self.assertEqual(
                 item["description"], expected_response[index]["description"]
             )
-            self.assertEqual(item["slice_name"],
-                             expected_response[index]["slice_name"])
-            self.assertEqual(item["viz_type"],
-                             expected_response[index]["viz_type"])
+            self.assertEqual(item["slice_name"], expected_response[index]["slice_name"])
+            self.assertEqual(item["viz_type"], expected_response[index]["viz_type"])
 
     @pytest.mark.usefixtures("load_energy_table_with_slice", "load_energy_charts")
     def test_admin_gets_filtered_energy_slices(self):
         # test filtering on datasource_name
         arguments = {
             "filters": [
-                {"col": "slice_name", "opr": "chart_all_text", "value": "energy", }
+                {"col": "slice_name", "opr": "chart_all_text", "value": "energy",}
             ],
             "keys": ["none"],
             "columns": ["slice_name"],
@@ -964,12 +956,9 @@ def test_admin_gets_filtered_energy_slices(self):
         self.assertEqual(data["count"], 8)
 
     @pytest.mark.usefixtures("create_certified_charts")
-    def test_admin_gets_filtered_energy_slices(self):
-        # test filtering on datasource_name
+    def test_gets_certified_charts_filter(self):
         arguments = {
-            "filters": [
-                {"col": "slice_name", "opr": "chart_is_certified", "value": True, }
-            ],
+            "filters": [{"col": "id", "opr": "chart_is_certified", "value": True,}],
             "keys": ["none"],
             "columns": ["slice_name"],
         }
@@ -979,14 +968,29 @@ def test_admin_gets_filtered_energy_slices(self):
         rv = self.get_assert_metric(uri, "get_list")
         self.assertEqual(rv.status_code, 200)
         data = json.loads(rv.data.decode("utf-8"))
-        self.assertEqual(data["count"], 8)
+        self.assertEqual(data["count"], CHARTS_FIXTURE_COUNT)
+
+    @pytest.mark.usefixtures("create_charts")
+    def test_gets_not_certified_charts_filter(self):
+        arguments = {
+            "filters": [{"col": "id", "opr": "chart_is_certified", "value": False,}],
+            "keys": ["none"],
+            "columns": ["slice_name"],
+        }
+        self.login(username="admin")
+
+        uri = f"api/v1/chart/?q={prison.dumps(arguments)}"
+        rv = self.get_assert_metric(uri, "get_list")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(data["count"], 17)
 
     @pytest.mark.usefixtures("load_energy_charts")
     def test_user_gets_none_filtered_energy_slices(self):
         # test filtering on datasource_name
         arguments = {
             "filters": [
-                {"col": "slice_name", "opr": "chart_all_text", "value": "energy", }
+                {"col": "slice_name", "opr": "chart_all_text", "value": "energy",}
             ],
             "keys": ["none"],
             "columns": ["slice_name"],
@@ -1144,8 +1148,7 @@ def test_chart_data_get_no_query_context(self):
         """
         self.login(username="admin")
         chart = db.session.query(Slice).filter_by(slice_name="Genders").one()
-        rv = self.get_assert_metric(
-            f"api/v1/chart/{chart.id}/data/", "get_data")
+        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
         data = json.loads(rv.data.decode("utf-8"))
         assert data == {
             "message": "Chart has no query context saved. Please save the chart again."
@@ -1190,8 +1193,7 @@ def test_chart_data_get(self):
                 "result_type": "full",
             }
         )
-        rv = self.get_assert_metric(
-            f"api/v1/chart/{chart.id}/data/", "get_data")
+        rv = self.get_assert_metric(f"api/v1/chart/{chart.id}/data/", "get_data")
         data = json.loads(rv.data.decode("utf-8"))
         assert data["result"][0]["status"] == "success"
         assert data["result"][0]["rowcount"] == 2
@@ -1221,7 +1223,7 @@ def test_chart_data_applied_time_extras(self):
         )
         self.assertEqual(
             data["result"][0]["rejected_filters"],
-            [{"column": "__time_origin", "reason": "not_druid_datasource"}, ],
+            [{"column": "__time_origin", "reason": "not_druid_datasource"},],
         )
         expected_row_count = self.get_expected_row_count("client_id_2")
         self.assertEqual(data["result"][0]["rowcount"], expected_row_count)
@@ -1274,8 +1276,7 @@ def test_chart_data_default_row_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.utils.core.current_app.config", {
-            **app.config, "SQL_MAX_ROW": 10},
+        "superset.utils.core.current_app.config", {**app.config, "SQL_MAX_ROW": 10},
     )
     def test_chart_data_sql_max_row_limit(self):
         """
@@ -1291,8 +1292,7 @@ def test_chart_data_sql_max_row_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.common.query_object.config", {
-            **app.config, "SAMPLES_ROW_LIMIT": 5},
+        "superset.common.query_object.config", {**app.config, "SAMPLES_ROW_LIMIT": 5},
     )
     def test_chart_data_sample_default_limit(self):
         """
@@ -1328,8 +1328,7 @@ def test_chart_data_sample_custom_limit(self):
 
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
     @mock.patch(
-        "superset.utils.core.current_app.config", {
-            **app.config, "SQL_MAX_ROW": 5},
+        "superset.utils.core.current_app.config", {**app.config, "SQL_MAX_ROW": 5},
     )
     def test_chart_data_sql_max_row_sample_limit(self):
         """
@@ -1481,8 +1480,7 @@ def test_chart_data_prophet(self):
         time_grain = "P1Y"
         request_payload["queries"][0]["is_timeseries"] = True
         request_payload["queries"][0]["groupby"] = []
-        request_payload["queries"][0]["extras"] = {
-            "time_grain_sqla": time_grain}
+        request_payload["queries"][0]["extras"] = {"time_grain_sqla": time_grain}
         request_payload["queries"][0]["granularity"] = "ds"
         request_payload["queries"][0]["post_processing"] = [
             {
@@ -1622,8 +1620,7 @@ def test_chart_data_async(self):
         data = json.loads(rv.data.decode("utf-8"))
         keys = list(data.keys())
         self.assertCountEqual(
-            keys, ["channel_id", "job_id", "user_id",
-                   "status", "errors", "result_url"]
+            keys, ["channel_id", "job_id", "user_id", "status", "errors", "result_url"]
         )
 
     @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
@@ -1650,13 +1647,11 @@ class QueryContext:
         ) as patched_run:
             request_payload = get_query_context("birth_names")
             request_payload["result_type"] = utils.ChartDataResultType.FULL
-            rv = self.post_assert_metric(
-                CHART_DATA_URI, request_payload, "data")
+            rv = self.post_assert_metric(CHART_DATA_URI, request_payload, "data")
             self.assertEqual(rv.status_code, 200)
             data = json.loads(rv.data.decode("utf-8"))
             patched_run.assert_called_once_with(force_cached=True)
-            self.assertEqual(
-                data, {"result": [{"query": "select * from foo"}]})
+            self.assertEqual(data, {"result": [{"query": "select * from foo"}]})
 
     @with_feature_flags(GLOBAL_ASYNC_QUERIES=True)
     @pytest.mark.usefixtures("load_birth_names_dashboard_with_slices")
@@ -1820,16 +1815,14 @@ def test_import_chart(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
         assert response == {"message": "OK"}
 
         database = (
-            db.session.query(Database).filter_by(
-                uuid=database_config["uuid"]).one()
+            db.session.query(Database).filter_by(uuid=database_config["uuid"]).one()
         )
         assert database.database_name == "imported_database"
 
@@ -1838,8 +1831,7 @@ def test_import_chart(self):
         assert dataset.table_name == "imported_dataset"
         assert str(dataset.uuid) == dataset_config["uuid"]
 
-        chart = db.session.query(Slice).filter_by(
-            uuid=chart_config["uuid"]).one()
+        chart = db.session.query(Slice).filter_by(uuid=chart_config["uuid"]).one()
         assert chart.table == dataset
 
         chart.owners = []
@@ -1861,8 +1853,7 @@ def test_import_chart_overwrite(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1873,8 +1864,7 @@ def test_import_chart_overwrite(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -1903,8 +1893,7 @@ def test_import_chart_overwrite(self):
             "formData": (buf, "chart_export.zip"),
             "overwrite": "true",
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1912,12 +1901,10 @@ def test_import_chart_overwrite(self):
 
         # clean up
         database = (
-            db.session.query(Database).filter_by(
-                uuid=database_config["uuid"]).one()
+            db.session.query(Database).filter_by(uuid=database_config["uuid"]).one()
         )
         dataset = database.tables[0]
-        chart = db.session.query(Slice).filter_by(
-            uuid=chart_config["uuid"]).one()
+        chart = db.session.query(Slice).filter_by(uuid=chart_config["uuid"]).one()
 
         chart.owners = []
         dataset.owners = []
@@ -1951,8 +1938,7 @@ def test_import_chart_invalid(self):
         form_data = {
             "formData": (buf, "chart_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -2108,6 +2094,5 @@ def test_chart_data_series_limit(self):
         self.maxDiff = None
         self.assertEqual(len(unique_names), SERIES_LIMIT)
         self.assertEqual(
-            set(column for column in data[0].keys()), {
-                "state", "name", "sum__num"}
+            set(column for column in data[0].keys()), {"state", "name", "sum__num"}
         )
diff --git a/tests/integration_tests/dashboards/api_tests.py b/tests/integration_tests/dashboards/api_tests.py
index 743c4af65be02..9cd8e95800a53 100644
--- a/tests/integration_tests/dashboards/api_tests.py
+++ b/tests/integration_tests/dashboards/api_tests.py
@@ -86,6 +86,8 @@ def insert_dashboard(
         css: str = "",
         json_metadata: str = "",
         published: bool = False,
+        certified_by: Optional[str] = None,
+        certification_details: Optional[str] = None,
     ) -> Dashboard:
         obj_owners = list()
         obj_roles = list()
@@ -107,6 +109,8 @@ def insert_dashboard(
             slices=slices,
             published=published,
             created_by=created_by,
+            certified_by=certified_by,
+            certification_details=certification_details,
         )
         db.session.add(dashboard)
         db.session.commit()
@@ -125,6 +129,8 @@ def create_dashboards(self):
                     f"slug{cx}",
                     [admin.id],
                     slices=charts if cx < half_dash_count else [],
+                    certified_by="John Doe",
+                    certification_details="Sample certification",
                 )
                 if cx < half_dash_count:
                     chart = self.insert_chart(f"slice{cx}", [admin.id], 1, params="{}")
@@ -315,6 +321,8 @@ def test_get_dashboard(self):
         rv = self.get_assert_metric(uri, "get")
         self.assertEqual(rv.status_code, 200)
         expected_result = {
+            "certified_by": None,
+            "certification_details": None,
             "changed_by": None,
             "changed_by_name": "",
             "changed_by_url": "",
@@ -611,6 +619,38 @@ def test_get_dashboards_not_favorite_filter(self):
                 expected_model.dashboard_title == data["result"][i]["dashboard_title"]
             )
 
+    @pytest.mark.usefixtures("create_dashboards")
+    def test_gets_certified_dashboards_filter(self):
+        arguments = {
+            "filters": [{"col": "id", "opr": "dashboard_is_certified", "value": True,}],
+            "keys": ["none"],
+            "columns": ["dashboard_title"],
+        }
+        self.login(username="admin")
+
+        uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
+        rv = self.get_assert_metric(uri, "get_list")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(data["count"], DASHBOARDS_FIXTURE_COUNT)
+
+    @pytest.mark.usefixtures("create_dashboards")
+    def test_gets_not_certified_dashboards_filter(self):
+        arguments = {
+            "filters": [
+                {"col": "id", "opr": "dashboard_is_certified", "value": False,}
+            ],
+            "keys": ["none"],
+            "columns": ["dashboard_title"],
+        }
+        self.login(username="admin")
+
+        uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
+        rv = self.get_assert_metric(uri, "get_list")
+        self.assertEqual(rv.status_code, 200)
+        data = json.loads(rv.data.decode("utf-8"))
+        self.assertEqual(data["count"], 0)
+
     def create_dashboard_import(self):
         buf = BytesIO()
         with ZipFile(buf, "w") as bundle:

From 93698c4493d033ff14a3dc105918e637c7948820 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 18:05:09 +0000
Subject: [PATCH 11/20] Lint

---
 superset/charts/filters.py     | 4 ++--
 superset/dashboards/filters.py | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index 08dbdb2955ef8..040a2b886da02 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -64,11 +64,11 @@ class ChartCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-method
     arg_name = "chart_is_certified"
 
     def apply(self, query: Query, value: Any) -> Query:
-        if value == True:
+        if value is True:
             return query.filter(
                 and_(Slice.certified_by.isnot(None), Slice.certified_by.isnot(""),)
             )
-        if value == False:
+        if value is False:
             return query.filter(
                 and_((Slice.certified_by.is_(None)) | (Slice.certified_by.is_("")),)
             )
diff --git a/superset/dashboards/filters.py b/superset/dashboards/filters.py
index 810d885f55aac..fbaf44ab78b2a 100644
--- a/superset/dashboards/filters.py
+++ b/superset/dashboards/filters.py
@@ -169,14 +169,14 @@ class DashboardCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-me
     arg_name = "dashboard_is_certified"
 
     def apply(self, query: Query, value: Any) -> Query:
-        if value == True:
+        if value is True:
             return query.filter(
                 and_(
                     Dashboard.certified_by.isnot(None),
                     Dashboard.certified_by.isnot(""),
                 )
             )
-        if value == False:
+        if value is False:
             return query.filter(
                 and_(
                     (Dashboard.certified_by.is_(None))

From 895e342fe8bfce406c8dfa50a0ec0d42fbbdb2cb Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 18:20:20 +0000
Subject: [PATCH 12/20] Fix dashboards count

---
 .../integration_tests/dashboards/api_tests.py | 125 ++++++++++++------
 1 file changed, 82 insertions(+), 43 deletions(-)

diff --git a/tests/integration_tests/dashboards/api_tests.py b/tests/integration_tests/dashboards/api_tests.py
index 9cd8e95800a53..cbbacf06f1d25 100644
--- a/tests/integration_tests/dashboards/api_tests.py
+++ b/tests/integration_tests/dashboards/api_tests.py
@@ -133,7 +133,8 @@ def create_dashboards(self):
                     certification_details="Sample certification",
                 )
                 if cx < half_dash_count:
-                    chart = self.insert_chart(f"slice{cx}", [admin.id], 1, params="{}")
+                    chart = self.insert_chart(
+                        f"slice{cx}", [admin.id], 1, params="{}")
                     charts.append(chart)
                     dashboard.slices = [chart]
                     db.session.add(dashboard)
@@ -327,7 +328,7 @@ def test_get_dashboard(self):
             "changed_by_name": "",
             "changed_by_url": "",
             "charts": [],
-            "created_by": {"id": 1, "first_name": "admin", "last_name": "user",},
+            "created_by": {"id": 1, "first_name": "admin", "last_name": "user", },
             "id": dashboard.id,
             "css": "",
             "dashboard_title": "title",
@@ -445,7 +446,8 @@ def test_get_dashboards_filter(self):
         """
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
-        dashboard = self.insert_dashboard("title", "slug1", [admin.id, gamma.id])
+        dashboard = self.insert_dashboard(
+            "title", "slug1", [admin.id, gamma.id])
 
         self.login(username="admin")
 
@@ -461,7 +463,8 @@ def test_get_dashboards_filter(self):
 
         arguments = {
             "filters": [
-                {"col": "owners", "opr": "rel_m_m", "value": [admin.id, gamma.id]}
+                {"col": "owners", "opr": "rel_m_m",
+                    "value": [admin.id, gamma.id]}
             ]
         }
         uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
@@ -622,7 +625,7 @@ def test_get_dashboards_not_favorite_filter(self):
     @pytest.mark.usefixtures("create_dashboards")
     def test_gets_certified_dashboards_filter(self):
         arguments = {
-            "filters": [{"col": "id", "opr": "dashboard_is_certified", "value": True,}],
+            "filters": [{"col": "id", "opr": "dashboard_is_certified", "value": True, }],
             "keys": ["none"],
             "columns": ["dashboard_title"],
         }
@@ -638,7 +641,7 @@ def test_gets_certified_dashboards_filter(self):
     def test_gets_not_certified_dashboards_filter(self):
         arguments = {
             "filters": [
-                {"col": "id", "opr": "dashboard_is_certified", "value": False,}
+                {"col": "id", "opr": "dashboard_is_certified", "value": False, }
             ],
             "keys": ["none"],
             "columns": ["dashboard_title"],
@@ -649,7 +652,7 @@ def test_gets_not_certified_dashboards_filter(self):
         rv = self.get_assert_metric(uri, "get_list")
         self.assertEqual(rv.status_code, 200)
         data = json.loads(rv.data.decode("utf-8"))
-        self.assertEqual(data["count"], 0)
+        self.assertEqual(data["count"], 6)
 
     def create_dashboard_import(self):
         buf = BytesIO()
@@ -715,7 +718,8 @@ def test_delete_bulk_dashboards(self):
         rv = self.delete_assert_metric(uri, "bulk_delete")
         self.assertEqual(rv.status_code, 200)
         response = json.loads(rv.data.decode("utf-8"))
-        expected_response = {"message": f"Deleted {dashboard_count} dashboards"}
+        expected_response = {
+            "message": f"Deleted {dashboard_count} dashboards"}
         self.assertEqual(response, expected_response)
         for dashboard_id in dashboard_ids:
             model = db.session.query(Dashboard).get(dashboard_id)
@@ -837,7 +841,8 @@ def test_delete_bulk_dashboard_admin_not_owned(self):
         rv = self.client.delete(uri)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(rv.status_code, 200)
-        expected_response = {"message": f"Deleted {dashboard_count} dashboards"}
+        expected_response = {
+            "message": f"Deleted {dashboard_count} dashboards"}
         self.assertEqual(response, expected_response)
 
         for dashboard_id in dashboard_ids:
@@ -856,7 +861,8 @@ def test_delete_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(
+                slice_name="Girl Name Cloud").first()
         )
         dashboard = self.insert_dashboard(
             "title", "slug1", [user_alpha1.id], slices=[existing_slice], published=True
@@ -882,7 +888,8 @@ def test_delete_bulk_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(
+                slice_name="Girl Name Cloud").first()
         )
 
         dashboard_count = 4
@@ -918,7 +925,8 @@ def test_delete_bulk_dashboard_not_owned(self):
         self.assertEqual(response, expected_response)
 
         # nothing is deleted in bulk with a list of owned and not owned dashboards
-        arguments = [dashboard.id for dashboard in dashboards] + [owned_dashboard.id]
+        arguments = [dashboard.id for dashboard in dashboards] + \
+            [owned_dashboard.id]
         uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
         rv = self.client.delete(uri)
         self.assertEqual(rv.status_code, 403)
@@ -1032,7 +1040,8 @@ def test_create_dashboard_validate_slug(self):
         rv = self.client.post(uri, json=dashboard_data)
         self.assertEqual(rv.status_code, 400)
         response = json.loads(rv.data.decode("utf-8"))
-        expected_response = {"message": {"slug": ["Length must be between 1 and 255."]}}
+        expected_response = {"message": {
+            "slug": ["Length must be between 1 and 255."]}}
         self.assertEqual(response, expected_response)
 
         db.session.delete(dashboard)
@@ -1068,13 +1077,15 @@ def test_create_dashboard_validate_json(self):
         """
         Dashboard API: Test create validate json
         """
-        dashboard_data = {"dashboard_title": "title1", "position_json": '{"A:"a"}'}
+        dashboard_data = {"dashboard_title": "title1",
+                          "position_json": '{"A:"a"}'}
         self.login(username="admin")
         uri = "api/v1/dashboard/"
         rv = self.client.post(uri, json=dashboard_data)
         self.assertEqual(rv.status_code, 400)
 
-        dashboard_data = {"dashboard_title": "title1", "json_metadata": '{"A:"a"}'}
+        dashboard_data = {"dashboard_title": "title1",
+                          "json_metadata": '{"A:"a"}'}
         self.login(username="admin")
         uri = "api/v1/dashboard/"
         rv = self.client.post(uri, json=dashboard_data)
@@ -1103,11 +1114,14 @@ def test_update_dashboard(self):
         rv = self.put_assert_metric(uri, self.dashboard_data, "put")
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Dashboard).get(dashboard_id)
-        self.assertEqual(model.dashboard_title, self.dashboard_data["dashboard_title"])
+        self.assertEqual(model.dashboard_title,
+                         self.dashboard_data["dashboard_title"])
         self.assertEqual(model.slug, self.dashboard_data["slug"])
-        self.assertEqual(model.position_json, self.dashboard_data["position_json"])
+        self.assertEqual(model.position_json,
+                         self.dashboard_data["position_json"])
         self.assertEqual(model.css, self.dashboard_data["css"])
-        self.assertEqual(model.json_metadata, self.dashboard_data["json_metadata"])
+        self.assertEqual(model.json_metadata,
+                         self.dashboard_data["json_metadata"])
         self.assertEqual(model.published, self.dashboard_data["published"])
         self.assertEqual(model.owners, [admin])
         self.assertEqual(model.roles, [admin_role])
@@ -1129,12 +1143,16 @@ def test_update_dashboard_chart_owners(self):
         admin = self.get_user("admin")
         slices = []
         slices.append(
-            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(
+                slice_name="Girl Name Cloud").first()
         )
-        slices.append(db.session.query(Slice).filter_by(slice_name="Trends").first())
-        slices.append(db.session.query(Slice).filter_by(slice_name="Boys").first())
+        slices.append(db.session.query(Slice).filter_by(
+            slice_name="Trends").first())
+        slices.append(db.session.query(
+            Slice).filter_by(slice_name="Boys").first())
 
-        dashboard = self.insert_dashboard("title1", "slug1", [admin.id], slices=slices,)
+        dashboard = self.insert_dashboard(
+            "title1", "slug1", [admin.id], slices=slices,)
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard.id}"
         dashboard_data = {"owners": [user_alpha1.id, user_alpha2.id]}
@@ -1173,7 +1191,8 @@ def test_update_partial_dashboard(self):
         self.assertEqual(rv.status_code, 200)
 
         rv = self.client.put(
-            uri, json={"dashboard_title": self.dashboard_data["dashboard_title"]}
+            uri, json={
+                "dashboard_title": self.dashboard_data["dashboard_title"]}
         )
         self.assertEqual(rv.status_code, 200)
 
@@ -1181,8 +1200,10 @@ def test_update_partial_dashboard(self):
         self.assertEqual(rv.status_code, 200)
 
         model = db.session.query(Dashboard).get(dashboard_id)
-        self.assertEqual(model.json_metadata, self.dashboard_data["json_metadata"])
-        self.assertEqual(model.dashboard_title, self.dashboard_data["dashboard_title"])
+        self.assertEqual(model.json_metadata,
+                         self.dashboard_data["json_metadata"])
+        self.assertEqual(model.dashboard_title,
+                         self.dashboard_data["dashboard_title"])
         self.assertEqual(model.slug, self.dashboard_data["slug"])
 
         db.session.delete(model)
@@ -1195,7 +1216,8 @@ def test_update_dashboard_new_owner_not_admin(self):
         gamma = self.get_user("gamma")
         alpha = self.get_user("alpha")
         dashboard_id = self.insert_dashboard("title1", "slug1", [alpha.id]).id
-        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
+        dashboard_data = {
+            "dashboard_title": "title1_changed", "owners": [gamma.id]}
         self.login(username="alpha")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1216,7 +1238,8 @@ def test_update_dashboard_new_owner_admin(self):
         gamma = self.get_user("gamma")
         admin = self.get_user("admin")
         dashboard_id = self.insert_dashboard("title1", "slug1", [admin.id]).id
-        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
+        dashboard_data = {
+            "dashboard_title": "title1_changed", "owners": [gamma.id]}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1236,7 +1259,8 @@ def test_update_dashboard_slug_formatting(self):
         """
         admin_id = self.get_user("admin").id
         dashboard_id = self.insert_dashboard("title1", "slug1", [admin_id]).id
-        dashboard_data = {"dashboard_title": "title1_changed", "slug": "slug1 changed"}
+        dashboard_data = {
+            "dashboard_title": "title1_changed", "slug": "slug1 changed"}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1289,7 +1313,8 @@ def test_update_published(self):
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
 
-        dashboard = self.insert_dashboard("title1", "slug1", [admin.id, gamma.id])
+        dashboard = self.insert_dashboard(
+            "title1", "slug1", [admin.id, gamma.id])
         dashboard_data = {"published": True}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard.id}"
@@ -1316,13 +1341,15 @@ def test_update_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(
+                slice_name="Girl Name Cloud").first()
         )
         dashboard = self.insert_dashboard(
             "title", "slug1", [user_alpha1.id], slices=[existing_slice], published=True
         )
         self.login(username="alpha2", password="password")
-        dashboard_data = {"dashboard_title": "title1_changed", "slug": "slug1 changed"}
+        dashboard_data = {
+            "dashboard_title": "title1_changed", "slug": "slug1 changed"}
         uri = f"api/v1/dashboard/{dashboard.id}"
         rv = self.put_assert_metric(uri, dashboard_data, "put")
         self.assertEqual(rv.status_code, 403)
@@ -1366,7 +1393,8 @@ def test_export_not_allowed(self):
         Dashboard API: Test dashboard export not allowed
         """
         admin_id = self.get_user("admin").id
-        dashboard = self.insert_dashboard("title", "slug1", [admin_id], published=False)
+        dashboard = self.insert_dashboard(
+            "title", "slug1", [admin_id], published=False)
 
         self.login(username="gamma")
         argument = [dashboard.id]
@@ -1421,7 +1449,8 @@ def test_export_bundle_not_allowed(self):
         Dashboard API: Test dashboard export not allowed
         """
         admin_id = self.get_user("admin").id
-        dashboard = self.insert_dashboard("title", "slug1", [admin_id], published=False)
+        dashboard = self.insert_dashboard(
+            "title", "slug1", [admin_id], published=False)
 
         self.login(username="gamma")
         argument = [dashboard.id]
@@ -1443,14 +1472,16 @@ def test_import_dashboard(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
         assert response == {"message": "OK"}
 
         dashboard = (
-            db.session.query(Dashboard).filter_by(uuid=dashboard_config["uuid"]).one()
+            db.session.query(Dashboard).filter_by(
+                uuid=dashboard_config["uuid"]).one()
         )
         assert dashboard.dashboard_title == "Test dash"
 
@@ -1481,7 +1512,8 @@ def test_import_dashboard_invalid_file(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 400
@@ -1518,7 +1550,8 @@ def test_import_dashboard_v0_export(self):
         form_data = {
             "formData": (buf, "20201119_181105.json"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1526,7 +1559,8 @@ def test_import_dashboard_v0_export(self):
         assert db.session.query(Dashboard).count() == num_dashboards + 1
 
         dashboard = (
-            db.session.query(Dashboard).filter_by(dashboard_title="Births 2").one()
+            db.session.query(Dashboard).filter_by(
+                dashboard_title="Births 2").one()
         )
         chart = dashboard.slices[0]
         dataset = chart.table
@@ -1547,7 +1581,8 @@ def test_import_dashboard_overwrite(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1558,7 +1593,8 @@ def test_import_dashboard_overwrite(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -1590,7 +1626,8 @@ def test_import_dashboard_overwrite(self):
             "formData": (buf, "dashboard_export.zip"),
             "overwrite": "true",
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1598,7 +1635,8 @@ def test_import_dashboard_overwrite(self):
 
         # cleanup
         dashboard = (
-            db.session.query(Dashboard).filter_by(uuid=dashboard_config["uuid"]).one()
+            db.session.query(Dashboard).filter_by(
+                uuid=dashboard_config["uuid"]).one()
         )
         chart = dashboard.slices[0]
         dataset = chart.table
@@ -1640,7 +1678,8 @@ def test_import_dashboard_invalid(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data,
+                              content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422

From a59143bd0c09802a150f4c7bd747afbbcb0b6702 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 5 Nov 2021 18:30:56 +0000
Subject: [PATCH 13/20] Format

---
 .../integration_tests/dashboards/api_tests.py | 123 ++++++------------
 1 file changed, 42 insertions(+), 81 deletions(-)

diff --git a/tests/integration_tests/dashboards/api_tests.py b/tests/integration_tests/dashboards/api_tests.py
index cbbacf06f1d25..c05314914d76d 100644
--- a/tests/integration_tests/dashboards/api_tests.py
+++ b/tests/integration_tests/dashboards/api_tests.py
@@ -133,8 +133,7 @@ def create_dashboards(self):
                     certification_details="Sample certification",
                 )
                 if cx < half_dash_count:
-                    chart = self.insert_chart(
-                        f"slice{cx}", [admin.id], 1, params="{}")
+                    chart = self.insert_chart(f"slice{cx}", [admin.id], 1, params="{}")
                     charts.append(chart)
                     dashboard.slices = [chart]
                     db.session.add(dashboard)
@@ -328,7 +327,7 @@ def test_get_dashboard(self):
             "changed_by_name": "",
             "changed_by_url": "",
             "charts": [],
-            "created_by": {"id": 1, "first_name": "admin", "last_name": "user", },
+            "created_by": {"id": 1, "first_name": "admin", "last_name": "user",},
             "id": dashboard.id,
             "css": "",
             "dashboard_title": "title",
@@ -446,8 +445,7 @@ def test_get_dashboards_filter(self):
         """
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
-        dashboard = self.insert_dashboard(
-            "title", "slug1", [admin.id, gamma.id])
+        dashboard = self.insert_dashboard("title", "slug1", [admin.id, gamma.id])
 
         self.login(username="admin")
 
@@ -463,8 +461,7 @@ def test_get_dashboards_filter(self):
 
         arguments = {
             "filters": [
-                {"col": "owners", "opr": "rel_m_m",
-                    "value": [admin.id, gamma.id]}
+                {"col": "owners", "opr": "rel_m_m", "value": [admin.id, gamma.id]}
             ]
         }
         uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
@@ -625,7 +622,7 @@ def test_get_dashboards_not_favorite_filter(self):
     @pytest.mark.usefixtures("create_dashboards")
     def test_gets_certified_dashboards_filter(self):
         arguments = {
-            "filters": [{"col": "id", "opr": "dashboard_is_certified", "value": True, }],
+            "filters": [{"col": "id", "opr": "dashboard_is_certified", "value": True,}],
             "keys": ["none"],
             "columns": ["dashboard_title"],
         }
@@ -641,7 +638,7 @@ def test_gets_certified_dashboards_filter(self):
     def test_gets_not_certified_dashboards_filter(self):
         arguments = {
             "filters": [
-                {"col": "id", "opr": "dashboard_is_certified", "value": False, }
+                {"col": "id", "opr": "dashboard_is_certified", "value": False,}
             ],
             "keys": ["none"],
             "columns": ["dashboard_title"],
@@ -718,8 +715,7 @@ def test_delete_bulk_dashboards(self):
         rv = self.delete_assert_metric(uri, "bulk_delete")
         self.assertEqual(rv.status_code, 200)
         response = json.loads(rv.data.decode("utf-8"))
-        expected_response = {
-            "message": f"Deleted {dashboard_count} dashboards"}
+        expected_response = {"message": f"Deleted {dashboard_count} dashboards"}
         self.assertEqual(response, expected_response)
         for dashboard_id in dashboard_ids:
             model = db.session.query(Dashboard).get(dashboard_id)
@@ -841,8 +837,7 @@ def test_delete_bulk_dashboard_admin_not_owned(self):
         rv = self.client.delete(uri)
         response = json.loads(rv.data.decode("utf-8"))
         self.assertEqual(rv.status_code, 200)
-        expected_response = {
-            "message": f"Deleted {dashboard_count} dashboards"}
+        expected_response = {"message": f"Deleted {dashboard_count} dashboards"}
         self.assertEqual(response, expected_response)
 
         for dashboard_id in dashboard_ids:
@@ -861,8 +856,7 @@ def test_delete_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(
-                slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
         )
         dashboard = self.insert_dashboard(
             "title", "slug1", [user_alpha1.id], slices=[existing_slice], published=True
@@ -888,8 +882,7 @@ def test_delete_bulk_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(
-                slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
         )
 
         dashboard_count = 4
@@ -925,8 +918,7 @@ def test_delete_bulk_dashboard_not_owned(self):
         self.assertEqual(response, expected_response)
 
         # nothing is deleted in bulk with a list of owned and not owned dashboards
-        arguments = [dashboard.id for dashboard in dashboards] + \
-            [owned_dashboard.id]
+        arguments = [dashboard.id for dashboard in dashboards] + [owned_dashboard.id]
         uri = f"api/v1/dashboard/?q={prison.dumps(arguments)}"
         rv = self.client.delete(uri)
         self.assertEqual(rv.status_code, 403)
@@ -1040,8 +1032,7 @@ def test_create_dashboard_validate_slug(self):
         rv = self.client.post(uri, json=dashboard_data)
         self.assertEqual(rv.status_code, 400)
         response = json.loads(rv.data.decode("utf-8"))
-        expected_response = {"message": {
-            "slug": ["Length must be between 1 and 255."]}}
+        expected_response = {"message": {"slug": ["Length must be between 1 and 255."]}}
         self.assertEqual(response, expected_response)
 
         db.session.delete(dashboard)
@@ -1077,15 +1068,13 @@ def test_create_dashboard_validate_json(self):
         """
         Dashboard API: Test create validate json
         """
-        dashboard_data = {"dashboard_title": "title1",
-                          "position_json": '{"A:"a"}'}
+        dashboard_data = {"dashboard_title": "title1", "position_json": '{"A:"a"}'}
         self.login(username="admin")
         uri = "api/v1/dashboard/"
         rv = self.client.post(uri, json=dashboard_data)
         self.assertEqual(rv.status_code, 400)
 
-        dashboard_data = {"dashboard_title": "title1",
-                          "json_metadata": '{"A:"a"}'}
+        dashboard_data = {"dashboard_title": "title1", "json_metadata": '{"A:"a"}'}
         self.login(username="admin")
         uri = "api/v1/dashboard/"
         rv = self.client.post(uri, json=dashboard_data)
@@ -1114,14 +1103,11 @@ def test_update_dashboard(self):
         rv = self.put_assert_metric(uri, self.dashboard_data, "put")
         self.assertEqual(rv.status_code, 200)
         model = db.session.query(Dashboard).get(dashboard_id)
-        self.assertEqual(model.dashboard_title,
-                         self.dashboard_data["dashboard_title"])
+        self.assertEqual(model.dashboard_title, self.dashboard_data["dashboard_title"])
         self.assertEqual(model.slug, self.dashboard_data["slug"])
-        self.assertEqual(model.position_json,
-                         self.dashboard_data["position_json"])
+        self.assertEqual(model.position_json, self.dashboard_data["position_json"])
         self.assertEqual(model.css, self.dashboard_data["css"])
-        self.assertEqual(model.json_metadata,
-                         self.dashboard_data["json_metadata"])
+        self.assertEqual(model.json_metadata, self.dashboard_data["json_metadata"])
         self.assertEqual(model.published, self.dashboard_data["published"])
         self.assertEqual(model.owners, [admin])
         self.assertEqual(model.roles, [admin_role])
@@ -1143,16 +1129,12 @@ def test_update_dashboard_chart_owners(self):
         admin = self.get_user("admin")
         slices = []
         slices.append(
-            db.session.query(Slice).filter_by(
-                slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
         )
-        slices.append(db.session.query(Slice).filter_by(
-            slice_name="Trends").first())
-        slices.append(db.session.query(
-            Slice).filter_by(slice_name="Boys").first())
+        slices.append(db.session.query(Slice).filter_by(slice_name="Trends").first())
+        slices.append(db.session.query(Slice).filter_by(slice_name="Boys").first())
 
-        dashboard = self.insert_dashboard(
-            "title1", "slug1", [admin.id], slices=slices,)
+        dashboard = self.insert_dashboard("title1", "slug1", [admin.id], slices=slices,)
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard.id}"
         dashboard_data = {"owners": [user_alpha1.id, user_alpha2.id]}
@@ -1191,8 +1173,7 @@ def test_update_partial_dashboard(self):
         self.assertEqual(rv.status_code, 200)
 
         rv = self.client.put(
-            uri, json={
-                "dashboard_title": self.dashboard_data["dashboard_title"]}
+            uri, json={"dashboard_title": self.dashboard_data["dashboard_title"]}
         )
         self.assertEqual(rv.status_code, 200)
 
@@ -1200,10 +1181,8 @@ def test_update_partial_dashboard(self):
         self.assertEqual(rv.status_code, 200)
 
         model = db.session.query(Dashboard).get(dashboard_id)
-        self.assertEqual(model.json_metadata,
-                         self.dashboard_data["json_metadata"])
-        self.assertEqual(model.dashboard_title,
-                         self.dashboard_data["dashboard_title"])
+        self.assertEqual(model.json_metadata, self.dashboard_data["json_metadata"])
+        self.assertEqual(model.dashboard_title, self.dashboard_data["dashboard_title"])
         self.assertEqual(model.slug, self.dashboard_data["slug"])
 
         db.session.delete(model)
@@ -1216,8 +1195,7 @@ def test_update_dashboard_new_owner_not_admin(self):
         gamma = self.get_user("gamma")
         alpha = self.get_user("alpha")
         dashboard_id = self.insert_dashboard("title1", "slug1", [alpha.id]).id
-        dashboard_data = {
-            "dashboard_title": "title1_changed", "owners": [gamma.id]}
+        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
         self.login(username="alpha")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1238,8 +1216,7 @@ def test_update_dashboard_new_owner_admin(self):
         gamma = self.get_user("gamma")
         admin = self.get_user("admin")
         dashboard_id = self.insert_dashboard("title1", "slug1", [admin.id]).id
-        dashboard_data = {
-            "dashboard_title": "title1_changed", "owners": [gamma.id]}
+        dashboard_data = {"dashboard_title": "title1_changed", "owners": [gamma.id]}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1259,8 +1236,7 @@ def test_update_dashboard_slug_formatting(self):
         """
         admin_id = self.get_user("admin").id
         dashboard_id = self.insert_dashboard("title1", "slug1", [admin_id]).id
-        dashboard_data = {
-            "dashboard_title": "title1_changed", "slug": "slug1 changed"}
+        dashboard_data = {"dashboard_title": "title1_changed", "slug": "slug1 changed"}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard_id}"
         rv = self.client.put(uri, json=dashboard_data)
@@ -1313,8 +1289,7 @@ def test_update_published(self):
         admin = self.get_user("admin")
         gamma = self.get_user("gamma")
 
-        dashboard = self.insert_dashboard(
-            "title1", "slug1", [admin.id, gamma.id])
+        dashboard = self.insert_dashboard("title1", "slug1", [admin.id, gamma.id])
         dashboard_data = {"published": True}
         self.login(username="admin")
         uri = f"api/v1/dashboard/{dashboard.id}"
@@ -1341,15 +1316,13 @@ def test_update_dashboard_not_owned(self):
             "alpha2", "password", "Alpha", email="alpha2@superset.org"
         )
         existing_slice = (
-            db.session.query(Slice).filter_by(
-                slice_name="Girl Name Cloud").first()
+            db.session.query(Slice).filter_by(slice_name="Girl Name Cloud").first()
         )
         dashboard = self.insert_dashboard(
             "title", "slug1", [user_alpha1.id], slices=[existing_slice], published=True
         )
         self.login(username="alpha2", password="password")
-        dashboard_data = {
-            "dashboard_title": "title1_changed", "slug": "slug1 changed"}
+        dashboard_data = {"dashboard_title": "title1_changed", "slug": "slug1 changed"}
         uri = f"api/v1/dashboard/{dashboard.id}"
         rv = self.put_assert_metric(uri, dashboard_data, "put")
         self.assertEqual(rv.status_code, 403)
@@ -1393,8 +1366,7 @@ def test_export_not_allowed(self):
         Dashboard API: Test dashboard export not allowed
         """
         admin_id = self.get_user("admin").id
-        dashboard = self.insert_dashboard(
-            "title", "slug1", [admin_id], published=False)
+        dashboard = self.insert_dashboard("title", "slug1", [admin_id], published=False)
 
         self.login(username="gamma")
         argument = [dashboard.id]
@@ -1449,8 +1421,7 @@ def test_export_bundle_not_allowed(self):
         Dashboard API: Test dashboard export not allowed
         """
         admin_id = self.get_user("admin").id
-        dashboard = self.insert_dashboard(
-            "title", "slug1", [admin_id], published=False)
+        dashboard = self.insert_dashboard("title", "slug1", [admin_id], published=False)
 
         self.login(username="gamma")
         argument = [dashboard.id]
@@ -1472,16 +1443,14 @@ def test_import_dashboard(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
         assert response == {"message": "OK"}
 
         dashboard = (
-            db.session.query(Dashboard).filter_by(
-                uuid=dashboard_config["uuid"]).one()
+            db.session.query(Dashboard).filter_by(uuid=dashboard_config["uuid"]).one()
         )
         assert dashboard.dashboard_title == "Test dash"
 
@@ -1512,8 +1481,7 @@ def test_import_dashboard_invalid_file(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 400
@@ -1550,8 +1518,7 @@ def test_import_dashboard_v0_export(self):
         form_data = {
             "formData": (buf, "20201119_181105.json"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1559,8 +1526,7 @@ def test_import_dashboard_v0_export(self):
         assert db.session.query(Dashboard).count() == num_dashboards + 1
 
         dashboard = (
-            db.session.query(Dashboard).filter_by(
-                dashboard_title="Births 2").one()
+            db.session.query(Dashboard).filter_by(dashboard_title="Births 2").one()
         )
         chart = dashboard.slices[0]
         dataset = chart.table
@@ -1581,8 +1547,7 @@ def test_import_dashboard_overwrite(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1593,8 +1558,7 @@ def test_import_dashboard_overwrite(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422
@@ -1626,8 +1590,7 @@ def test_import_dashboard_overwrite(self):
             "formData": (buf, "dashboard_export.zip"),
             "overwrite": "true",
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 200
@@ -1635,8 +1598,7 @@ def test_import_dashboard_overwrite(self):
 
         # cleanup
         dashboard = (
-            db.session.query(Dashboard).filter_by(
-                uuid=dashboard_config["uuid"]).one()
+            db.session.query(Dashboard).filter_by(uuid=dashboard_config["uuid"]).one()
         )
         chart = dashboard.slices[0]
         dataset = chart.table
@@ -1678,8 +1640,7 @@ def test_import_dashboard_invalid(self):
         form_data = {
             "formData": (buf, "dashboard_export.zip"),
         }
-        rv = self.client.post(uri, data=form_data,
-                              content_type="multipart/form-data")
+        rv = self.client.post(uri, data=form_data, content_type="multipart/form-data")
         response = json.loads(rv.data.decode("utf-8"))
 
         assert rv.status_code == 422

From 6e81002c6570198549fe1b653c87444514cab6d1 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Tue, 9 Nov 2021 14:18:40 +0000
Subject: [PATCH 14/20] Handle empty value

---
 .../dashboard/components/PropertiesModal/index.jsx |  2 +-
 superset/charts/filters.py                         |  8 ++------
 superset/dashboards/filters.py                     | 14 ++------------
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index 9b772663952db..0d6871578232f 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -302,7 +302,7 @@ class PropertiesModal extends React.PureComponent {
           slug: slug || null,
           json_metadata: jsonMetadata || null,
           owners,
-          certified_by: certifiedBy,
+          certified_by: certifiedBy || null,
           certification_details:
             certifiedBy && certificationDetails ? certificationDetails : null,
           ...morePutProps,
diff --git a/superset/charts/filters.py b/superset/charts/filters.py
index 040a2b886da02..9ea3050903fdd 100644
--- a/superset/charts/filters.py
+++ b/superset/charts/filters.py
@@ -65,13 +65,9 @@ class ChartCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-method
 
     def apply(self, query: Query, value: Any) -> Query:
         if value is True:
-            return query.filter(
-                and_(Slice.certified_by.isnot(None), Slice.certified_by.isnot(""),)
-            )
+            return query.filter(and_(Slice.certified_by.isnot(None)))
         if value is False:
-            return query.filter(
-                and_((Slice.certified_by.is_(None)) | (Slice.certified_by.is_("")),)
-            )
+            return query.filter(and_(Slice.certified_by.is_(None)))
         return query
 
 
diff --git a/superset/dashboards/filters.py b/superset/dashboards/filters.py
index fbaf44ab78b2a..96584784f449b 100644
--- a/superset/dashboards/filters.py
+++ b/superset/dashboards/filters.py
@@ -170,17 +170,7 @@ class DashboardCertifiedFilter(BaseFilter):  # pylint: disable=too-few-public-me
 
     def apply(self, query: Query, value: Any) -> Query:
         if value is True:
-            return query.filter(
-                and_(
-                    Dashboard.certified_by.isnot(None),
-                    Dashboard.certified_by.isnot(""),
-                )
-            )
+            return query.filter(and_(Dashboard.certified_by.isnot(None),))
         if value is False:
-            return query.filter(
-                and_(
-                    (Dashboard.certified_by.is_(None))
-                    | (Dashboard.certified_by.is_("")),
-                )
-            )
+            return query.filter(and_(Dashboard.certified_by.is_(None),))
         return query

From 4889896889b5ba8456398b866c9373d453873e55 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Tue, 9 Nov 2021 15:30:26 +0000
Subject: [PATCH 15/20] Handle empty slice

---
 .../src/explore/components/ExploreChartHeader/index.jsx         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
index 1f449e67aab51..46c33515b56dd 100644
--- a/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
+++ b/superset-frontend/src/explore/components/ExploreChartHeader/index.jsx
@@ -261,7 +261,7 @@ export class ExploreChartHeader extends React.PureComponent {
     return (
       <StyledHeader id="slice-header" className="panel-title-large">
         <div className="title-panel">
-          {slice.certified_by && (
+          {slice?.certified_by && (
             <>
               <CertifiedIcon
                 certifiedBy={slice.certified_by}

From b48028313d602458a51ae8a072843cda46767930 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 12 Nov 2021 15:47:31 +0000
Subject: [PATCH 16/20] Downgrade migration

---
 .../components/PropertiesModal/index.jsx      |  2 +-
 superset/charts/api.py                        | 37 ++++++++-----------
 ...add_certifications_columns_to_dashboard.py |  5 +++
 ...53d_add_certifications_columns_to_slice.py |  8 +++-
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
index 0d6871578232f..da004c79e4473 100644
--- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
+++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx
@@ -521,7 +521,7 @@ class PropertiesModal extends React.PureComponent {
                   disabled={!isDashboardLoaded}
                 />
                 <p className="help-block">
-                  {t('Person or group that has certified this chart.')}
+                  {t('Person or group that has certified this dashboard.')}
                 </p>
               </FormItem>
             </Col>
diff --git a/superset/charts/api.py b/superset/charts/api.py
index b84c1148a1c34..f2e7741372fdd 100644
--- a/superset/charts/api.py
+++ b/superset/charts/api.py
@@ -47,7 +47,12 @@
 from superset.charts.commands.importers.dispatcher import ImportChartsCommand
 from superset.charts.commands.update import UpdateChartCommand
 from superset.charts.dao import ChartDAO
-from superset.charts.filters import ChartAllTextFilter, ChartFavoriteFilter, ChartFilter, ChartCertifiedFilter
+from superset.charts.filters import (
+    ChartAllTextFilter,
+    ChartCertifiedFilter,
+    ChartFavoriteFilter,
+    ChartFilter,
+)
 from superset.charts.schemas import (
     CHART_SCHEMAS,
     ChartPostSchema,
@@ -372,8 +377,7 @@ def put(self, pk: int) -> Response:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.delete",
         log_to_statsd=False,
     )
     def delete(self, pk: int) -> Response:
@@ -430,8 +434,7 @@ def delete(self, pk: int) -> Response:
     @statsd_metrics
     @rison(get_delete_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.bulk_delete",
         log_to_statsd=False,
     )
     def bulk_delete(self, **kwargs: Any) -> Response:
@@ -538,8 +541,7 @@ def cache_screenshot(self, pk: int, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        chart_url = get_url_path(
-            "Superset.slice", slice_id=chart.id, standalone="true")
+        chart_url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
         screenshot_obj = ChartScreenshot(chart_url, chart.digest)
         cache_key = screenshot_obj.cache_key(window_size, thumb_size)
         image_url = get_url_path(
@@ -567,8 +569,7 @@ def trigger_celery() -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.screenshot",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.screenshot",
         log_to_statsd=False,
     )
     def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
@@ -625,8 +626,7 @@ def screenshot(self, pk: int, digest: str) -> WerkzeugResponse:
     @safe
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.thumbnail",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.thumbnail",
         log_to_statsd=False,
     )
     def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
@@ -666,12 +666,10 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not chart:
             return self.response_404()
 
-        url = get_url_path(
-            "Superset.slice", slice_id=chart.id, standalone="true")
+        url = get_url_path("Superset.slice", slice_id=chart.id, standalone="true")
         if kwargs["rison"].get("force", False):
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
-                    chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -683,8 +681,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
         if not screenshot:
             self.incr_stats("async", self.thumbnail.__name__)
             logger.info(
-                "Triggering thumbnail compute (chart id: %s) ASYNC", str(
-                    chart.id)
+                "Triggering thumbnail compute (chart id: %s) ASYNC", str(chart.id)
             )
             cache_chart_thumbnail.delay(url, chart.digest, force=True)
             return self.response(202, message="OK Async")
@@ -707,8 +704,7 @@ def thumbnail(self, pk: int, digest: str, **kwargs: Any) -> WerkzeugResponse:
     @statsd_metrics
     @rison(get_export_ids_schema)
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.export",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.export",
         log_to_statsd=False,
     )
     def export(self, **kwargs: Any) -> Response:
@@ -821,8 +817,7 @@ def favorite_status(self, **kwargs: Any) -> Response:
     @protect()
     @statsd_metrics
     @event_logger.log_this_with_context(
-        action=lambda self, *
-        args, **kwargs: f"{self.__class__.__name__}.import_",
+        action=lambda self, *args, **kwargs: f"{self.__class__.__name__}.import_",
         log_to_statsd=False,
     )
     def import_(self) -> Response:
diff --git a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
index d4cc35726892e..f07aa3d6e40f9 100644
--- a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
+++ b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
@@ -36,3 +36,8 @@ def upgrade():
     op.add_column(
         "dashboards", sa.Column("certification_details", sa.Text(), nullable=True)
     )
+
+
+def downgrade():
+    op.drop_column("dashboards", "certified_by")
+    op.drop_column("dashboards", "certification_details")
diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index c300c5a4a93f6..791c4a210375e 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -31,7 +31,13 @@
 
 
 def upgrade():
-    op.add_column("slices", sa.Column("certified_by", sa.Text(), nullable=True))
+    op.add_column("slices", sa.Column(
+        "certified_by", sa.Text(), nullable=True))
     op.add_column(
         "slices", sa.Column("certification_details", sa.Text(), nullable=True)
     )
+
+
+def downgrade():
+    op.drop_column("slices", "certified_by")
+    op.drop_column("slices", "certification_details")

From afe39a818e1396ddee814cf8122b287374ba1056 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Fri, 12 Nov 2021 15:48:29 +0000
Subject: [PATCH 17/20] Indent

---
 .../f9847149153d_add_certifications_columns_to_slice.py        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index 791c4a210375e..45d7cb4b0d001 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -31,8 +31,7 @@
 
 
 def upgrade():
-    op.add_column("slices", sa.Column(
-        "certified_by", sa.Text(), nullable=True))
+    op.add_column("slices", sa.Column("certified_by", sa.Text(), nullable=True))
     op.add_column(
         "slices", sa.Column("certification_details", sa.Text(), nullable=True)
     )

From ce1f7c8f45b2b066c520364d987b4c3a29f0f7e5 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Tue, 16 Nov 2021 15:58:17 +0000
Subject: [PATCH 18/20] Use alter

---
 ...53b_add_certifications_columns_to_dashboard.py | 15 ++++++++-------
 ...149153d_add_certifications_columns_to_slice.py | 14 ++++++++------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
index f07aa3d6e40f9..db53cf214c171 100644
--- a/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
+++ b/superset/migrations/versions/aea15018d53b_add_certifications_columns_to_dashboard.py
@@ -31,13 +31,14 @@
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.add_column("dashboards", sa.Column("certified_by", sa.Text(), nullable=True))
-    op.add_column(
-        "dashboards", sa.Column("certification_details", sa.Text(), nullable=True)
-    )
+    with op.batch_alter_table("dashboards") as batch_op:
+        batch_op.add_column(sa.Column("certified_by", sa.Text(), nullable=True))
+        batch_op.add_column(
+            sa.Column("certification_details", sa.Text(), nullable=True)
+        )
 
 
 def downgrade():
-    op.drop_column("dashboards", "certified_by")
-    op.drop_column("dashboards", "certification_details")
+    with op.batch_alter_table("dashboards") as batch_op:
+        batch_op.drop_column("certified_by")
+        batch_op.drop_column("certification_details")
diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index 45d7cb4b0d001..00418a80037fe 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -31,12 +31,14 @@
 
 
 def upgrade():
-    op.add_column("slices", sa.Column("certified_by", sa.Text(), nullable=True))
-    op.add_column(
-        "slices", sa.Column("certification_details", sa.Text(), nullable=True)
-    )
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.add_column(sa.Column("certified_by", sa.Text(), nullable=True))
+        batch_op.add_column(
+            sa.Column("certification_details", sa.Text(), nullable=True)
+        )
 
 
 def downgrade():
-    op.drop_column("slices", "certified_by")
-    op.drop_column("slices", "certification_details")
+    with op.batch_alter_table("slices") as batch_op:
+        batch_op.drop_column("certified_by")
+        batch_op.drop_column("certification_details")

From bbc7092cfe5355384de92b9ecdf3f8e737fa4b0f Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Wed, 17 Nov 2021 12:27:32 +0000
Subject: [PATCH 19/20] Fix revision

---
 .../f9847149153d_add_certifications_columns_to_slice.py    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index 00418a80037fe..0a5e9aa55ea87 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -17,7 +17,7 @@
 """add_certifications_columns_to_slice
 
 Revision ID: f9847149153d
-Revises: b92d69a6643c
+Revises: 0ca9e5f1dacd
 Create Date: 2021-11-03 14:07:09.905194
 
 """
@@ -27,12 +27,13 @@
 from alembic import op
 
 revision = "f9847149153d"
-down_revision = "b92d69a6643c"
+down_revision = "0ca9e5f1dacd"
 
 
 def upgrade():
     with op.batch_alter_table("slices") as batch_op:
-        batch_op.add_column(sa.Column("certified_by", sa.Text(), nullable=True))
+        batch_op.add_column(
+            sa.Column("certified_by", sa.Text(), nullable=True))
         batch_op.add_column(
             sa.Column("certification_details", sa.Text(), nullable=True)
         )

From fb3c2a3687786999f58fd7a7110ae95e078f5ec4 Mon Sep 17 00:00:00 2001
From: geido <diegopucci.me@gmail.com>
Date: Wed, 17 Nov 2021 12:28:42 +0000
Subject: [PATCH 20/20] Fix revision

---
 .../f9847149153d_add_certifications_columns_to_slice.py        | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
index 0a5e9aa55ea87..a7e8a2239fdfa 100644
--- a/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
+++ b/superset/migrations/versions/f9847149153d_add_certifications_columns_to_slice.py
@@ -32,8 +32,7 @@
 
 def upgrade():
     with op.batch_alter_table("slices") as batch_op:
-        batch_op.add_column(
-            sa.Column("certified_by", sa.Text(), nullable=True))
+        batch_op.add_column(sa.Column("certified_by", sa.Text(), nullable=True))
         batch_op.add_column(
             sa.Column("certification_details", sa.Text(), nullable=True)
         )