From 61116c655ba67d3597f6d8a0a8d00866313441cb Mon Sep 17 00:00:00 2001 From: sitbubu Date: Fri, 13 May 2022 14:32:35 +0300 Subject: [PATCH] Use dateFormat instead of dateFormat:scaled Signed-off-by: sitbubu --- .../dashboard/public/application/listing/dashboard_listing.js | 2 +- .../public/management_section/saved_objects_table_page.tsx | 2 +- .../visualize/public/application/utils/get_table_columns.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.js b/src/plugins/dashboard/public/application/listing/dashboard_listing.js index e51e78c56fda..1864c2852aeb 100644 --- a/src/plugins/dashboard/public/application/listing/dashboard_listing.js +++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.js @@ -162,7 +162,7 @@ export class DashboardListing extends React.Component { } getTableColumns() { - const [, dateFormat] = this.props.core.uiSettings.get('dateFormat:scaled')[3]; + const dateFormat = this.props.core.uiSettings.get('dateFormat'); const tableColumns = [ { field: 'title', diff --git a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx index 1942014ac6d5..1640e5e2dd36 100644 --- a/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx +++ b/src/plugins/saved_objects_management/public/management_section/saved_objects_table_page.tsx @@ -59,7 +59,7 @@ const SavedObjectsTablePage = ({ }) => { const capabilities = coreStart.application.capabilities; const itemsPerPage = coreStart.uiSettings.get('savedObjects:perPage', 50); - const [, dateFormat] = coreStart.uiSettings.get('dateFormat:scaled')[3]; + const dateFormat = coreStart.uiSettings.get('dateFormat'); useEffect(() => { setBreadcrumbs([ diff --git a/src/plugins/visualize/public/application/utils/get_table_columns.tsx b/src/plugins/visualize/public/application/utils/get_table_columns.tsx index d3b9f8c0773d..fbf51bba1958 100644 --- a/src/plugins/visualize/public/application/utils/get_table_columns.tsx +++ b/src/plugins/visualize/public/application/utils/get_table_columns.tsx @@ -162,7 +162,7 @@ export const getTableColumns = ( }), ['data-test-subj']: 'updated-at', render: (updatedAt: string) => - updatedAt && moment(updatedAt).format(uiSettings.get('dateFormat:scaled')[3][1]), + updatedAt && moment(updatedAt).format(uiSettings.get('dateFormat')), }, ];