[Backport 2.6][#8490][YW] Fix UI unit tests failing for Administratio…

…n and EditProviderForm components.
yugabyte · May 26, 2021 · 8d85d99 · 8d85d99
1 parent e215e9d
commit 8d85d99
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/managed/ui/src/components/config/PublicCloud/views/EditProvider/EditProviderForm.test.tsx b/managed/ui/src/components/config/PublicCloud/views/EditProvider/EditProviderForm.test.tsx
@@ -86,7 +86,10 @@ describe('EditProviderForm components tests', () => {
     const universeListMock = getInitialState();
     universeListMock.promiseState = { name: 'SUCCESS', ordinal: 1 };
     universeListMock.data = universeListMockData;
-    const { component } = setup(universeListMock, providerToEdit);
+    const editProviderMock = getInitialState();
+    editProviderMock.promiseState = { name: 'SUCCESS', ordinal: 1 };
+    editProviderMock.data = providerToEdit;
+    const { component } = setup(universeListMock, editProviderMock);
     expect(
       component.getByDisplayValue('yb-admin-test-aws_12581bba-b6f7-4a35-8694-060436dcafcc-key')
     ).toBeInTheDocument();
@@ -100,7 +103,10 @@ describe('EditProviderForm components tests', () => {
     universeListMock.promiseState = { name: 'SUCCESS', ordinal: 1 };
     universeListMock.data = universeListMockData;
     providerToEdit.uuid = providerToEdit.uuid + 'test';
-    const { component } = setup(universeListMock, providerToEdit);
+    const editProviderMock = getInitialState();
+    editProviderMock.promiseState = { name: 'SUCCESS', ordinal: 1 };
+    editProviderMock.data = providerToEdit;
+    const { component } = setup(universeListMock, editProviderMock);
     expect(
       component.getByDisplayValue('yb-admin-test-aws_12581bba-b6f7-4a35-8694-060436dcafcc-key')
     ).toBeInTheDocument();

diff --git a/managed/ui/src/components/panels/YBTabsPanel/YBTabsWithLinksPanel.js b/managed/ui/src/components/panels/YBTabsPanel/YBTabsWithLinksPanel.js
@@ -29,7 +29,7 @@ class YBTabsWithLinksPanel extends Component {
 
   queryTabHandler = () => {
     const { location, children } = this.props;
-    const locationTabKey = location.query.tab;
+    const locationTabKey = location.query?.tab;
     if (isDefinedNotNull(locationTabKey)) {
       return children.some((item) => {
         return item.props.eventKey.indexOf(locationTabKey) >= 0 && !item.props.disabled;
@@ -66,7 +66,7 @@ class YBTabsWithLinksPanel extends Component {
         className={this.props.className}
       >
         <div>
-          <Nav bsStyle="tabs" className="nav nav-tabs">
+          <Nav bsStyle="tabs" className="nav nav-tabs" role="tablist">
             {links}
           </Nav>
           <Tab.Content animation>{this.props.children}</Tab.Content>