refactor: remove unused code (apache#8300)

CybercentreCanada · Sep 30, 2019 · f8fd064 · f8fd064
1 parent f12de2a
commit f8fd064
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 502 deletions.
diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -144,7 +144,6 @@
     "redux-undo": "^1.0.0-beta9-9-7",
     "regenerator-runtime": "^0.13.3",
     "shortid": "^2.2.6",
-    "underscore": "^1.8.3",
     "urijs": "^1.18.10"
   },
   "devDependencies": {

diff --git a/superset/assets/spec/javascripts/modules/colors_spec.jsx b/superset/assets/spec/javascripts/modules/colors_spec.jsx
diff --git a/superset/assets/spec/javascripts/modules/geo_spec.jsx b/superset/assets/spec/javascripts/modules/geo_spec.jsx
diff --git a/superset/assets/spec/javascripts/modules/sandbox_spec.jsx b/superset/assets/spec/javascripts/modules/sandbox_spec.jsx
diff --git a/superset/assets/spec/javascripts/modules/time_spec.js b/superset/assets/spec/javascripts/modules/time_spec.js
diff --git a/superset/assets/spec/javascripts/modules/utils_spec.jsx b/superset/assets/spec/javascripts/modules/utils_spec.jsx
@@ -19,7 +19,6 @@
 import {
   formatSelectOptionsForRange,
   mainMetric,
-  roundDecimal,
 } from '../../../src/modules/utils';
 
 describe('utils', () => {
@@ -66,11 +65,4 @@ describe('utils', () => {
       expect(mainMetric(metrics)).toBe('foo');
     });
   });
-  describe('roundDecimal', () => {
-    it('rounding method to limit the number of decimal digits', () => {
-      expect(roundDecimal(1.139, 2)).toBe(1.14);
-      expect(roundDecimal(1.13929, 3)).toBe(1.139);
-      expect(roundDecimal(1.13929)).toBe(1);
-    });
-  });
 });
diff --git a/superset/assets/src/explore/components/controls/ViewportControl.jsx b/superset/assets/src/explore/components/controls/ViewportControl.jsx
@@ -23,7 +23,14 @@ import { decimal2sexagesimal } from 'geolib';
 
 import TextControl from './TextControl';
 import ControlHeader from '../ControlHeader';
-import { defaultViewport } from '../../../modules/geo';
+
+export const DEFAULT_VIEWPORT = {
+  longitude: 6.85236157047845,
+  latitude: 31.222656842808707,
+  zoom: 1,
+  bearing: 0,
+  pitch: 0,
+};
 
 const PARAMS = [
   'longitude',
@@ -49,7 +56,7 @@ const propTypes = {
 const defaultProps = {
   onChange: () => {},
   default: { type: 'fix', value: 5 },
-  value: defaultViewport,
+  value: DEFAULT_VIEWPORT,
 };
 
 export default class ViewportControl extends React.Component {

diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
@@ -66,9 +66,9 @@ import {
   mainMetric,
 } from '../modules/utils';
 import * as v from './validators';
-import { defaultViewport } from '../modules/geo';
 import ColumnOption from '../components/ColumnOption';
 import OptionDescription from '../components/OptionDescription';
+import { DEFAULT_VIEWPORT } from '../explore/components/controls/ViewportControl';
 
 const categoricalSchemeRegistry = getCategoricalSchemeRegistry();
 const sequentialSchemeRegistry = getSequentialSchemeRegistry();
@@ -1866,7 +1866,7 @@ export const controls = {
     renderTrigger: false,
     description: t('Parameters related to the view and perspective on the map'),
     // default is whole world mostly centered
-    default: defaultViewport,
+    default: DEFAULT_VIEWPORT,
     // Viewport changes shouldn't prompt user to re-run query
     dontRefreshOnChange: true,
   },

diff --git a/superset/assets/src/modules/colors.js b/superset/assets/src/modules/colors.js
diff --git a/superset/assets/src/modules/geo.js b/superset/assets/src/modules/geo.js