[CLDN-1609] Fixing all QA bugs (#201)

* [CLDN-1609] Fixing all QA bugs * [CLDN-1609] Fixing build errors * [CLDN-1609] adding additional fixes * [CLDN-1609] Removing log files * [CLDN-1609] Fixing build error Co-authored-by: reesercollins <10563996+reesercollins@users.noreply.github.com>
CybercentreCanada · Aug 23, 2022 · 8bc4533 · 8bc4533
1 parent 163e440
commit 8bc4533
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 101 deletions.
diff --git a/superset-frontend/logs b/superset-frontend/logs
diff --git a/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx b/superset-frontend/src/cccs-viz/plugins/plugin-chart-cccs-grid/src/plugin/controlPanel.tsx
@@ -402,13 +402,20 @@ const config: ControlPanelConfig = {
         ],
         [
           {
-            name: 'order_desc',
+            name: 'order_by_cols',
             config: {
-              type: 'CheckboxControl',
-              label: t('Sort descending'),
-              default: true,
-              description: t('Whether to sort descending or ascending'),
-              visibility: isAggMode,
+              type: 'SelectControl',
+              label: t('Ordering'),
+              description: t('Order results by selected columns'),
+              multi: true,
+              default: [],
+              mapStateToProps: ({ datasource }) => ({
+                choices: datasource?.hasOwnProperty('order_by_choices')
+                  ? (datasource as Dataset)?.order_by_choices
+                  : datasource?.columns || [],
+              }),
+              visibility: isRawMode,
+              resetOnHide: false,
             },
           },
         ],

diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -44,6 +44,7 @@ import SpatialControl from 'src/explore/components/controls/SpatialControl';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import Icons from 'src/components/Icons';
+import { bootstrapData } from 'src/preamble';
 import CollectionTable from './CollectionTable';
 import Fieldset from './Fieldset';
 import Field from './Field';
@@ -279,9 +280,17 @@ function ColumnCollectionTable({
                 fieldKey="advanced_data_type"
                 label={t('Advanced data type')}
                 control={
-                  <TextControl
-                    controlId="advanced_data_type"
-                    placeholder={t('Advanced Data type')}
+                  <Select
+                    ariaLabel={t('Select advanced data type')}
+                    name="advanced_data_type"
+                    allowClear
+                    allowNewOptions
+                    options={bootstrapData?.common?.advanced_data_types.map(
+                      v => ({
+                        value: v.id,
+                        label: v.verbose_name,
+                      }),
+                    )}
                   />
                 }
               />

diff --git a/...xplore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx b/...xplore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/index.tsx
@@ -115,6 +115,7 @@ export interface AdvancedDataTypesState {
   parsedAdvancedDataType: string;
   advancedDataTypeOperatorList: string[];
   errorMessage: string;
+  useDefaultOperators: boolean;
 }
 
 export const useSimpleTabFilterProps = (props: Props) => {
@@ -268,7 +269,7 @@ const AdhocFilterEditPopoverSimpleTabContent: React.FC<Props> = props => {
   } = useAdvancedDataTypes(props.validHandler);
   // TODO: This does not need to exist, just use the advancedTypeOperatorList list
   const isOperatorRelevantWrapper = (operator: Operators, subject: string) =>
-    subjectAdvancedDataType
+    subjectAdvancedDataType && !advancedDataTypesState.useDefaultOperators
       ? isOperatorRelevant(operator, subject) &&
         advancedDataTypesState.advancedDataTypeOperatorList.includes(operator)
       : isOperatorRelevant(operator, subject);

diff --git a/...nts/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts b/...nts/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent/useAdvancedDataTypes.ts
@@ -26,6 +26,7 @@ const INITIAL_ADVANCED_DATA_TYPES_STATE: AdvancedDataTypesState = {
   parsedAdvancedDataType: '',
   advancedDataTypeOperatorList: [],
   errorMessage: '',
+  useDefaultOperators: false,
 };
 
 const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => {
@@ -58,6 +59,7 @@ const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => {
               parsedAdvancedDataType: json.result.display_value,
               advancedDataTypeOperatorList: json.result.valid_filter_operators,
               errorMessage: json.result.error_message,
+              useDefaultOperators: false,
             });
             // Changed due to removal of status field
             validHandler(!json.result.error_message);
@@ -68,8 +70,9 @@ const useAdvancedDataTypes = (validHandler: (isValid: boolean) => void) => {
               advancedDataTypeOperatorList:
                 advancedDataTypesState.advancedDataTypeOperatorList,
               errorMessage: t('Failed to retrieve advanced type'),
+              useDefaultOperators: true,
             });
-            validHandler(false);
+            validHandler(true);
           });
       }, 600)();
     },

