wip

elastic · Mar 3, 2020 · 3a7cf0b · 3a7cf0b
1 parent f8c7723
commit 3a7cf0b
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 19 deletions.
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_timeseries/public/legacy_imports.ts
@@ -17,7 +17,5 @@
  * under the License.
  */
 
-// @ts-ignore
-export { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
 // @ts-ignore
 export { timezoneProvider } from 'ui/vis/lib/timezone';
diff --git a/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts b/src/legacy/core_plugins/vis_type_timeseries/public/metrics_type.ts
@@ -18,14 +18,14 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { defaultFeedbackMessage } from './legacy_imports';
 
 // @ts-ignore
 import { metricsRequestHandler } from './request_handler';
 // @ts-ignore
 import { EditorController } from './editor_controller';
 // @ts-ignore
 import { PANEL_TYPES } from '../../../../plugins/vis_type_timeseries/common/panel_types';
+import { defaultFeedbackMessage } from '../../visualizations/public';
 
 export const metricsVisDefinition = {
   name: 'metrics',

diff --git a/src/legacy/core_plugins/vis_type_vega/public/legacy_imports.ts b/src/legacy/core_plugins/vis_type_vega/public/legacy_imports.ts
@@ -17,8 +17,6 @@
  * under the License.
  */
 
-// @ts-ignore
-export { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
 // @ts-ignore
 export { KibanaMapLayer } from 'ui/vis/map/kibana_map_layer';
 // @ts-ignore

diff --git a/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts b/src/legacy/core_plugins/vis_type_vega/public/vega_type.ts
@@ -19,8 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 // @ts-ignore
-import { defaultFeedbackMessage } from './legacy_imports';
-import { Status } from '../../visualizations/public';
+import { Status, defaultFeedbackMessage } from '../../visualizations/public';
 import { DefaultEditorSize } from '../../vis_default_editor/public';
 import { VegaVisualizationDependencies } from './plugin';
 import { VegaVisEditor } from './components';

diff --git a/src/legacy/core_plugins/visualizations/public/index.ts b/src/legacy/core_plugins/visualizations/public/index.ts
@@ -17,15 +17,6 @@
  * under the License.
  */
 
-/**
- * Static legacy code which hasn't been moved to this plugin yet, but
- * should be eventually.
- *
- * @public
- */
-// @ts-ignore Used only by tsvb, vega, input control vis
-export { defaultFeedbackMessage } from 'ui/vis/default_feedback_message';
-
 /**
  * Static np-ready code, re-exported here so consumers can import from
  * `src/legacy/core_plugins/visualizations/public`

diff --git a/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts b/src/legacy/core_plugins/visualizations/public/np_ready/public/index.ts
@@ -59,3 +59,4 @@ export { buildPipeline, buildVislibDimensions, SchemaConfig } from './legacy/bui
 export { updateOldState } from './legacy/vis_update_state';
 export { calculateObjectHash } from './legacy/calculate_object_hash';
 export { createSavedVisLoader } from './saved_visualizations/saved_visualizations';
+export { defaultFeedbackMessage } from './misc/default_feedback_message';
diff --git a/.../core_plugins/visualizations/public/np_ready/public/misc/default_feedback_message.test.ts b/.../core_plugins/visualizations/public/np_ready/public/misc/default_feedback_message.test.ts
@@ -0,0 +1,26 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. 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 { defaultFeedbackMessage } from './default_feedback_message';
+
+test('default feedback message with link', () => {
+  expect(defaultFeedbackMessage).toMatchInlineSnapshot(
+    `"Have feedback? Please create an issue in <a href=\\"https://github.com/elastic/kibana/issues/new/choose\\" rel=\\"noopener noreferrer\\" target=\\"_blank\\">GitHub</a>."`
+  );
+});
diff --git a/...ui/public/vis/default_feedback_message.js → ...y/public/misc/default_feedback_message.ts b/...ui/public/vis/default_feedback_message.js → ...y/public/misc/default_feedback_message.ts
@@ -19,7 +19,7 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const defaultFeedbackMessage = i18n.translate('common.ui.vis.defaultFeedbackMessage', {
+export const defaultFeedbackMessage = i18n.translate('visualizations.defaultFeedbackMessage', {
   defaultMessage: 'Have feedback? Please create an issue in {link}.',
   values: {
     link:

diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -256,7 +256,6 @@
     "common.ui.stateManagement.unableToStoreHistoryInSessionErrorMessage": "セッションがいっぱいで安全に削除できるアイテムが見つからないため、Kibana は履歴アイテムを保存できません。\n\nこれは大抵新規タブに移動することで解決されますが、より大きな問題が原因である可能性もあります。このメッセージが定期的に表示される場合は、{gitHubIssuesUrl} で問題を報告してください。",
     "common.ui.url.replacementFailedErrorMessage": "置換に失敗、未解決の表現式: {expr}",
     "common.ui.url.savedObjectIsMissingNotificationMessage": "保存されたオブジェクトがありません",
-    "common.ui.vis.defaultFeedbackMessage": "フィードバックがありますか？{link} で問題を報告してください。",
     "common.ui.vis.kibanaMap.leaflet.fitDataBoundsAriaLabel": "データバウンドを合わせる",
     "common.ui.vis.kibanaMap.zoomWarning": "ズームレベルが最大に達しました。完全にズームインするには、Elasticsearch と Kibana の {defaultDistribution} にアップグレードしてください。{ems} でより多くのズームレベルが利用できます。または、独自のマップサーバーを構成できます。詳細は { wms } または { configSettings} をご覧ください。",
     "data.search.aggs.aggGroups.bucketsText": "バケット",
@@ -2852,6 +2851,7 @@
     "timelion.vis.intervalLabel": "間隔",
     "uiActions.actionPanel.title": "オプション",
     "uiActions.errors.incompatibleAction": "操作に互換性がありません",
+    "visualizations.defaultFeedbackMessage": "フィードバックがありますか？{link} で問題を報告してください。",
     "visualizations.newVisWizard.betaDescription": "このビジュアライゼーションはベータ段階で、変更される可能性があります。デザインとコードはオフィシャル GA 機能よりも完成度が低く、現状のまま保証なしで提供されています。ベータ機能にはオフィシャル GA 機能の SLA が適用されません",
     "visualizations.newVisWizard.betaTitle": "ベータ",
     "visualizations.newVisWizard.chooseSourceTitle": "ソースの選択",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -256,7 +256,6 @@
     "common.ui.stateManagement.unableToStoreHistoryInSessionErrorMessage": "Kibana 无法将历史记录项存储在您的会话中，因为其已满，并且似乎没有任何可安全删除的项。\n\n通常可通过移至新的标签页来解决此问题，但这会导致更大的问题。如果您有规律地看到此消息，请在 {gitHubIssuesUrl} 提交问题。",
     "common.ui.url.replacementFailedErrorMessage": "替换失败，未解析的表达式：{expr}",
     "common.ui.url.savedObjectIsMissingNotificationMessage": "已保存对象缺失",
-    "common.ui.vis.defaultFeedbackMessage": "想反馈？请在“{link}中创建问题。",
     "common.ui.vis.kibanaMap.leaflet.fitDataBoundsAriaLabel": "适应数据边界",
     "common.ui.vis.kibanaMap.zoomWarning": "已达到缩放级别最大数目。要一直放大，请升级到 Elasticsearch 和 Kibana 的 {defaultDistribution}。您可以通过 {ems} 免费使用其他缩放级别。或者，您可以配置自己的地图服务器。请前往 { wms } 或 { configSettings} 以获取详细信息。",
     "data.search.aggs.aggGroups.bucketsText": "存储桶",
@@ -2853,6 +2852,7 @@
     "timelion.vis.intervalLabel": "时间间隔",
     "uiActions.actionPanel.title": "选项",
     "uiActions.errors.incompatibleAction": "操作不兼容",
+    "visualizations.defaultFeedbackMessage": "想反馈？请在“{link}中创建问题。",
     "visualizations.newVisWizard.betaDescription": "此可视化为公测版，可能会进行更改。设计和代码相对于正式发行版功能还不够成熟，将按原样提供，且不提供任何保证。公测版功能不受正式发行版功能支持 SLA 的约束",
     "visualizations.newVisWizard.betaTitle": "公测版",
     "visualizations.newVisWizard.chooseSourceTitle": "选择源",