diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx index e4c305168..e99056a1f 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/pods/PodDescribe.tsx @@ -478,13 +478,13 @@ const PodDescribe = ({ variant="scrollable" scrollButtons="auto" > - - - - - - - + + + + + + + {renderTabComponent(curTab, describeInfo)} diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx index 945f5910a..b48ad03ee 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/PVCDescribe.tsx @@ -183,9 +183,9 @@ const PVCDescribe = ({ aria-label="cluster-tabs" variant="scrollable" scrollButtons="auto"> - - - + + + {renderTabComponent(curTab, describeInfo)} )} diff --git a/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx b/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx index e2443504c..5ce741519 100644 --- a/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx +++ b/portal-ui/src/screens/Console/Tenants/TenantDetails/pvcs/TenantVolumes.tsx @@ -106,7 +106,7 @@ const TenantVolumes = ({ classes, match }: IPVCDetailsProps) => { scrollButtons="auto"> - + {curTab === 0 && ( diff --git a/portal-ui/tests/operator/tenants.ts b/portal-ui/tests/operator/tenants.ts index 1d7615aa5..a46f3430a 100644 --- a/portal-ui/tests/operator/tenants.ts +++ b/portal-ui/tests/operator/tenants.ts @@ -22,7 +22,9 @@ import { deleteTenant, redirectToTenantsList, goToPodInTenant, - goToPodSection + goToPodSection, + goToPvcInTenant, + goToPvcSection } from './utils'; fixture("For user with default permissions").page("http://localhost:9090"); @@ -46,7 +48,7 @@ test("Test describe section for PODs in new tenant", async (t) => { const tenantName = `tenant-${Math.floor(Math.random() * 10000)}`; await loginToOperator(); await createTenant(tenantName); - await t.wait(15000) // wait for PODs to be created + await t.wait(20000) // wait for PODs to be created await testPODDescribe(tenantName); await redirectToTenantsList(); await deleteTenant(tenantName); @@ -55,10 +57,10 @@ test("Test describe section for PODs in new tenant", async (t) => { const testPODDescribe = async (tenantName: string) => { await goToPodInTenant(tenantName); await goToPodSection(1); - await checkPVCSDescribeHasSections(); + await checkPodDescribeHasSections(); } -const checkPVCSDescribeHasSections = async () => { +const checkPodDescribeHasSections = async () => { await t .expect(Selector("#pod-describe-summary").exists).ok() .expect(Selector("#pod-describe-annotations").exists).ok() @@ -68,3 +70,26 @@ const checkPVCSDescribeHasSections = async () => { .expect(Selector("#pod-describe-volumes").exists).ok() .expect(Selector("#pod-describe-containers").exists).ok(); } + +test("Test describe section for PVCs in new tenant", async (t) => { + const tenantName = `tenant-${Math.floor(Math.random() * 10000)}`; + await loginToOperator(); + await createTenant(tenantName); + await t.wait(20000) // wait for PVCs to be created + await testPvcDescribe(tenantName); + await redirectToTenantsList(); + await deleteTenant(tenantName); +}); + +const testPvcDescribe = async (tenantName: string) => { + await goToPvcInTenant(tenantName); + await goToPvcSection(1); + await checkPvcDescribeHasSections(); +} + +const checkPvcDescribeHasSections = async () => { + await t + .expect(Selector("#pvc-describe-summary").exists).ok() + .expect(Selector("#pvc-describe-annotations").exists).ok() + .expect(Selector("#pvc-describe-labels").exists).ok() +} diff --git a/portal-ui/tests/operator/utils.ts b/portal-ui/tests/operator/utils.ts index 0cfd6221d..6cb03a249 100644 --- a/portal-ui/tests/operator/utils.ts +++ b/portal-ui/tests/operator/utils.ts @@ -80,7 +80,7 @@ export const goToVolumesInTenant = async (tenantName: string) => { export const goToPodsInTenant = async (tenantName: string) => { await t.click(`#list-tenant-${tenantName}`); - await t.click(Selector(`a[href$="/pods"]`)) + await t.click(Selector(`a[href$="/pods"]`)); } export const goToPodInTenant = async (tenantName: string) => { @@ -95,6 +95,23 @@ export const goToPodSection = async (index: number) => { .click(Selector(`#simple-tab-${index}`)); } +export const goToPvcsInTenant = async (tenantName: string) => { + await t.click(`#list-tenant-${tenantName}`); + await t.click(Selector(`a[href$="/volumes"]`)); +} + +export const goToPvcInTenant = async (tenantName: string) => { + await goToPvcsInTenant(tenantName); + await t.click(Selector("div.ReactVirtualized__Table__row").child(0)); +} + +export const goToPvcSection = async (index: number) => { + await t + .expect(Selector(`#simple-tab-${index}`).exists) + .ok() + .click(Selector(`#simple-tab-${index}`)); +} + export const redirectToTenantsList = async () => { await redirectToPath(`${host}/tenants`); }