pt/superset
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2024-09-12 00:29:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: disable drag metrics and columns in datasourcePanel (#13450)

Browse Source
This commit is contained in:
Yongjie Zhao 2021-03-04 12:21:57 +08:00 committed by GitHub
parent cfc83c271c
commit ca27b00f3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
superset-frontend/src/explore/components/DatasourcePanel.tsx → superset-frontend/src/explore/components/DatasourcePanel/DatasourcePanel.tsx
View File

@ -28,10 +28,11 @@ import {
import { debounce } from 'lodash';
import { matchSorter, rankings } from 'match-sorter';
import { FAST_DEBOUNCE } from 'src/constants';
import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags';
import { ExploreActions } from 'src/explore/actions/exploreActions';
import Control from './Control';
import DatasourcePanelDragWrapper from './DatasourcePanel/DatasourcePanelDragWrapper';
import { DatasourcePanelDndType } from './DatasourcePanel/types';
import Control from 'src/explore/components/Control';
import DatasourcePanelDragWrapper from './DatasourcePanelDragWrapper';
import { DatasourcePanelDndType } from './types';
interface DatasourceControl extends ControlConfig {
datasource?: DatasourceMeta;
@ -101,6 +102,10 @@ const LabelContainer = styled.div`
}
`;
const enableExploreDnd = isFeatureEnabled(
FeatureFlag.ENABLE_EXPLORE_DRAG_AND_DROP,
);
export default function DataSourcePanel({
datasource,
controls: { datasource: datasourceControl },
@ -206,12 +211,16 @@ export default function DataSourcePanel({
</div>
{metricSlice.map(m => (
<LabelContainer key={m.metric_name} className="column">
<DatasourcePanelDragWrapper
metricOrColumnName={m.metric_name}
type={DatasourcePanelDndType.METRIC}
>
{enableExploreDnd ? (
<DatasourcePanelDragWrapper
metricOrColumnName={m.metric_name}
type={DatasourcePanelDndType.METRIC}
>
<MetricOption metric={m} showType />
</DatasourcePanelDragWrapper>
) : (
<MetricOption metric={m} showType />
</DatasourcePanelDragWrapper>
)}
</LabelContainer>
))}
</Collapse.Panel>
@ -224,12 +233,16 @@ export default function DataSourcePanel({
</div>
{columnSlice.map(col => (
<LabelContainer key={col.column_name} className="column">
<DatasourcePanelDragWrapper
metricOrColumnName={col.column_name}
type={DatasourcePanelDndType.COLUMN}
>
{enableExploreDnd ? (
<DatasourcePanelDragWrapper
metricOrColumnName={col.column_name}
type={DatasourcePanelDndType.COLUMN}
>
<ColumnOption column={col} showType />
</DatasourcePanelDragWrapper>
) : (
<ColumnOption column={col} showType />
</DatasourcePanelDragWrapper>
)}
</LabelContainer>
))}
</Collapse.Panel>

19
superset-frontend/src/explore/components/DatasourcePanel/index.ts Normal file
View File

@ -0,0 +1,19 @@
/**
* 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.
*/
export { default } from './DatasourcePanel';