From 91e1c310be6ead51ac61f60591883051ad67ab27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Arroyo=20Torrens?= Date: Wed, 31 Mar 2021 07:33:23 +0200 Subject: [PATCH] Fix linter --- .eslintrc.json | 3 +- .../editor-3/_data-observatory-form.scss | 38 ------------------- .../editor-3/_data-observatory-form.scss | 38 ------------------- .../javascripts/builder/data/analyses.js | 9 ----- .../analyses-quota-options.spec.js | 4 -- 5 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 app/assets/stylesheets/editor-3/_data-observatory-form.scss delete mode 100644 assets/stylesheets/editor-3/_data-observatory-form.scss diff --git a/.eslintrc.json b/.eslintrc.json index 7a9f079742..8683665610 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -22,6 +22,7 @@ "camelcase": "off", "no-mixed-operators": "off", "no-useless-escape": "off", - "prefer-promise-reject-errors": "off" + "prefer-promise-reject-errors": "off", + "padded-blocks": "off" } } diff --git a/app/assets/stylesheets/editor-3/_data-observatory-form.scss b/app/assets/stylesheets/editor-3/_data-observatory-form.scss deleted file mode 100644 index 453b329074..0000000000 --- a/app/assets/stylesheets/editor-3/_data-observatory-form.scss +++ /dev/null @@ -1,38 +0,0 @@ -@import 'cdb-variables/colors'; - -.DataObservatory-addMeasure { - width: 100%; -} - -.DataObservatory-description { - word-wrap: break-word; - word-break: break-word; - hyphens: auto; -} - -.DataObservatory-addMeasure .is-disabled { - opacity: 0.5; - cursor: not-allowed; -} - -.DataObservatory-license { - white-space: normal; -} - -.DataObservatory-count { - padding: 8px 16px; - border-bottom: 1px solid $cMainLine; -} - -.Measurement { - margin: 0 -24px; - padding: 0 24px; -} - -.Measurement + .Measurement { - margin-top: 32px; -} - -.Measurements { - margin-bottom: 32px; -} diff --git a/assets/stylesheets/editor-3/_data-observatory-form.scss b/assets/stylesheets/editor-3/_data-observatory-form.scss deleted file mode 100644 index 862ccb0d42..0000000000 --- a/assets/stylesheets/editor-3/_data-observatory-form.scss +++ /dev/null @@ -1,38 +0,0 @@ -@import '~cartoassets/src/scss/cdb-variables/colors'; - -.DataObservatory-addMeasure { - width: 100%; -} - -.DataObservatory-description { - word-wrap: break-word; - word-break: break-word; - hyphens: auto; -} - -.DataObservatory-addMeasure .is-disabled { - opacity: 0.5; - cursor: not-allowed; -} - -.DataObservatory-license { - white-space: normal; -} - -.DataObservatory-count { - padding: 8px 16px; - border-bottom: 1px solid $cMainLine; -} - -.Measurement { - margin: 0 -24px; - padding: 0 24px; -} - -.Measurement + .Measurement { - margin-top: 32px; -} - -.Measurements { - margin-bottom: 32px; -} diff --git a/lib/assets/javascripts/builder/data/analyses.js b/lib/assets/javascripts/builder/data/analyses.js index ef19395527..2b96ac60a0 100644 --- a/lib/assets/javascripts/builder/data/analyses.js +++ b/lib/assets/javascripts/builder/data/analyses.js @@ -9,10 +9,6 @@ var MergeAnalysisOptionModel = require('builder/components/modals/add-analysis/a var DeprecatedSQLFunctionOptionModel = require('builder/components/modals/add-analysis/analysis-option-models/deprecated-sql-function-option-model'); var DataServicesApiCheck = require('builder/editor/layers/layer-content-views/analyses/analyses-quota/analyses-quota-info'); -var DAO_TYPES = ['age-and-gender', 'boundaries', 'education', 'employment', 'families', 'housing', 'income', 'language', 'migration', 'nationality', 'population-segments', 'race-and-ethnicity', 'religion', 'transportation']; - -var DO_DEPRECATION_WARNING_DATE = '2021-02-09'; - var MAP = { 'aggregate-intersection': { title: _t('analyses.aggregate-intersection.title'), @@ -385,11 +381,6 @@ var checkIfExternalGeocodingIsEnabled = function (options) { return isDataServicesReady(options.configModel) && !!options.configModel.dataServiceEnabled('hires_geocoder'); }; -var checkIfDataObservatoryIsEnabled = function (options) { - if (!options.configModel) throw new Error('configModel is required'); - return isDataServicesReady(options.configModel) && !!options.configModel.dataServiceEnabled('data_observatory'); -}; - var definitionByType = function (m) { var type = 'unknown'; diff --git a/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js index 5212dbaecd..d430d00ffc 100644 --- a/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js +++ b/lib/assets/test/spec/builder/editor/layers/layer-content-view/analyses/analyses-quota/analyses-quota-options.spec.js @@ -74,10 +74,6 @@ describe('editor/layers/layer-content-views/analyses/analyses-quota/analyses-quo }); it('should return same input for analysis with quota', function () { - var formModel = new Backbone.Model({ - measurements: [1, 2] - }); - expect(AnalysesQuotaOptions.transformInput('georeference-street-address', 20, {})).toBe(20); });