This is an automated email from the ASF dual-hosted git repository.
rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new 1a775e2 feat: markupchart plugin controls migration (#9806)
1a775e2 is described below
commit 1a775e26124fb97c96c4872492819722f1123400
Author: Phillip Kelley-Dotson <pkelleydot...@yahoo.com>
AuthorDate: Tue May 19 23:04:20 2020 -0700
feat: markupchart plugin controls migration (#9806)
* remove shims and controls
* update chart version
Co-authored-by: Phillip Kelley-Dotson <p...@pkd.lan>
---
superset-frontend/package-lock.json | 6 +-
superset-frontend/package.json | 2 +-
.../src/explore/controlPanels/Markup.js | 71 ----------------------
superset-frontend/src/setup/setupPlugins.ts | 2 -
4 files changed, 4 insertions(+), 77 deletions(-)
diff --git a/superset-frontend/package-lock.json
b/superset-frontend/package-lock.json
index 9f8653b..a75792a 100644
--- a/superset-frontend/package-lock.json
+++ b/superset-frontend/package-lock.json
@@ -6803,9 +6803,9 @@
}
},
"@superset-ui/legacy-plugin-chart-markup": {
- "version": "0.13.3",
- "resolved":
"https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.13.3.tgz";,
- "integrity":
"sha512-Rj5A/pKZksAEQ91Nffgg7/DXC0ZfrIbTiiRPrs2SEVL92hb9VwFP8JX/7iHuI1RQYAeTMWl514LSDxhIUXNCwg==",
+ "version": "0.13.12",
+ "resolved":
"https://registry.npmjs.org/@superset-ui/legacy-plugin-chart-markup/-/legacy-plugin-chart-markup-0.13.12.tgz";,
+ "integrity":
"sha512-WROR27CuofVsmqACQSNq/m5kTqVJnGg0TVeK6vMgFOdaud+OPdOoN2scQM0FqsC1/pN+whDqy4TJwK3XeuOr2g==",
"requires": {
"prop-types": "^15.6.2"
}
diff --git a/superset-frontend/package.json b/superset-frontend/package.json
index c41c506..f62bb7e 100644
--- a/superset-frontend/package.json
+++ b/superset-frontend/package.json
@@ -76,7 +76,7 @@
"@superset-ui/legacy-plugin-chart-horizon": "^0.13.5",
"@superset-ui/legacy-plugin-chart-iframe": "^0.13.3",
"@superset-ui/legacy-plugin-chart-map-box": "^0.13.5",
- "@superset-ui/legacy-plugin-chart-markup": "^0.13.3",
+ "@superset-ui/legacy-plugin-chart-markup": "^0.13.12",
"@superset-ui/legacy-plugin-chart-paired-t-test": "^0.13.5",
"@superset-ui/legacy-plugin-chart-parallel-coordinates": "^0.13.3",
"@superset-ui/legacy-plugin-chart-partition": "^0.13.11",
diff --git a/superset-frontend/src/explore/controlPanels/Markup.js
b/superset-frontend/src/explore/controlPanels/Markup.js
deleted file mode 100644
index 1f7182a..0000000
--- a/superset-frontend/src/explore/controlPanels/Markup.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * 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.
- */
-import { t } from '@superset-ui/translation';
-import { validateNonEmpty } from '@superset-ui/validator';
-import { formatSelectOptions } from '../../modules/utils';
-
-export default {
- controlPanelSections: [
- {
- label: t('Code'),
- expanded: true,
- controlSetRows: [
- [
- {
- name: 'markup_type',
- config: {
- type: 'SelectControl',
- label: t('Markup Type'),
- clearable: false,
- choices: formatSelectOptions(['markdown', 'html']),
- default: 'markdown',
- validators: [validateNonEmpty],
- description: t('Pick your favorite markup language'),
- },
- },
- ],
- [
- {
- name: 'code',
- config: {
- type: 'TextAreaControl',
- label: t('Code'),
- description: t('Put your code here'),
- mapStateToProps: state => ({
- language:
- state.controls && state.controls.markup_type
- ? state.controls.markup_type.value
- : 'markdown',
- }),
- default: '',
- },
- },
- ],
- ],
- },
- ],
- sectionOverrides: {
- druidTimeSeries: {
- controlSetRows: [],
- },
- sqlaTimeSeries: {
- controlSetRows: [],
- },
- },
-};
diff --git a/superset-frontend/src/setup/setupPlugins.ts
b/superset-frontend/src/setup/setupPlugins.ts
index b98e8c9..45094b4 100644
--- a/superset-frontend/src/setup/setupPlugins.ts
+++ b/superset-frontend/src/setup/setupPlugins.ts
@@ -38,7 +38,6 @@ import Histogram from '../explore/controlPanels/Histogram';
import Horizon from '../explore/controlPanels/Horizon';
import Iframe from '../explore/controlPanels/Iframe';
import Mapbox from '../explore/controlPanels/Mapbox';
-import Markup from '../explore/controlPanels/Markup';
import PairedTtest from '../explore/controlPanels/PairedTtest';
import Para from '../explore/controlPanels/Para';
import Separator from '../explore/controlPanels/Separator';
@@ -59,7 +58,6 @@ export default function setupPlugins() {
.registerValue('horizon', Horizon)
.registerValue('iframe', Iframe)
.registerValue('mapbox', Mapbox)
- .registerValue('markup', Markup)
.registerValue('paired_ttest', PairedTtest)
.registerValue('para', Para)
.registerValue('separator', Separator)
