Migrate timepicker:timeDefaults ui setting to the data plugin. (#73750)

elastic · Aug 3, 2020 · 06412ae · 06412ae
1 parent 6049425
commit 06412ae
Show file tree

Hide file tree

Showing 10 changed files with 29 additions and 25 deletions.
diff --git a/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js b/src/legacy/core_plugins/kibana/server/ui_setting_defaults.js
@@ -258,20 +258,6 @@ export function getUiSettingDefaults() {
           'The maximum height that a cell in a table should occupy. Set to 0 to disable truncation',
       }),
     },
-    'timepicker:timeDefaults': {
-      name: i18n.translate('kbn.advancedSettings.timepicker.timeDefaultsTitle', {
-        defaultMessage: 'Time filter defaults',
-      }),
-      value: `{
-  "from": "now-15m",
-  "to": "now"
-}`,
-      type: 'json',
-      description: i18n.translate('kbn.advancedSettings.timepicker.timeDefaultsText', {
-        defaultMessage: 'The timefilter selection to use when Kibana is started without one',
-      }),
-      requiresPageReload: true,
-    },
     'theme:darkMode': {
       name: i18n.translate('kbn.advancedSettings.darkModeTitle', {
         defaultMessage: 'Dark mode',

diff --git a/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts b/src/plugins/data/public/query/state_sync/connect_to_query_state.test.ts
@@ -50,7 +50,7 @@ setupMock.uiSettings.get.mockImplementation((key: string) => {
       return true;
     case UI_SETTINGS.SEARCH_QUERY_LANGUAGE:
       return 'kuery';
-    case 'timepicker:timeDefaults':
+    case UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS:
       return { from: 'now-15m', to: 'now' };
     case UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS:
       return { pause: false, value: 0 };

diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.ts b/src/plugins/data/public/query/timefilter/timefilter_service.ts
@@ -35,7 +35,7 @@ export interface TimeFilterServiceDependencies {
 export class TimefilterService {
   public setup({ uiSettings, storage }: TimeFilterServiceDependencies): TimefilterSetup {
     const timefilterConfig = {
-      timeDefaults: uiSettings.get('timepicker:timeDefaults'),
+      timeDefaults: uiSettings.get(UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS),
       refreshIntervalDefaults: uiSettings.get(UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS),
     };
     const history = new TimeHistory(storage);

diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.test.tsx
@@ -51,7 +51,7 @@ startMock.uiSettings.get.mockImplementation((key: string) => {
       return 'MMM D, YYYY @ HH:mm:ss.SSS';
     case UI_SETTINGS.HISTORY_LIMIT:
       return 10;
-    case 'timepicker:timeDefaults':
+    case UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS:
       return {
         from: 'now-15m',
         to: 'now',

diff --git a/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx b/src/plugins/data/public/ui/query_string_input/query_bar_top_row.tsx
@@ -94,7 +94,7 @@ export function QueryBarTopRow(props: Props) {
   }
 
   function getDateRange() {
-    const defaultTimeSetting = uiSettings!.get('timepicker:timeDefaults');
+    const defaultTimeSetting = uiSettings!.get(UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS);
     return {
       from: props.dateRangeFrom || defaultTimeSetting.from,
       to: props.dateRangeTo || defaultTimeSetting.to,

diff --git a/src/plugins/data/server/ui_settings.ts b/src/plugins/data/server/ui_settings.ts
@@ -526,6 +526,24 @@ export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
         value: schema.number(),
       }),
     },
+    [UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS]: {
+      name: i18n.translate('data.advancedSettings.timepicker.timeDefaultsTitle', {
+        defaultMessage: 'Time filter defaults',
+      }),
+      value: `{
+  "from": "now-15m",
+  "to": "now"
+}`,
+      type: 'json',
+      description: i18n.translate('data.advancedSettings.timepicker.timeDefaultsText', {
+        defaultMessage: 'The timefilter selection to use when Kibana is started without one',
+      }),
+      requiresPageReload: true,
+      schema: schema.object({
+        from: schema.string(),
+        to: schema.string(),
+      }),
+    },
     [UI_SETTINGS.TIMEPICKER_QUICK_RANGES]: {
       name: i18n.translate('data.advancedSettings.timepicker.quickRangesTitle', {
         defaultMessage: 'Time filter quick ranges',

diff --git a/x-pack/plugins/lens/public/app_plugin/app.test.tsx b/x-pack/plugins/lens/public/app_plugin/app.test.tsx
@@ -196,7 +196,7 @@ describe('Lens App', () => {
 
     core.uiSettings.get.mockImplementation(
       jest.fn((type) => {
-        if (type === 'timepicker:timeDefaults') {
+        if (type === UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS) {
           return { from: 'now-7d', to: 'now' };
         } else if (type === UI_SETTINGS.SEARCH_QUERY_LANGUAGE) {
           return 'kuery';

diff --git a/x-pack/plugins/monitoring/public/plugin.ts b/x-pack/plugins/monitoring/public/plugin.ts
@@ -128,7 +128,7 @@ export class MonitoringPlugin
       UI_SETTINGS.TIMEPICKER_REFRESH_INTERVAL_DEFAULTS,
       JSON.stringify(refreshInterval)
     );
-    uiSettings.overrideLocalDefault('timepicker:timeDefaults', JSON.stringify(time));
+    uiSettings.overrideLocalDefault(UI_SETTINGS.TIMEPICKER_TIME_DEFAULTS, JSON.stringify(time));
   }
 
   private getExternalConfig() {

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -698,6 +698,8 @@
     "data.advancedSettings.timepicker.refreshIntervalDefaultsText": "時間フィルターのデフォルト更新間隔「値」はミリ秒で指定する必要があります。",
     "data.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "タイムピッカーの更新間隔",
     "data.advancedSettings.timepicker.thisWeek": "今週",
+    "data.advancedSettings.timepicker.timeDefaultsText": "時間フィルターが選択されずに Kibana が起動した際に使用される時間フィルターです",
+    "data.advancedSettings.timepicker.timeDefaultsTitle": "デフォルトのタイムピッカー",
     "data.advancedSettings.timepicker.today": "今日",
     "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} と {lt} {to}",
     "data.common.kql.errors.endOfInputText": "インプットの終わり",
@@ -2791,8 +2793,6 @@
     "kbn.advancedSettings.storeUrlTitle": "セッションストレージに URL を格納",
     "kbn.advancedSettings.themeVersionText": "現在のバージョンと次のバージョンのKibanaで使用されるテーマを切り替えます。この設定を適用するにはページの更新が必要です。",
     "kbn.advancedSettings.themeVersionTitle": "テーマバージョン",
-    "kbn.advancedSettings.timepicker.timeDefaultsText": "時間フィルターが選択されずに Kibana が起動した際に使用される時間フィルターです",
-    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "デフォルトのタイムピッカー",
     "kbn.advancedSettings.visualization.showRegionMapWarningsText": "用語がマップの形に合わない場合に地域マップに警告を表示するかどうかです。",
     "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "地域マップに警告を表示",
     "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "ディメンションの説明",
@@ -19304,7 +19304,7 @@
     "xpack.watcher.models.baseAction.simulateMessage": "アクション {id} のシミュレーションが完了しました",
     "xpack.watcher.models.baseAction.typeName": "アクション",
     "xpack.watcher.models.baseWatch.createUnknownActionTypeErrorMessage": "不明なアクションタイプ {type} を作成しようとしました。",
-      "xpack.watcher.models.baseWatch.idPropertyMissingBadRequestMessage": "json 引数には {id} プロパティが含まれている必要があります",
+    "xpack.watcher.models.baseWatch.idPropertyMissingBadRequestMessage": "json 引数には {id} プロパティが含まれている必要があります",
     "xpack.watcher.models.baseWatch.selectMessageText": "新規ウォッチをセットアップします。",
     "xpack.watcher.models.baseWatch.typeName": "ウォッチ",
     "xpack.watcher.models.baseWatch.watchJsonPropertyMissingBadRequestMessage": "json 引数には {watchJson} プロパティが含まれている必要があります",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -698,6 +698,8 @@
     "data.advancedSettings.timepicker.refreshIntervalDefaultsText": "时间筛选的默认刷新时间间隔。需要使用毫秒单位指定“值”。",
     "data.advancedSettings.timepicker.refreshIntervalDefaultsTitle": "时间筛选刷新时间间隔",
     "data.advancedSettings.timepicker.thisWeek": "本周",
+    "data.advancedSettings.timepicker.timeDefaultsText": "未使用时间筛选启动 Kibana 时要使用的时间筛选选择",
+    "data.advancedSettings.timepicker.timeDefaultsTitle": "时间筛选默认值",
     "data.advancedSettings.timepicker.today": "今日",
     "data.aggTypes.buckets.ranges.rangesFormatMessage": "{gte} {from} 和 {lt} {to}",
     "data.common.kql.errors.endOfInputText": "输入结束",
@@ -2792,8 +2794,6 @@
     "kbn.advancedSettings.storeUrlTitle": "将 URL 存储在会话存储中",
     "kbn.advancedSettings.themeVersionText": "在用于 Kibana 当前和下一版本的主题间切换。需要刷新页面，才能应用设置。",
     "kbn.advancedSettings.themeVersionTitle": "主题版本",
-    "kbn.advancedSettings.timepicker.timeDefaultsText": "未使用时间筛选启动 Kibana 时要使用的时间筛选选择",
-    "kbn.advancedSettings.timepicker.timeDefaultsTitle": "时间筛选默认值",
     "kbn.advancedSettings.visualization.showRegionMapWarningsText": "词无法联接到地图上的形状时，区域地图是否显示警告。",
     "kbn.advancedSettings.visualization.showRegionMapWarningsTitle": "显示区域地图警告",
     "kbn.advancedSettings.visualization.tileMap.maxPrecision.cellDimensionsLinkText": "单元格维度的解释",