fix: database alpha permissions (#12136)

* fix: database alpha permissions

* add test

(cherry picked from commit 2f0add3aec)

superset-frontend/cypress-base/cypress/integration/dashboard/filter.test.ts

@@ -65,27 +65,21 @@ describe('Dashboard filter', () => {
       cy.wait(aliases);
     });
   });
-  xit('should apply filter', () => {
+
-    cy.get('.Select__control input[type=text]')
+  it('should apply filter', () => {
-      .first()
+    cy.get('.Select__placeholder:first').click();
-      .should('be.visible')
-      .focus();
 
     // should open the filter indicator
-    cy.get('[data-test="filter"]')
+    cy.get('svg[data-test="filter"]')
-      .should('be.visible', { timeout: 10000 })
+      .should('be.visible')
       .should(nodes => {
-        expect(nodes).to.have.length(9); // this part was not working, xit-ed
+        expect(nodes).to.have.length(9);
       });
 
-    cy.get('[data-test="chart-container"]').find('svg').should('be.visible');
+    cy.get('.Select__control:first input[type=text]').type('So', {
-
+      force: true,
-    cy.get('.Select__control input[type=text]').first().focus().blur();
+      delay: 100,
-
+    });
-    cy.get('.Select__control input[type=text]')
-      .first()
-      .focus()
-      .type('So', { force: true, delay: 100 });
 
     cy.get('.Select__menu').first().contains('South Asia').click();
 

superset-frontend/cypress-base/package.json

@@ -19,6 +19,9 @@
     "eslint-plugin-cypress": "^2.11.1"
   },
   "nyc": {
-    "reporter": ["html", "json"]
+    "reporter": [
+      "html",
+      "json"
+    ]
   }
 }

superset-frontend/src/constants.ts

@@ -19,3 +19,6 @@
 export const DATETIME_WITH_TIME_ZONE = 'YYYY-MM-DD HH:mm:ssZ';
 
 export const TIME_WITH_MS = 'HH:mm:ss.SSS';
+
+export const BOOL_TRUE_DISPLAY = 'True';
+export const BOOL_FALSE_DISPLAY = 'False';

superset-frontend/src/explore/components/DataTableControl.tsx

@@ -19,7 +19,10 @@
 import React, { useMemo } from 'react';
 import { styled, t } from '@superset-ui/core';
 import { FormControl } from 'react-bootstrap';
+import { Column } from 'react-table';
 import debounce from 'lodash/debounce';
+
+import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
 import Button from 'src/components/Button';
 import {
   applyFormattingToTabularData,
@@ -95,11 +98,30 @@ export const useFilteredTableData = (
     );
   }, [data, filterText]);
 
-export const useTableColumns = (data?: Record<string, any>[]) =>
+export const useTableColumns = (
+  data?: Record<string, any>[],
+  moreConfigs?: { [key: string]: Partial<Column> },
+) =>
   useMemo(
     () =>
       data?.length
-        ? Object.keys(data[0]).map(key => ({ accessor: key, Header: key }))
+        ? Object.keys(data[0]).map(
+            key =>
+              ({
+                accessor: key,
+                Header: key,
+                Cell: ({ value }) => {
+                  if (value === true) {
+                    return BOOL_TRUE_DISPLAY;
+                  }
+                  if (value === false) {
+                    return BOOL_FALSE_DISPLAY;
+                  }
+                  return String(value);
+                },
+                ...moreConfigs?.[key],
+              } as Column),
+          )
         : [],
-    [data],
+    [data, moreConfigs],
   );

superset-frontend/src/explore/components/ExploreChartPanel.jsx

@@ -235,28 +235,34 @@ const ExploreChartPanel = props => {
     };
   };
 
