diff --git a/frontend/src/metabase/admin/datamodel/components/FieldRemapping.jsx b/frontend/src/metabase/admin/datamodel/components/FieldRemapping.jsx index 33db665863de718f23e1fce3a8313c5ba471297d..678dd6db7804210cada0c1a94f6f399c3a90f28f 100644 --- a/frontend/src/metabase/admin/datamodel/components/FieldRemapping.jsx +++ b/frontend/src/metabase/admin/datamodel/components/FieldRemapping.jsx @@ -402,7 +402,7 @@ export class ValueRemappings extends React.Component { } } -class FieldValueMapping extends React.Component { +export class FieldValueMapping extends React.Component { onInputChange = e => { this.props.setMapping(e.target.value); }; diff --git a/frontend/test/admin/datamodel/FieldApp.integ.spec.js b/frontend/test/admin/datamodel/FieldApp.integ.spec.js index 5e71db09e06106e3d9d81cfc5c376dc70b702b55..9e667af0cfc6065518fc471621a06f9e6b99dbb7 100644 --- a/frontend/test/admin/datamodel/FieldApp.integ.spec.js +++ b/frontend/test/admin/datamodel/FieldApp.integ.spec.js @@ -30,11 +30,12 @@ import { FETCH_IDFIELDS } from "metabase/admin/datamodel/datamodel"; import { delay } from "metabase/lib/promise"; import FieldApp, { FieldHeader, - FieldRemapping, - FieldValueMapping, +} from "metabase/admin/datamodel/containers/FieldApp"; +import FieldRemapping, { RemappingNamingTip, ValueRemappings, -} from "metabase/admin/datamodel/containers/FieldApp"; + FieldValueMapping, +} from "metabase/admin/datamodel/components/FieldRemapping"; import InputBlurChange from "metabase/components/InputBlurChange"; import { FieldVisibilityPicker, diff --git a/frontend/test/services/__snapshots__/MetabaseApi.integ.spec.js.snap b/frontend/test/services/__snapshots__/MetabaseApi.integ.spec.js.snap index 2b07502c1e721d33271a72dadfd8008cde997fb6..e65211aab3793976c03141209534d19e34b21230 100644 --- a/frontend/test/services/__snapshots__/MetabaseApi.integ.spec.js.snap +++ b/frontend/test/services/__snapshots__/MetabaseApi.integ.spec.js.snap @@ -429,12 +429,12 @@ Object { }, "type": Object { "type/DateTime": Object { - "earliest": "2016-04-30T07:00:00.000Z", - "latest": "2020-04-19T07:00:00.000Z", + "earliest": "2016-04-30T00:00:00.000-07:00", + "latest": "2020-04-19T00:00:00.000-07:00", }, }, }, - "fingerprint_version": 3, + "fingerprint_version": 2, "fk_target_field_id": null, "has_field_values": "none", "id": 1, @@ -445,6 +445,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/CreationTimestamp", "table_id": 1, "target": null, @@ -536,6 +537,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Discount", "table_id": 1, "target": null, @@ -574,6 +576,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 1, "target": null, @@ -612,6 +615,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/FK", "table_id": 1, "target": Object { @@ -644,6 +648,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 3, "visibility_type": "normal", @@ -736,6 +741,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Quantity", "table_id": 1, "target": null, @@ -827,6 +833,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 1, "target": null, @@ -918,6 +925,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 1, "target": null, @@ -1009,6 +1017,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Income", "table_id": 1, "target": null, @@ -1047,6 +1056,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/FK", "table_id": 1, "target": Object { @@ -1079,6 +1089,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 2, "visibility_type": "normal", @@ -1401,6 +1412,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 2, "target": null, @@ -1566,12 +1578,12 @@ Object { }, "type": Object { "type/DateTime": Object { - "earliest": "1958-04-26T08:00:00.000Z", - "latest": "2000-04-03T07:00:00.000Z", + "earliest": "1958-04-26T00:00:00.000-08:00", + "latest": "2000-04-03T00:00:00.000-07:00", }, }, }, - "fingerprint_version": 3, + "fingerprint_version": 2, "fk_target_field_id": null, "has_field_values": "none", "id": 9, @@ -1582,6 +1594,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 2, "target": null, @@ -1621,6 +1634,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/City", "table_id": 2, "target": null, @@ -1786,12 +1800,12 @@ Object { }, "type": Object { "type/DateTime": Object { - "earliest": "2016-04-19T07:00:00.000Z", - "latest": "2019-04-19T07:00:00.000Z", + "earliest": "2016-04-19T00:00:00.000-07:00", + "latest": "2019-04-19T00:00:00.000-07:00", }, }, }, - "fingerprint_version": 3, + "fingerprint_version": 2, "fk_target_field_id": null, "has_field_values": "none", "id": 11, @@ -1802,6 +1816,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/CreationTimestamp", "table_id": 2, "target": null, @@ -1841,6 +1856,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Email", "table_id": 2, "target": null, @@ -1879,6 +1895,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 2, "target": null, @@ -1980,6 +1997,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Latitude", "table_id": 2, "target": null, @@ -2081,6 +2099,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Longitude", "table_id": 2, "target": null, @@ -2120,6 +2139,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Name", "table_id": 2, "target": null, @@ -2159,6 +2179,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 2, "target": null, @@ -2198,6 +2219,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Source", "table_id": 2, "target": null, @@ -2237,6 +2259,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/State", "table_id": 2, "target": null, @@ -2276,6 +2299,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/ZipCode", "table_id": 2, "target": null, @@ -2597,6 +2621,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Category", "table_id": 3, "target": null, @@ -2762,12 +2787,12 @@ Object { }, "type": Object { "type/DateTime": Object { - "earliest": "2016-04-26T07:00:00.000Z", - "latest": "2019-04-15T07:00:00.000Z", + "earliest": "2016-04-26T00:00:00.000-07:00", + "latest": "2019-04-15T00:00:00.000-07:00", }, }, }, - "fingerprint_version": 3, + "fingerprint_version": 2, "fk_target_field_id": null, "has_field_values": "none", "id": 22, @@ -2778,6 +2803,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/CreationTimestamp", "table_id": 3, "target": null, @@ -2817,6 +2843,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 3, "target": null, @@ -2855,6 +2882,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 3, "target": null, @@ -2946,6 +2974,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 3, "target": null, @@ -3037,6 +3066,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Score", "table_id": 3, "target": null, @@ -3076,6 +3106,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Title", "table_id": 3, "target": null, @@ -3115,6 +3146,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Company", "table_id": 3, "target": null, @@ -3436,6 +3468,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": false, + "settings": null, "special_type": "type/Description", "table_id": 4, "target": null, @@ -3601,12 +3634,12 @@ Object { }, "type": Object { "type/DateTime": Object { - "earliest": "2016-06-03T07:00:00.000Z", - "latest": "2020-04-19T07:00:00.000Z", + "earliest": "2016-06-03T00:00:00.000-07:00", + "latest": "2020-04-19T00:00:00.000-07:00", }, }, }, - "fingerprint_version": 3, + "fingerprint_version": 2, "fk_target_field_id": null, "has_field_values": "none", "id": 30, @@ -3617,6 +3650,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/CreationTimestamp", "table_id": 4, "target": null, @@ -3655,6 +3689,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 4, "target": null, @@ -3693,6 +3728,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/FK", "table_id": 4, "target": Object { @@ -3725,6 +3761,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/PK", "table_id": 3, "visibility_type": "normal", @@ -3817,6 +3854,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": "type/Score", "table_id": 4, "target": null, @@ -3856,6 +3894,7 @@ Object { "points_of_interest": null, "position": 0, "preview_display": true, + "settings": null, "special_type": null, "table_id": 4, "target": null, diff --git a/frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js b/frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js index cce9bb459370a4723edbfa1bb09b26ace6b392c7..a4086e819e8817d2f69920f1f2682e8bc79f58ab 100644 --- a/frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js +++ b/frontend/test/visualizations/components/LineAreaBarRenderer-scatter.unit.spec.js @@ -1,7 +1,5 @@ import "__support__/mocks"; // included explicitly whereas with integrated tests it comes with __support__/integrated_tests -import lineAreaBarRenderer from "metabase/visualizations/lib/LineAreaBarRenderer"; - import { NumberColumn, dispatchUIEvent,