Skip to content

Commit b3cdb70

Browse files
Aaron Caldwellkibanamachine
andauthored
[Maps] Show empty list when all saved maps in list deleted (#95126) (#96010)
Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com> Co-authored-by: Kibana Machine <42973632+kibanamachine@users.noreply.github.com>
1 parent 109c9be commit b3cdb70

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

src/plugins/kibana_react/public/table_list_view/table_list_view.tsx

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -347,20 +347,6 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
347347
}
348348
}
349349

350-
renderNoItemsMessage() {
351-
if (this.props.noItemsFragment) {
352-
return this.props.noItemsFragment;
353-
} else {
354-
return (
355-
<FormattedMessage
356-
id="kibana-react.tableListView.listing.noAvailableItemsMessage"
357-
defaultMessage="No {entityNamePlural} available."
358-
values={{ entityNamePlural: this.props.entityNamePlural }}
359-
/>
360-
);
361-
}
362-
}
363-
364350
renderToolsLeft() {
365351
const selection = this.state.selectedIds;
366352

@@ -473,10 +459,9 @@ class TableListView extends React.Component<TableListViewProps, TableListViewSta
473459
}
474460

475461
renderListingOrEmptyState() {
476-
if (!this.state.fetchError && this.hasNoItems()) {
477-
return this.renderNoItemsMessage();
462+
if (this.props.noItemsFragment && !this.state.fetchError && this.hasNoItems()) {
463+
return this.props.noItemsFragment;
478464
}
479-
480465
return this.renderListing();
481466
}
482467

x-pack/plugins/translations/translations/ja-JP.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3089,7 +3089,6 @@
30893089
"kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高度な設定",
30903090
"kibana-react.tableListView.listing.listingLimitExceededDescription": "{totalItems} 件の {entityNamePlural} がありますが、{listingLimitText} の設定により {listingLimitValue} 件までしか下の表に表示できません。{advancedSettingsLink} の下でこの設定を変更できます。",
30913091
"kibana-react.tableListView.listing.listingLimitExceededTitle": "リスティング制限超過",
3092-
"kibana-react.tableListView.listing.noAvailableItemsMessage": "利用可能な {entityNamePlural} がありません。",
30933092
"kibana-react.tableListView.listing.noMatchedItemsMessage": "検索条件に一致する {entityNamePlural} がありません。",
30943093
"kibana-react.tableListView.listing.table.actionTitle": "アクション",
30953094
"kibana-react.tableListView.listing.table.editActionDescription": "編集",
@@ -12777,7 +12776,6 @@
1277712776
"xpack.maps.mapListing.descriptionFieldTitle": "説明",
1277812777
"xpack.maps.mapListing.entityName": "マップ",
1277912778
"xpack.maps.mapListing.entityNamePlural": "マップ",
12780-
"xpack.maps.mapListing.errorAttemptingToLoadSavedMaps": "マップを読み込めません",
1278112779
"xpack.maps.mapListing.titleFieldTitle": "タイトル",
1278212780
"xpack.maps.maps.choropleth.rightSourcePlaceholder": "インデックスパターンを選択",
1278312781
"xpack.maps.mapSavedObjectLabel": "マップ",

x-pack/plugins/translations/translations/zh-CN.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3110,7 +3110,6 @@
31103110
"kibana-react.tableListView.listing.listingLimitExceeded.advancedSettingsLinkText": "高级设置",
31113111
"kibana-react.tableListView.listing.listingLimitExceededDescription": "您有 {totalItems} 个{entityNamePlural},但您的“{listingLimitText}”设置阻止下表显示 {listingLimitValue} 个以上。您可以在“{advancedSettingsLink}”下更改此设置。",
31123112
"kibana-react.tableListView.listing.listingLimitExceededTitle": "已超过列表限制",
3113-
"kibana-react.tableListView.listing.noAvailableItemsMessage": "没有可用的{entityNamePlural}。",
31143113
"kibana-react.tableListView.listing.noMatchedItemsMessage": "没有任何{entityNamePlural}匹配您的搜索。",
31153114
"kibana-react.tableListView.listing.table.actionTitle": "操作",
31163115
"kibana-react.tableListView.listing.table.editActionDescription": "编辑",
@@ -12942,7 +12941,6 @@
1294212941
"xpack.maps.mapListing.descriptionFieldTitle": "描述",
1294312942
"xpack.maps.mapListing.entityName": "地图",
1294412943
"xpack.maps.mapListing.entityNamePlural": "地图",
12945-
"xpack.maps.mapListing.errorAttemptingToLoadSavedMaps": "无法加载地图",
1294612944
"xpack.maps.mapListing.titleFieldTitle": "标题",
1294712945
"xpack.maps.maps.choropleth.rightSourcePlaceholder": "选择索引模式",
1294812946
"xpack.maps.mapSavedObjectLabel": "地图",

0 commit comments

Comments
 (0)