Merge branch 'master' into omit_deprecation_details

elastic · Oct 11, 2021 · e729918 · e729918
2 parents 0d09309 + de42e53
commit e729918
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/x-pack/plugins/monitoring/public/application/hooks/use_table.ts b/x-pack/plugins/monitoring/public/application/hooks/use_table.ts
@@ -9,6 +9,7 @@ import { useState, useCallback } from 'react';
 import { EuiTableSortingType } from '@elastic/eui';
 import { euiTableStorageGetter, euiTableStorageSetter } from '../../components/table';
 import { Storage } from '../../../../../../src/plugins/kibana_utils/public';
+import { EUI_SORT_ASCENDING } from '../../../common/constants';
 
 interface Pagination {
   pageSize: number;
@@ -77,7 +78,9 @@ export function useTable(storageKey: string) {
   );
 
   // get initial state from localStorage
-  const [sorting, setSorting] = useState<Sorting>(storageData.sort || { sort: {} });
+  const [sorting, setSorting] = useState<Sorting>(
+    storageData.sort || { sort: { field: 'name', direction: EUI_SORT_ASCENDING } }
+  );
 
   const [query, setQuery] = useState('');
 

diff --git a/x-pack/plugins/monitoring/public/application/pages/elasticsearch/item_template.tsx b/x-pack/plugins/monitoring/public/application/pages/elasticsearch/item_template.tsx
@@ -25,6 +25,7 @@ export const ItemTemplate: React.FC<ItemTemplateProps> = (props) => {
     },
     {
       id: 'advanced',
+      testSubj: 'esItemDetailAdvancedLink',
       label: i18n.translate('xpack.monitoring.esItemNavigation.advancedLinkText', {
         defaultMessage: 'Advanced',
       }),

diff --git a/x-pack/plugins/monitoring/public/directives/main/index.html b/x-pack/plugins/monitoring/public/directives/main/index.html
@@ -103,7 +103,7 @@ <h1 class="euiTitle euiTitle--xsmall">{{pageTitle || monitoringMain.instance}}</
       </a>
       <a
         ng-if="monitoringMain.instance && (monitoringMain.name === 'nodes' || monitoringMain.name === 'indices')"
-        data-test-subj="esNodeDetailAdvancedLink"
+        data-test-subj="esItemDetailAdvancedLink"
         kbn-href="#/elasticsearch/{{ monitoringMain.name }}/{{ monitoringMain.resolver }}/advanced"
         class="euiTab"
         ng-class="{'euiTab-isSelected': monitoringMain.page === 'advanced'}"

diff --git a/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js b/x-pack/test/functional/services/monitoring/elasticsearch_node_detail.js
@@ -21,7 +21,7 @@ export function MonitoringElasticsearchNodeDetailProvider({ getService }) {
 
   return new (class ElasticsearchNodeDetail {
     async clickAdvanced() {
-      return testSubjects.click('esNodeDetailAdvancedLink');
+      return testSubjects.click('esItemDetailAdvancedLink');
     }
 
     async getSummary() {