diff --git a/superset/advanced_data_type/api.py b/superset/advanced_data_type/api.py
@@ -91,9 +91,9 @@ def get(self, **kwargs: Any) -> Response:
               $ref: '#/components/responses/500'
         """
         item = kwargs["rison"]
-        advanced_data_type = item["type"]
+        advanced_data_type: str = item["type"]
         values = item["values"]
-        addon = ADVANCED_DATA_TYPES.get(advanced_data_type)
+        addon = ADVANCED_DATA_TYPES.get(advanced_data_type.lower())
         if not addon:
             return self.response(
                 400,

diff --git a/superset/advanced_data_type/schemas.py b/superset/advanced_data_type/schemas.py
@@ -26,7 +26,7 @@
         "values": {
             "type": "array",
             "items": {"default": "http"},
-            "minItems": 1,
+            "minItems": 0,
         },
     },
     "required": ["type", "values"],

diff --git a/superset/connectors/sqla/models.py b/superset/connectors/sqla/models.py
@@ -1519,7 +1519,7 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                     utils.FilterOperator.NOT_IN.value,
                 )
 
-                col_advanced_data_type = col_obj.advanced_data_type if col_obj else ""
+                col_advanced_data_type: str = col_obj.advanced_data_type if col_obj else ""
 
                 if col_spec and not col_advanced_data_type:
                     target_generic_type = col_spec.generic_type
@@ -1535,14 +1535,15 @@ def get_sqla_query(  # pylint: disable=too-many-arguments,too-many-locals,too-ma
                 )
                 if (
                     col_advanced_data_type != ""
+                    and col_advanced_data_type
                     and feature_flag_manager.is_feature_enabled(
                         "ENABLE_ADVANCED_DATA_TYPES"
                     )
-                    and col_advanced_data_type in ADVANCED_DATA_TYPES
+                    and col_advanced_data_type.lower() in ADVANCED_DATA_TYPES
                 ):
                     values = eq if is_list_target else [eq]  # type: ignore
                     bus_resp: AdvancedDataTypeResponse = ADVANCED_DATA_TYPES[
-                        col_advanced_data_type
+                        col_advanced_data_type.lower()
                     ].translate_type(
                         {
                             "type": col_advanced_data_type,

diff --git a/superset/views/base.py b/superset/views/base.py
@@ -387,6 +387,17 @@ def common_bootstrap_payload() -> Dict[str, Any]:
         "theme_overrides": conf["THEME_OVERRIDES"],
         "menu_data": menu_data(),
         "datahub_url": conf.get("DATAHUB_URL", ""),
+        "advanced_data_types": list(
+            map(
+                lambda v: {
+                    "id": v[0],
+                    "verbose_name": v[1].verbose_name,
+                    "description": v[1].description,
+                    "valid_data_types": v[1].valid_data_types,
+                },
+                config["ADVANCED_DATA_TYPES"].items(),
+            )
+        ),
     }
     bootstrap_data.update(conf["COMMON_BOOTSTRAP_OVERRIDES_FUNC"](bootstrap_data))
     return bootstrap_data