+  const panelBody = <div className="panel-body">{renderChart()}</div>;
+
   return (
     <Styles className="panel panel-default chart-container">
       <div className="panel-heading" ref={panelHeadingRef}>
         {header}
       </div>
-      <Split
+      {props.vizType === 'filter_box' ? (
-        sizes={splitSizes}
+        panelBody
-        minSize={MIN_SIZES}
+      ) : (
-        direction="vertical"
+        <Split
-        gutterSize={gutterHeight}
+          sizes={splitSizes}
-        onDragStart={onDragStart}
+          minSize={MIN_SIZES}
-        onDragEnd={onDragEnd}
+          direction="vertical"
-        elementStyle={elementStyle}
+          gutterSize={gutterHeight}
-      >
+          onDragStart={onDragStart}
-        <div className="panel-body">{renderChart()}</div>
+          onDragEnd={onDragEnd}
-        <DataTablesPane
+          elementStyle={elementStyle}
-          queryFormData={props.chart.latestQueryFormData}
+        >
-          tableSectionHeight={tableSectionHeight}
+          {panelBody}
-          onCollapseChange={onCollapseChange}
+          <DataTablesPane
-          displayBackground={displaySouthPaneBackground}
+            queryFormData={props.chart.latestQueryFormData}
-        />
+            tableSectionHeight={tableSectionHeight}
-      </Split>
+            onCollapseChange={onCollapseChange}
+            displayBackground={displaySouthPaneBackground}
+          />
+        </Split>
+      )}
     </Styles>
   );
 };

superset-frontend/src/visualizations/FilterBox/FilterBox.jsx

@@ -24,8 +24,8 @@ import { AsyncCreatableSelect, CreatableSelect } from 'src/components/Select';
 import Button from 'src/components/Button';
 import { t, styled, SupersetClient } from '@superset-ui/core';
 
+import { BOOL_FALSE_DISPLAY, BOOL_TRUE_DISPLAY } from 'src/constants';
 import FormLabel from 'src/components/FormLabel';
-
 import DateFilterControl from 'src/explore/components/controls/DateFilterControl';
 import ControlRow from 'src/explore/components/ControlRow';
 import Control from 'src/explore/components/Control';
@@ -102,7 +102,7 @@ const Styles = styled.div`
   overflow: visible;
 `;
 
-class FilterBox extends React.Component {
+class FilterBox extends React.PureComponent {
   constructor(props) {
     super(props);
     this.state = {
@@ -216,7 +216,13 @@ class FilterBox extends React.Component {
       const color = 'lightgrey';
       const backgroundImage = `linear-gradient(to right, ${color}, ${color} ${perc}%, rgba(0,0,0,0) ${perc}%`;
       const style = { backgroundImage };
-      return { value: opt.id, label: opt.id, style };
+      let label = opt.id;
+      if (label === true) {
+        label = BOOL_TRUE_DISPLAY;
+      } else if (label === false) {
+        label = BOOL_FALSE_DISPLAY;
+      }
+      return { value: opt.id, label, style };
     });
   }
 
@@ -424,7 +430,6 @@ class FilterBox extends React.Component {
 
   render() {
     const { instantFiltering } = this.props;
-
     return (
       <Styles>
         {this.renderDateFilter()}

superset/examples/configs/datasets/examples/cleaned_sales_data.yaml

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-table_name: Cleaned Sales Data
+table_name: cleaned_sales_data
 main_dttm_col: OrderDate
 description: null
 default_endpoint: null

superset/security/manager.py

@@ -109,7 +109,7 @@ class SupersetSecurityManager(  # pylint: disable=too-many-public-methods
     SecurityManager
 ):
     userstatschartview = None
-    READ_ONLY_MODEL_VIEWS = {"DatabaseAsync", "DatabaseView", "DruidClusterModelView"}
+    READ_ONLY_MODEL_VIEWS = {"Database", "DruidClusterModelView", "DynamicPlugin"}
 
     USER_MODEL_VIEWS = {
         "UserDBModelView",

tests/security_tests.py

@@ -685,6 +685,7 @@ class TestRolePermission(SupersetTestCase):
         self.assert_can_all("CssTemplate", perm_set)
         self.assert_can_all("Dataset", perm_set)
         self.assert_can_read("Query", perm_set)
+        self.assert_can_read("Database", perm_set)
         self.assertIn(("can_import_dashboards", "Superset"), perm_set)
         self.assertIn(("can_this_form_post", "CsvToDatabaseView"), perm_set)
         self.assertIn(("can_this_form_get", "CsvToDatabaseView"), perm_set)
@@ -701,6 +702,7 @@ class TestRolePermission(SupersetTestCase):
         self.assert_cannot_write("Queries", perm_set)
         self.assert_cannot_write("RoleModelView", perm_set)
         self.assert_cannot_write("UserDBModelView", perm_set)
+        self.assert_cannot_write("Database", perm_set)
 
     def assert_can_admin(self, perm_set):
         self.assert_can_all("Database", perm_set)