Moved pager and pager control directives to doc_table (elastic#39975)

* Moved pager and pager contrlol directives to doc_table * translation fix
lizozom · Jul 1, 2019 · b91cd0d · b91cd0d
1 parent e801a00
commit b91cd0d
Show file tree

Hide file tree

Showing 13 changed files with 8 additions and 8 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.js b/src/legacy/core_plugins/kibana/public/discover/doc_table/doc_table.js
@@ -26,8 +26,8 @@ import './components/table_header';
 import './components/table_row';
 import { dispatchRenderComplete } from 'ui/render_complete';
 import { uiModules } from 'ui/modules';
-import 'ui/pager_control';
-import 'ui/pager';
+import './pager_control';
+import './pager';
 import { getRequestInspectorStats, getResponseInspectorStats } from 'ui/courier/utils/courier_inspector_utils';
 import { toastNotifications } from 'ui/notify';
 

diff --git a/src/legacy/ui/public/pager/index.js → .../public/discover/doc_table/pager/index.js b/src/legacy/ui/public/pager/index.js → .../public/discover/doc_table/pager/index.js
diff --git a/src/legacy/ui/public/pager/pager.js → .../public/discover/doc_table/pager/pager.js b/src/legacy/ui/public/pager/pager.js → .../public/discover/doc_table/pager/pager.js
diff --git a/src/legacy/ui/public/pager/pager_factory.js → ...discover/doc_table/pager/pager_factory.js b/src/legacy/ui/public/pager/pager_factory.js → ...discover/doc_table/pager/pager_factory.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { uiModules } from '../modules';
+import { uiModules } from 'ui/modules';
 import { Pager } from './pager';
 
 const app = uiModules.get('kibana');

diff --git a/...omponents/tool_bar_pager_buttons/index.js → ...omponents/tool_bar_pager_buttons/index.js b/...omponents/tool_bar_pager_buttons/index.js → ...omponents/tool_bar_pager_buttons/index.js
diff --git a/...pager_buttons/tool_bar_pager_buttons.html → ...pager_buttons/tool_bar_pager_buttons.html b/...pager_buttons/tool_bar_pager_buttons.html → ...pager_buttons/tool_bar_pager_buttons.html
diff --git a/...r_pager_buttons/tool_bar_pager_buttons.js → ...r_pager_buttons/tool_bar_pager_buttons.js b/...r_pager_buttons/tool_bar_pager_buttons.js → ...r_pager_buttons/tool_bar_pager_buttons.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { uiModules } from '../../../modules';
+import { uiModules } from 'ui/modules';
 import template from './tool_bar_pager_buttons.html';
 
 const app = uiModules.get('kibana');

diff --git a/...l/components/tool_bar_pager_text/index.js → ...l/components/tool_bar_pager_text/index.js b/...l/components/tool_bar_pager_text/index.js → ...l/components/tool_bar_pager_text/index.js
diff --git a/...l_bar_pager_text/tool_bar_pager_text.html → ...l_bar_pager_text/tool_bar_pager_text.html b/...l_bar_pager_text/tool_bar_pager_text.html → ...l_bar_pager_text/tool_bar_pager_text.html
@@ -1,6 +1,6 @@
 <div class="kuiToolBarText" data-test-subj="toolBarPagerText">
   <span
-    i18n-id="common.ui.pagerControl.pagesCountLabel"
+    i18n-id="kbn.docTable.pagerControl.pagesCountLabel"
     i18n-default-message="{startItem}&ndash;{endItem} of {totalItems}"
     i18n-values="{
       startItem: (toolBarPagerText.startItem | number),

diff --git a/...ool_bar_pager_text/tool_bar_pager_text.js → ...ool_bar_pager_text/tool_bar_pager_text.js b/...ool_bar_pager_text/tool_bar_pager_text.js → ...ool_bar_pager_text/tool_bar_pager_text.js
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { uiModules } from '../../../modules';
+import { uiModules } from 'ui/modules';
 import template from './tool_bar_pager_text.html';
 
 const app = uiModules.get('kibana');

diff --git a/src/legacy/ui/public/pager_control/index.js → ...discover/doc_table/pager_control/index.js b/src/legacy/ui/public/pager_control/index.js → ...discover/doc_table/pager_control/index.js
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
@@ -486,7 +486,6 @@
     "common.ui.notify.toaster.stopCountdownButtonTooltip": "停止",
     "common.ui.notify.toaster.timeRemainingInSecondsLabel": "{timeRemaining}s",
     "common.ui.notify.toaster.unavailableServerErrorMessage": "HTTP リクエストが接続に失敗しました。Kibana サーバーが実行されていて、ご使用のブラウザの接続が正常に動作していることを確認するか、システム管理者にお問い合わせください。",
-    "common.ui.pagerControl.pagesCountLabel": "{startItem} – {endItem} / {totalItems}",
     "common.ui.paginateControls.pageSizeLabel": "ページサイズ",
     "common.ui.paginateControls.scrollTopButtonLabel": "最上部に移動",
     "common.ui.paginateSelectableList.noMatchesFoundDescription": "位置する結果がありません。",
@@ -1479,6 +1478,7 @@
     "kbn.docTable.inspectorRequestDescription": "このリクエストは Elasticsearch にクエリをかけ、検索データを取得します。",
     "kbn.docTable.limitedSearchResultLabel": "{resultCount} 件の結果に制限。検索結果の絞り込み。",
     "kbn.docTable.noResultsTitle": "結果が見つかりませんでした",
+    "kbn.docTable.pagerControl.pagesCountLabel": "{startItem} – {endItem} / {totalItems}",
     "kbn.docTable.tableHeader.moveColumnLeftButtonAriaLabel": "{columnName} 列を左に移動",
     "kbn.docTable.tableHeader.moveColumnLeftButtonTooltip": "列を左に移動",
     "kbn.docTable.tableHeader.moveColumnRightButtonAriaLabel": "{columnName} 列を右に移動",

diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
@@ -9714,4 +9714,4 @@
     "xpack.watcher.watchActions.logging.logTextIsRequiredValidationMessage": "“日志文本”必填。",
     "xpack.watcher.watcherDescription": "通过创建、管理和监测警报来检测数据中的更改。"
   }
-}
+}