} title={"Configuration:"} />
{
actions={
Group Status:
-
+
{isGroupEnabled ? "Enabled" : "Disabled"}
- {renderLines}
+
+ {renderLines}
+
diff --git a/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx b/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
index 611619166..cabd6f5ff 100644
--- a/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
+++ b/portal-ui/src/screens/Console/Menu/ConsoleMenuList.tsx
@@ -30,7 +30,12 @@ import {
import { DocumentationIcon, SettingsIcon } from "../../../icons";
import MenuItem from "./MenuItem";
import { NavLink, useLocation } from "react-router-dom";
-import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
+import {
+ CONSOLE_UI_RESOURCE,
+ IAM_PAGES,
+ IAM_SCOPES,
+} from "../../../common/SecureComponent/permissions";
+import SecureComponent from "../../../common/SecureComponent/SecureComponent";
const ConsoleMenuList = ({
menuItems,
@@ -106,6 +111,7 @@ const ConsoleMenuList = ({
stateClsName={stateClsName}
page={menuGroup}
key={menuGroup.id}
+ id={menuGroup.id}
onExpand={setOpenGroup}
expandedValue={openGroup}
pathValue={pathname}
@@ -131,34 +137,39 @@ const ConsoleMenuList = ({
}}
className={`${stateClsName} group-wrapper bottom-list`}
>
-
-
-
-
-
-
+
+
+
+
+
+
{
+ if (item.children && item.children.length > 0) {
+ const c = item.children?.filter((childItem: IMenuItem) => {
+ return (
+ ((childItem.customPermissionFnc
+ ? childItem.customPermissionFnc()
+ : hasPermission(
+ CONSOLE_UI_RESOURCE,
+ IAM_PAGES_PERMISSIONS[childItem.to ?? ""]
+ )) ||
+ childItem.forceDisplay) &&
+ !childItem.fsHidden
+ );
+ });
+ return c.length > 0;
+ }
+
+ const res =
+ ((item.customPermissionFnc
+ ? item.customPermissionFnc()
+ : hasPermission(
+ CONSOLE_UI_RESOURCE,
+ IAM_PAGES_PERMISSIONS[item.to ?? ""]
+ )) ||
+ item.forceDisplay) &&
+ !item.fsHidden;
+ return res;
+ }
+ );
+
return (
diff --git a/portal-ui/src/screens/Console/Menu/MenuItem.tsx b/portal-ui/src/screens/Console/Menu/MenuItem.tsx
index a3bdba363..e8c50b0db 100644
--- a/portal-ui/src/screens/Console/Menu/MenuItem.tsx
+++ b/portal-ui/src/screens/Console/Menu/MenuItem.tsx
@@ -45,12 +45,14 @@ const MenuItem = ({
onExpand,
expandedValue,
pathValue = "",
+ id = `${Math.random()}`,
}: {
page: any;
stateClsName?: string;
onExpand?: (id: any) => void;
expandedValue?: any;
pathValue?: string;
+ id?: string;
}) => {
const childrenMenuList = page?.children?.filter(
(item: any) =>
@@ -88,6 +90,7 @@ const MenuItem = ({
onClick={onClickHandler}
component={page.component}
to={page.to}
+ id={id}
className={`${activeClsName} ${stateClsName} main-menu-item `}
disableRipple
sx={{
@@ -132,7 +135,13 @@ const MenuItem = ({
{hasChildren ? (
-
+
.
export interface IMenuItem {
- group: string;
- type: string;
- component: any;
- to: string;
+ group?: string;
+ type?: string;
+ component?: any;
+ to?: string;
name: string;
+ id?: string;
icon: any;
onClick?: any;
forceDisplay?: boolean;
extraMargin?: boolean;
fsHidden?: boolean;
customPermissionFnc?: any;
+ children?: IMenuItem[];
}
export interface IRouteRule {
diff --git a/portal-ui/src/screens/Console/Policies/Policies.tsx b/portal-ui/src/screens/Console/Policies/Policies.tsx
index b36a27f6a..5cba88267 100644
--- a/portal-ui/src/screens/Console/Policies/Policies.tsx
+++ b/portal-ui/src/screens/Console/Policies/Policies.tsx
@@ -19,7 +19,7 @@ const mapState = (state: AppState) => ({
const connector = connect(mapState, { setMenuOpen });
-const Users = () => {
+const Policies = () => {
return (
@@ -28,7 +28,7 @@ const Users = () => {
exact={true}
component={ListPolicies}
/>
-
+
@@ -36,4 +36,4 @@ const Users = () => {
);
};
-export default withRouter(connector(Users));
+export default withRouter(connector(Policies));
diff --git a/portal-ui/src/screens/Console/Tools/Tools.tsx b/portal-ui/src/screens/Console/Tools/Tools.tsx
index 76cd65443..e98aa0e47 100644
--- a/portal-ui/src/screens/Console/Tools/Tools.tsx
+++ b/portal-ui/src/screens/Console/Tools/Tools.tsx
@@ -57,7 +57,7 @@ const Tools = () => {
}}
/>
{
return (
diff --git a/portal-ui/src/screens/Console/Watch/Watch.tsx b/portal-ui/src/screens/Console/Watch/Watch.tsx
index 81c77f578..a1ca40aee 100644
--- a/portal-ui/src/screens/Console/Watch/Watch.tsx
+++ b/portal-ui/src/screens/Console/Watch/Watch.tsx
@@ -43,9 +43,7 @@ import { ErrorResponseHandler } from "../../../common/types";
import TableWrapper from "../Common/TableWrapper/TableWrapper";
import PageHeader from "../Common/PageHeader/PageHeader";
import api from "../../../common/api";
-import BackLink from "../../../common/BackLink";
import PageLayout from "../Common/Layout/PageLayout";
-import { IAM_PAGES } from "../../../common/SecureComponent/permissions";
const styles = (theme: Theme) =>
createStyles({
@@ -184,8 +182,7 @@ const Watch = ({
return (
-
-
+
diff --git a/portal-ui/tests/constants/timestamp.txt b/portal-ui/tests/constants/timestamp.txt
index 9670d6fd2..60accb128 100644
--- a/portal-ui/tests/constants/timestamp.txt
+++ b/portal-ui/tests/constants/timestamp.txt
@@ -1 +1 @@
-1642030641
+1642704125
diff --git a/portal-ui/tests/permissions/admin.ts b/portal-ui/tests/permissions/admin.ts
index 381f91a16..f5d5721d3 100644
--- a/portal-ui/tests/permissions/admin.ts
+++ b/portal-ui/tests/permissions/admin.ts
@@ -15,15 +15,19 @@
// along with this program. If not, see .
import * as roles from "../utils/roles";
-import * as elements from "../utils/elements";
+import * as elements from "../utils/elements-menu";
+import { monitoringElement, supportElement } from "../utils/elements-menu";
fixture("For user with Admin permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.admin);
});
test("All sidebar items exist", async (t) => {
+ const monitoring = elements.monitoringElement;
+ const identity = elements.identityElement;
+
const dashboardExists = elements.dashboardElement.exists;
const bucketsExist = elements.bucketsElement.exists;
const usersExist = elements.usersElement.exists;
@@ -34,13 +38,19 @@ test("All sidebar items exist", async (t) => {
const notificationEndpointsExist =
elements.notificationEndpointsElement.exists;
const tiersExist = elements.tiersElement.exists;
- const toolsExist = elements.toolsElement.exists;
+ const toolsExist = elements.supportElement.exists;
const licenseExists = elements.licenseElement.exists;
await t
+ .expect(monitoring.exists)
+ .ok()
+ .click(monitoring)
.expect(dashboardExists)
.ok()
.expect(bucketsExist)
.ok()
+ .expect(identity.exists)
+ .ok()
+ .click(identity)
.expect(usersExist)
.ok()
.expect(groupsExist)
@@ -55,7 +65,14 @@ test("All sidebar items exist", async (t) => {
.ok()
.expect(tiersExist)
.ok()
- .expect(toolsExist)
+ .expect(supportElement.exists)
+ .ok()
+ .click(supportElement)
+ .expect(elements.registerElement.exists)
+ .ok()
+ .expect(elements.diagnosticsElement.exists)
+ .ok()
+ .expect(elements.performanceElement.exists)
.ok()
.expect(licenseExists)
.ok();
diff --git a/portal-ui/tests/permissions/bucketAssignPolicy.ts b/portal-ui/tests/permissions/bucketAssignPolicy.ts
index 0ee35302d..8f8072b95 100644
--- a/portal-ui/tests/permissions/bucketAssignPolicy.ts
+++ b/portal-ui/tests/permissions/bucketAssignPolicy.ts
@@ -16,17 +16,19 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+
import * as functions from "../utils/functions";
+import { bucketsElement, logoutItem } from "../utils/elements-menu";
fixture("For user with Bucket Assign Policy permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.bucketAssignPolicy);
});
// Bucket assign policy permissions
test("Buckets sidebar item exists", async (t) => {
- const bucketsExist = elements.bucketsElement.exists;
+ const bucketsExist = bucketsElement.exists;
await t.expect(bucketsExist).ok();
});
@@ -38,7 +40,7 @@ test.before(async (t) => {
// We need to log back in after we use the admin account to create bucket,
// using the specific role we use in this module
.useRole(roles.bucketAssignPolicy)
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.manageButton)
.click(elements.bucketAccessRulesTab)
.click(elements.addAccessRuleButton)
@@ -50,7 +52,7 @@ test.before(async (t) => {
test("A writeonly policy can be assigned to a bucket", async (t) => {
await t
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.manageButton)
.click(elements.bucketAccessRulesTab)
.click(elements.addAccessRuleButton)
@@ -62,7 +64,7 @@ test("A writeonly policy can be assigned to a bucket", async (t) => {
test("A readwrite policy can be assigned to a bucket", async (t) => {
await t
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.manageButton)
.click(elements.bucketAccessRulesTab)
.click(elements.addAccessRuleButton)
@@ -74,12 +76,12 @@ test("A readwrite policy can be assigned to a bucket", async (t) => {
test("Previously assigned policy to a bucket can be deleted", async (t) => {
await t
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.manageButton)
.click(elements.bucketAccessRulesTab)
.click(elements.deleteIconButtonAlt)
.click(elements.deleteButton)
- .click(elements.logoutItem);
+ .click(logoutItem);
}).after(async (t) => {
// Cleanup created bucket
await functions.cleanUpBucket(t);
diff --git a/portal-ui/tests/permissions/bucketRead.ts b/portal-ui/tests/permissions/bucketRead.ts
index 627c6e213..7d969574f 100644
--- a/portal-ui/tests/permissions/bucketRead.ts
+++ b/portal-ui/tests/permissions/bucketRead.ts
@@ -17,15 +17,16 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as functions from "../utils/functions";
+import { bucketsElement, logoutItem } from "../utils/elements-menu";
fixture("For user with Bucket Read permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.bucketRead);
});
test("Buckets sidebar item exists", async (t) => {
- const bucketsExist = elements.bucketsElement.exists;
+ const bucketsExist = bucketsElement.exists;
await t.expect(bucketsExist).ok();
});
@@ -33,7 +34,7 @@ test.before(async (t) => {
// Create a bucket
await functions.setUpBucket(t);
})("Browse button exists", async (t) => {
- const browseExists = elements.browseButton.exists;
+ const browseExists = elements.testBucketBrowseButton.exists;
// We need to log back in after we use the admin account to create bucket,
// using the specific role we use in this module
await t.useRole(roles.bucketRead).expect(browseExists).ok();
@@ -47,16 +48,16 @@ test
.before(async (t) => {
await t
.useRole(roles.admin)
- .navigateTo("http://localhost:5005/buckets")
- .click(elements.browseButton)
+ .navigateTo("http://localhost:9090/buckets")
+ .click(elements.testBucketBrowseButton)
// Upload object to bucket
.setFilesToUpload(elements.uploadInput, "../uploads/test.txt")
- .click(elements.logoutItem);
+ .click(logoutItem);
})("Object list table is enabled", async (t) => {
const bucketsTableExists = elements.table.exists;
await t
.useRole(roles.bucketRead)
- .click(elements.browseButton)
+ .click(elements.testBucketBrowseButton)
.expect(bucketsTableExists)
.ok();
})
diff --git a/portal-ui/tests/permissions/bucketWrite.ts b/portal-ui/tests/permissions/bucketWrite.ts
index c6d2621a0..ee99af463 100644
--- a/portal-ui/tests/permissions/bucketWrite.ts
+++ b/portal-ui/tests/permissions/bucketWrite.ts
@@ -17,15 +17,16 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as functions from "../utils/functions";
+import { bucketsElement } from "../utils/elements-menu";
fixture("For user with Bucket Write permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.bucketWrite);
});
test("Buckets sidebar item exists", async (t) => {
- const bucketsExist = elements.bucketsElement.with({ boundTestRun: t }).exists;
+ const bucketsExist = bucketsElement.with({ boundTestRun: t }).exists;
await t.expect(bucketsExist).ok();
});
@@ -33,19 +34,19 @@ test.before(async (t) => {
// Create a bucket
await functions.setUpBucket(t);
})("Browse button exists", async (t) => {
- const browseExists = elements.browseButton.exists;
+ const browseExists = elements.testBucketBrowseButton.exists;
await t
// We need to log back in after we use the admin account to create bucket,
// using the specific role we use in this module
.useRole(roles.bucketWrite)
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.expect(browseExists)
.ok();
});
test("Bucket access is set to W", async (t) => {
await t
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.expect(elements.bucketAccessText.innerText)
.eql("Access: W");
});
@@ -53,16 +54,16 @@ test("Bucket access is set to W", async (t) => {
test("Upload button exists", async (t) => {
const uploadExists = elements.uploadButton.exists;
await t
- .navigateTo("http://localhost:5005/buckets")
- .click(elements.browseButton)
+ .navigateTo("http://localhost:9090/buckets")
+ .click(elements.testBucketBrowseButton)
.expect(uploadExists)
.ok();
});
test("Object can be uploaded to a bucket", async (t) => {
await t
- .navigateTo("http://localhost:5005/buckets")
- .click(elements.browseButton)
+ .navigateTo("http://localhost:9090/buckets")
+ .click(elements.testBucketBrowseButton)
// Upload object to bucket
.setFilesToUpload(elements.uploadInput, "../uploads/test.txt");
});
@@ -70,8 +71,8 @@ test("Object can be uploaded to a bucket", async (t) => {
test("Object list table is disabled", async (t) => {
const disabledBucketsTableExists = elements.bucketsTableDisabled.exists;
await t
- .navigateTo("http://localhost:5005/buckets")
- .click(elements.browseButton)
+ .navigateTo("http://localhost:9090/buckets")
+ .click(elements.testBucketBrowseButton)
.expect(disabledBucketsTableExists)
.ok();
}).after(async (t) => {
diff --git a/portal-ui/tests/permissions/dashboard.ts b/portal-ui/tests/permissions/dashboard.ts
index 0dda02149..11c767688 100644
--- a/portal-ui/tests/permissions/dashboard.ts
+++ b/portal-ui/tests/permissions/dashboard.ts
@@ -16,16 +16,22 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import { dashboardElement, monitoringElement } from "../utils/elements-menu";
fixture("For user with Dashboard permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.dashboard);
});
test("Dashboard sidebar item exists", async (t) => {
- const dashboardExists = elements.dashboardElement.exists;
- await t.expect(dashboardExists).ok();
+ const dashboardExists = dashboardElement.exists;
+ await t
+ .expect(monitoringElement.exists)
+ .ok()
+ .click(monitoringElement)
+ .expect(dashboardExists)
+ .ok();
});
// TODO: Display extended metrics
diff --git a/portal-ui/tests/permissions/diagnostics.ts b/portal-ui/tests/permissions/diagnostics.ts
index 82cb4d245..c19eadc8e 100644
--- a/portal-ui/tests/permissions/diagnostics.ts
+++ b/portal-ui/tests/permissions/diagnostics.ts
@@ -16,6 +16,7 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import { diagnosticsElement, supportElement } from "../utils/elements-menu";
fixture("For user with Diagnostics permissions")
.page("http://localhost:9090")
@@ -23,31 +24,39 @@ fixture("For user with Diagnostics permissions")
await t.useRole(roles.diagnostics);
});
-test("Tools sidebar item exists", async (t) => {
- const toolsExist = elements.toolsElement.exists;
- await t.expect(toolsExist).ok();
+test("Support sidebar item exists", async (t) => {
+ await t
+ .expect(supportElement.exists)
+ .ok()
+ .click(supportElement)
+ .expect(supportElement.exists)
+ .ok();
});
test("Diagnostics link exists in Tools page", async (t) => {
- const diagnosticsLinkExists = elements.diagnosticsLink.exists;
- await t.click(elements.toolsElement).expect(diagnosticsLinkExists).ok();
+ await t
+ .expect(supportElement.exists)
+ .ok()
+ .click(supportElement)
+ .expect(diagnosticsElement.exists)
+ .ok();
});
test("Diagnostics page can be opened", async (t) => {
- await t.navigateTo("http://localhost:9090/tools/diagnostics");
+ await t.navigateTo("http://localhost:9090/support/diagnostics");
});
test("Start Diagnostic button exists", async (t) => {
const startDiagnosticExists = elements.startDiagnosticButton.exists;
await t
- .navigateTo("http://localhost:9090/tools/diagnostics")
+ .navigateTo("http://localhost:9090/support/diagnostics")
.expect(startDiagnosticExists)
.ok();
});
test("Start Diagnostic button can be clicked", async (t) => {
await t
- .navigateTo("http://localhost:9090/tools/diagnostics")
+ .navigateTo("http://localhost:9090/support/diagnostics")
.click(elements.startDiagnosticButton);
});
@@ -56,14 +65,14 @@ test("Start Diagnostic button can be clicked", async (t) => {
// test("Download button exists after Diagnostic is completed", async (t) => {
// const downloadExists = elements.downloadButton.exists;
// await t
-// .navigateTo("http://localhost:9090/tools/diagnostics")
+// .navigateTo("http://localhost:9090/support/diagnostics")
// .click(elements.startDiagnosticButton)
// .expect(downloadExists).ok();
// });
// test("Download button is clickable after Diagnostic is completed", async (t) => {
// await t
-// .navigateTo("http://localhost:9090/tools/diagnostics")
+// .navigateTo("http://localhost:9090/support/diagnostics")
// .click(elements.startDiagnosticButton)
// .click(elements.downloadButton);
// });
@@ -72,7 +81,7 @@ test("Start New Diagnostic button exists after Diagnostic is completed", async (
const startNewDiagnosticButtonExists =
elements.startNewDiagnosticButton.exists;
await t
- .navigateTo("http://localhost:9090/tools/diagnostics")
+ .navigateTo("http://localhost:9090/support/diagnostics")
.click(elements.startDiagnosticButton)
.expect(startNewDiagnosticButtonExists)
.ok();
@@ -80,7 +89,7 @@ test("Start New Diagnostic button exists after Diagnostic is completed", async (
test("Start New Diagnostic button is clickable after Diagnostic is completed", async (t) => {
await t
- .navigateTo("http://localhost:9090/tools/diagnostics")
+ .navigateTo("http://localhost:9090/support/diagnostics")
.click(elements.startDiagnosticButton)
.click(elements.startNewDiagnosticButton);
});
diff --git a/portal-ui/tests/permissions/groups.ts b/portal-ui/tests/permissions/groups.ts
index 93b77b45f..e4cdc3d88 100644
--- a/portal-ui/tests/permissions/groups.ts
+++ b/portal-ui/tests/permissions/groups.ts
@@ -19,40 +19,45 @@ import * as elements from "../utils/elements";
import * as constants from "../utils/constants";
import * as functions from "../utils/functions";
import { Selector } from "testcafe";
+import { groupsElement, identityElement } from "../utils/elements-menu";
const groupsListItem = Selector(".ReactVirtualized__Table__rowColumn").withText(
constants.TEST_GROUP_NAME
);
fixture("For user with Groups permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.groups);
});
test("Groups sidebar item exists", async (t) => {
- const groupsExist = elements.groupsElement.exists;
- await t.expect(groupsExist).ok();
+ await t
+ .expect(identityElement.exists)
+ .ok()
+ .click(identityElement)
+ .expect(groupsElement.exists)
+ .ok();
});
test("Create Group button exists", async (t) => {
const createGroupButtonExists = elements.createGroupButton.exists;
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.expect(createGroupButtonExists)
.ok();
});
test("Create Group button is clickable", async (t) => {
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(elements.createGroupButton);
});
test("Group Name input exists in the Create Group modal", async (t) => {
const groupNameInputExists = elements.groupNameInput.exists;
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(elements.createGroupButton)
.expect(groupNameInputExists)
.ok();
@@ -61,7 +66,7 @@ test("Group Name input exists in the Create Group modal", async (t) => {
test("Users table exists in the Create Group modal", async (t) => {
const createGroupUserTableExists = elements.table.exists;
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(elements.createGroupButton)
.expect(createGroupUserTableExists)
.ok();
@@ -77,7 +82,7 @@ test.before(async (t) => {
// using the specific role we use in this module
await t
.useRole(roles.groups)
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(elements.createGroupButton)
.typeText(elements.groupNameInput, constants.TEST_GROUP_NAME)
.typeText(elements.filterUserInput, constants.TEST_USER_NAME)
@@ -89,14 +94,14 @@ test.before(async (t) => {
test("Groups table exists", async (t) => {
const groupsTableExists = elements.table.exists;
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.expect(groupsTableExists)
.ok();
});
test("Created Group can be disabled and enabled back", async (t) => {
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(groupsListItem)
.click(elements.switchInput)
.expect(elements.groupStatusText.innerText)
@@ -108,7 +113,7 @@ test("Created Group can be disabled and enabled back", async (t) => {
test("Created Group can be viewed and deleted", async (t) => {
await t
- .navigateTo("http://localhost:5005/groups")
+ .navigateTo("http://localhost:9090/identity/groups")
.click(groupsListItem)
.click(elements.editMembersButton)
.typeText(elements.filterUserInput, constants.TEST_USER_NAME)
diff --git a/portal-ui/tests/permissions/heal.ts b/portal-ui/tests/permissions/heal.ts
index 6177a3cd6..547402f5b 100644
--- a/portal-ui/tests/permissions/heal.ts
+++ b/portal-ui/tests/permissions/heal.ts
@@ -17,6 +17,11 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as functions from "../utils/functions";
+import {
+ drivesElement,
+ monitoringElement,
+ supportElement,
+} from "../utils/elements-menu";
fixture("For user with Heal permissions")
.page("http://localhost:9090")
@@ -24,14 +29,17 @@ fixture("For user with Heal permissions")
await t.useRole(roles.heal);
});
-test("Tools sidebar item exists", async (t) => {
- const toolsExist = elements.toolsElement.exists;
- await t.expect(toolsExist).ok();
+test("Monitoring sidebar item exists", async (t) => {
+ await t.expect(monitoringElement.exists).ok();
});
-test("Heal link exists in Tools page", async (t) => {
- const healLinkExists = elements.healLink.exists;
- await t.click(elements.toolsElement).expect(healLinkExists).ok();
+test("Heal menu exists in Monitoring page", async (t) => {
+ await t
+ .expect(monitoringElement.exists)
+ .ok()
+ .click(monitoringElement)
+ .expect(drivesElement.exists)
+ .ok();
});
test("Heal page can be opened", async (t) => {
diff --git a/portal-ui/tests/permissions/iamPolicies.ts b/portal-ui/tests/permissions/iamPolicies.ts
index 9221d447e..ac2ad32eb 100644
--- a/portal-ui/tests/permissions/iamPolicies.ts
+++ b/portal-ui/tests/permissions/iamPolicies.ts
@@ -18,6 +18,7 @@ import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as constants from "../utils/constants";
import { Selector } from "testcafe";
+import { iamPoliciesElement } from "../utils/elements-menu";
const iamPolicyListItem = Selector(
".ReactVirtualized__Table__rowColumn"
@@ -29,34 +30,34 @@ const iamPolicyDelete = iamPolicyListItem
.withAttribute("aria-label", "delete");
fixture("For user with IAM Policies permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.iamPolicies);
});
test("IAM Policies sidebar item exists", async (t) => {
- const iamPoliciesExist = elements.iamPoliciesElement.exists;
+ const iamPoliciesExist = iamPoliciesElement.exists;
await t.expect(iamPoliciesExist).ok();
});
test("Create Policy button exists", async (t) => {
const createPolicyButtonExists = elements.createPolicyButton.exists;
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.expect(createPolicyButtonExists)
.ok();
});
test("Create Policy button is clickable", async (t) => {
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.click(elements.createPolicyButton);
});
test("Policy Name input exists in the Create Policy modal", async (t) => {
const policyNameInputExists = elements.createPolicyName.exists;
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.click(elements.createPolicyButton)
.expect(policyNameInputExists)
.ok();
@@ -65,7 +66,7 @@ test("Policy Name input exists in the Create Policy modal", async (t) => {
test("Policy textfield exists in the Create Policy modal", async (t) => {
const policyTextfieldExists = elements.createPolicyTextfield.exists;
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.click(elements.createPolicyButton)
.expect(policyTextfieldExists)
.ok();
@@ -73,7 +74,7 @@ test("Policy textfield exists in the Create Policy modal", async (t) => {
test("Create Policy modal can be submitted after inputs are entered", async (t) => {
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.click(elements.createPolicyButton)
.typeText(elements.createPolicyName, constants.TEST_IAM_POLICY_NAME)
.typeText(elements.createPolicyTextfield, constants.TEST_IAM_POLICY, {
@@ -83,7 +84,7 @@ test("Create Policy modal can be submitted after inputs are entered", async (t)
}).after(async (t) => {
// Clean up created policy
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.typeText(elements.searchResourceInput, constants.TEST_IAM_POLICY_NAME)
.click(iamPolicyDelete)
.click(elements.deleteButton);
@@ -92,7 +93,7 @@ test("Create Policy modal can be submitted after inputs are entered", async (t)
test("Created Policy can be viewed and deleted", async (t) => {
const iamPolicyListItemExists = iamPolicyListItem.exists;
await t
- .navigateTo("http://localhost:5005/policies")
+ .navigateTo("http://localhost:9090/access/policies")
.click(elements.createPolicyButton)
.typeText(elements.createPolicyName, constants.TEST_IAM_POLICY_NAME)
.typeText(elements.createPolicyTextfield, constants.TEST_IAM_POLICY, {
diff --git a/portal-ui/tests/permissions/logs.ts b/portal-ui/tests/permissions/logs.ts
index ec401050d..f78f29d35 100644
--- a/portal-ui/tests/permissions/logs.ts
+++ b/portal-ui/tests/permissions/logs.ts
@@ -16,31 +16,39 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import {
+ logsElement,
+ monitoringElement,
+ supportElement,
+} from "../utils/elements-menu";
fixture("For user with Logs permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.logs);
});
test("Tools sidebar item exists", async (t) => {
- const toolsExist = elements.toolsElement.exists;
- await t.expect(toolsExist).ok();
+ await t.expect(monitoringElement.exists).ok();
});
test("Logs link exists in Tools page", async (t) => {
- const logsLinkExists = elements.logsLink.exists;
- await t.click(elements.toolsElement).expect(logsLinkExists).ok();
+ await t
+ .expect(monitoringElement.exists)
+ .ok()
+ .click(monitoringElement)
+ .expect(logsElement.exists)
+ .ok();
});
test("Logs page can be opened", async (t) => {
- await t.navigateTo("http://localhost:5005/tools/logs");
+ await t.navigateTo("http://localhost:9090/tools/logs");
});
test("Log window exists in Logs page", async (t) => {
const logWindowExists = elements.logWindow.exists;
await t
- .navigateTo("http://localhost:5005/tools/logs")
+ .navigateTo("http://localhost:9090/tools/logs")
.expect(logWindowExists)
.ok();
});
diff --git a/portal-ui/tests/permissions/notificationEndpoints.ts b/portal-ui/tests/permissions/notificationEndpoints.ts
index 7c6c35d5b..d1f0a9290 100644
--- a/portal-ui/tests/permissions/notificationEndpoints.ts
+++ b/portal-ui/tests/permissions/notificationEndpoints.ts
@@ -16,29 +16,29 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import { notificationEndpointsElement } from "../utils/elements-menu";
fixture("For user with Notification Endpoints permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.notificationEndpoints);
});
test("Notification Endpoints sidebar item exists", async (t) => {
- const notificationEndpointsExist =
- elements.notificationEndpointsElement.exists;
+ const notificationEndpointsExist = notificationEndpointsElement.exists;
await t.expect(notificationEndpointsExist).ok();
});
test("Add Notification Target button exists", async (t) => {
const addNotifTargetButtonExists = elements.addNotifTargetButton.exists;
await t
- .navigateTo("http://localhost:5005/notification-endpoints")
+ .navigateTo("http://localhost:9090/lambda/notification-endpoints")
.expect(addNotifTargetButtonExists)
.ok();
});
test("Add Notification Target button is clickable", async (t) => {
await t
- .navigateTo("http://localhost:5005/notification-endpoints")
+ .navigateTo("http://localhost:9090/lambda/notification-endpoints")
.click(elements.addNotifTargetButton);
});
diff --git a/portal-ui/tests/permissions/settings.ts b/portal-ui/tests/permissions/settings.ts
index e937f3299..2fb57aed0 100644
--- a/portal-ui/tests/permissions/settings.ts
+++ b/portal-ui/tests/permissions/settings.ts
@@ -16,22 +16,23 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import { settingsElement } from "../utils/elements-menu";
fixture("For user with Settings permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.settings);
});
test("Settings sidebar item exists", async (t) => {
- const settingsExist = elements.settingsElement.exists;
+ const settingsExist = settingsElement.exists;
await t.expect(settingsExist).ok();
});
test("Settings window exists in Settings page", async (t) => {
const settingsWindowExists = elements.settingsWindow.exists;
await t
- .navigateTo("http://localhost:5005/settings")
+ .navigateTo("http://localhost:9090/settings")
.expect(settingsWindowExists)
.ok();
});
@@ -50,7 +51,7 @@ test("All vertical tab items exist", async (t) => {
elements.settingsLoggerWebhookTab.exists;
const settingsAuditWebhookTabExists = elements.settingsAuditWebhookTab.exists;
await t
- .navigateTo("http://localhost:5005/settings")
+ .navigateTo("http://localhost:9090/settings")
.expect(settingsRegionTabExists)
.ok()
.expect(settingsCacheTabExists)
diff --git a/portal-ui/tests/permissions/tiers.ts b/portal-ui/tests/permissions/tiers.ts
index 8ffd126f8..d086132ee 100644
--- a/portal-ui/tests/permissions/tiers.ts
+++ b/portal-ui/tests/permissions/tiers.ts
@@ -16,28 +16,29 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import { tiersElement } from "../utils/elements-menu";
fixture("For user with Tiers permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.tiers);
});
test("Tiers sidebar item exists", async (t) => {
- const tiersExist = elements.tiersElement.exists;
+ const tiersExist = tiersElement.exists;
await t.expect(tiersExist).ok();
});
test("Add Tier button exists", async (t) => {
const createTierButtonExists = elements.createTierButton.exists;
await t
- .navigateTo("http://localhost:5005/tiers")
+ .navigateTo("http://localhost:9090/tiers")
.expect(createTierButtonExists)
.ok();
});
test("Add Tier button is clickable", async (t) => {
await t
- .navigateTo("http://localhost:5005/tiers")
+ .navigateTo("http://localhost:9090/tiers")
.click(elements.createTierButton);
});
diff --git a/portal-ui/tests/permissions/trace.ts b/portal-ui/tests/permissions/trace.ts
index eedd1ec50..84cee6f49 100644
--- a/portal-ui/tests/permissions/trace.ts
+++ b/portal-ui/tests/permissions/trace.ts
@@ -16,6 +16,11 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
+import {
+ monitoringElement,
+ supportElement,
+ traceElement,
+} from "../utils/elements-menu";
fixture("For user with Trace permissions")
.page("http://localhost:9090")
@@ -23,14 +28,17 @@ fixture("For user with Trace permissions")
await t.useRole(roles.trace);
});
-test("Tools sidebar item exists", async (t) => {
- const toolsExist = elements.toolsElement.exists;
- await t.expect(toolsExist).ok();
+test("Monitoring sidebar item exists", async (t) => {
+ await t.expect(monitoringElement.exists).ok();
});
-test("Trace link exists in Tools page", async (t) => {
- const traceLinkExists = elements.traceLink.exists;
- await t.click(elements.toolsElement).expect(traceLinkExists).ok();
+test("Trace link exists in Monitoring menu", async (t) => {
+ await t
+ .expect(monitoringElement.exists)
+ .ok()
+ .click(monitoringElement)
+ .expect(traceElement.exists)
+ .ok();
});
test("Trace page can be opened", async (t) => {
diff --git a/portal-ui/tests/permissions/users.ts b/portal-ui/tests/permissions/users.ts
index c9435d71e..4fd53c6a6 100644
--- a/portal-ui/tests/permissions/users.ts
+++ b/portal-ui/tests/permissions/users.ts
@@ -18,6 +18,7 @@ import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as constants from "../utils/constants";
import { Selector } from "testcafe";
+import { identityElement, usersElement } from "../utils/elements-menu";
const userListItem = Selector(".ReactVirtualized__Table__rowColumn").withText(
constants.TEST_USER_NAME
@@ -29,34 +30,39 @@ const userDeleteIconButton = userListItem
.withAttribute("aria-label", "delete");
fixture("For user with Users permissions")
- .page("http://localhost:5005")
+ .page("http://localhost:9090")
.beforeEach(async (t) => {
await t.useRole(roles.users);
});
test("Users sidebar item exists", async (t) => {
- const usersExist = elements.usersElement.exists;
- await t.expect(usersExist).ok();
+ const usersExist = usersElement.exists;
+ await t
+ .expect(identityElement.exists)
+ .ok()
+ .click(identityElement)
+ .expect(usersExist)
+ .ok();
});
test("Create User button exists", async (t) => {
const createUserButtonExists = elements.createUserButton.exists;
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.expect(createUserButtonExists)
.ok();
});
test("Create User button is clickable", async (t) => {
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(elements.createUserButton);
});
test("Access Key input exists in the Create User modal", async (t) => {
const accessKeyInputExists = elements.usersAccessKeyInput.exists;
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(elements.createUserButton)
.expect(accessKeyInputExists)
.ok();
@@ -65,7 +71,7 @@ test("Access Key input exists in the Create User modal", async (t) => {
test("Secret Key input exists in the Create User modal", async (t) => {
const secretKeyInputExists = elements.usersSecretKeyInput.exists;
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(elements.createUserButton)
.expect(secretKeyInputExists)
.ok();
@@ -73,7 +79,7 @@ test("Secret Key input exists in the Create User modal", async (t) => {
test("Create User modal can be submitted after inputs are entered", async (t) => {
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(elements.createUserButton)
.typeText(elements.usersAccessKeyInput, constants.TEST_USER_NAME)
.typeText(elements.usersSecretKeyInput, constants.TEST_PASSWORD)
@@ -83,7 +89,7 @@ test("Create User modal can be submitted after inputs are entered", async (t) =>
test("Users table exists", async (t) => {
const usersTableExists = elements.table.exists;
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.expect(usersTableExists)
.ok();
});
@@ -91,7 +97,7 @@ test("Users table exists", async (t) => {
test("Created User can be viewed and deleted", async (t) => {
const userListItemExists = userListItem.exists;
await t
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.typeText(elements.searchResourceInput, constants.TEST_USER_NAME)
.expect(userListItemExists)
.ok()
diff --git a/portal-ui/tests/permissions/watch.ts b/portal-ui/tests/permissions/watch.ts
index 1a26e037a..baa2126d5 100644
--- a/portal-ui/tests/permissions/watch.ts
+++ b/portal-ui/tests/permissions/watch.ts
@@ -17,6 +17,11 @@
import * as roles from "../utils/roles";
import * as elements from "../utils/elements";
import * as functions from "../utils/functions";
+import {
+ inspectElement,
+ monitoringElement,
+ supportElement,
+} from "../utils/elements-menu";
fixture("For user with Watch permissions")
.page("http://localhost:9090")
@@ -24,18 +29,21 @@ fixture("For user with Watch permissions")
await t.useRole(roles.watch);
});
-test("Tools sidebar item exists", async (t) => {
- const toolsExist = elements.toolsElement.exists;
- await t.expect(toolsExist).ok();
+test("Support sidebar item exists", async (t) => {
+ await t.expect(supportElement.exists).ok();
});
-test("Watch link exists in Tools page", async (t) => {
- const watchLinkExists = elements.watchLink.exists;
- await t.click(elements.toolsElement).expect(watchLinkExists).ok();
+test("Watch link exists in Support page", async (t) => {
+ await t
+ .expect(supportElement.exists)
+ .ok()
+ .click(supportElement)
+ .expect(inspectElement.exists)
+ .ok();
});
test("Watch page can be opened", async (t) => {
- await t.navigateTo("http://localhost:9090/tools/watch");
+ await t.navigateTo("http://localhost:9090/support/inspect");
});
test
@@ -47,7 +55,7 @@ test
// We need to log back in after we use the admin account to create bucket,
// using the specific role we use in this module
.useRole(roles.watch)
- .navigateTo("http://localhost:9090/tools/watch")
+ .navigateTo("http://localhost:9090/support/inspect")
.click(elements.bucketNameInput)
.click(elements.bucketDropdownOption)
.click(elements.startButton);
diff --git a/portal-ui/tests/utils/elements-menu.ts b/portal-ui/tests/utils/elements-menu.ts
new file mode 100644
index 000000000..e5b3b66d6
--- /dev/null
+++ b/portal-ui/tests/utils/elements-menu.ts
@@ -0,0 +1,98 @@
+// This file is part of MinIO Console Server
+// Copyright (c) 2022 MinIO, Inc.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see .
+
+import * as constants from "./constants";
+import { Selector } from "testcafe";
+
+//----------------------------------------------------
+// General sidebar element
+//----------------------------------------------------
+export const sidebarItem = Selector(".MuiPaper-root").find("ul").child("a");
+export const logoutItem = Selector(".MuiPaper-root").find("ul").child("div");
+
+//----------------------------------------------------
+// Specific sidebar elements
+//----------------------------------------------------
+export const monitoringElement = Selector(".MuiPaper-root")
+ .find("ul")
+ .child("#tools");
+export const monitoringChildren = Selector("#tools-children");
+export const dashboardElement = monitoringChildren
+ .find("a")
+ .withAttribute("href", "/tools/dashboard");
+export const logsElement = monitoringChildren
+ .find("a")
+ .withAttribute("href", "/tools/logs");
+export const traceElement = monitoringChildren
+ .find("a")
+ .withAttribute("href", "/tools/trace");
+export const drivesElement = monitoringChildren
+ .find("a")
+ .withAttribute("href", "/tools/heal");
+
+export const bucketsElement = sidebarItem.withAttribute("href", "/buckets");
+
+export const identityElement = Selector(".MuiPaper-root")
+ .find("ul")
+ .child("#identity");
+export const identityChildren = Selector("#identity-children");
+
+export const usersElement = identityChildren
+ .find("a")
+ .withAttribute("href", "/identity/users");
+export const groupsElement = identityChildren
+ .find("a")
+ .withAttribute("href", "/identity/groups");
+export const serviceAcctsElement = identityChildren
+ .find("a")
+ .withAttribute("href", "/identity/account");
+
+export const iamPoliciesElement = sidebarItem.withAttribute(
+ "href",
+ "/access/policies"
+);
+export const settingsElement = sidebarItem.withAttribute("href", "/settings");
+export const notificationEndpointsElement = sidebarItem.withAttribute(
+ "href",
+ "/lambda/notification-endpoints"
+);
+export const tiersElement = sidebarItem.withAttribute("href", "/tiers");
+
+export const supportElement = Selector(".MuiPaper-root")
+ .find("ul")
+ .child("#support");
+export const supportChildren = Selector("#support-children");
+
+export const registerElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/register");
+export const diagnosticsElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/diagnostics");
+export const performanceElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/speedtest");
+export const callHomeElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/call-home");
+export const inspectElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/inspect");
+export const profileElement = supportChildren
+ .find("a")
+ .withAttribute("href", "/support/profile");
+
+export const licenseElement = sidebarItem.withAttribute("href", "/license");
diff --git a/portal-ui/tests/utils/elements.ts b/portal-ui/tests/utils/elements.ts
index 785fe8eb2..3b4071608 100644
--- a/portal-ui/tests/utils/elements.ts
+++ b/portal-ui/tests/utils/elements.ts
@@ -17,36 +17,6 @@
import * as constants from "./constants";
import { Selector } from "testcafe";
-//----------------------------------------------------
-// General sidebar element
-//----------------------------------------------------
-export const sidebarItem = Selector(".MuiPaper-root").find("ul").child("a");
-export const logoutItem = Selector(".MuiPaper-root").find("ul").child("div");
-
-//----------------------------------------------------
-// Specific sidebar elements
-//----------------------------------------------------
-export const dashboardElement = sidebarItem.withAttribute("href", "/dashboard");
-export const bucketsElement = sidebarItem.withAttribute("href", "/buckets");
-export const usersElement = sidebarItem.withAttribute("href", "/users");
-export const groupsElement = sidebarItem.withAttribute("href", "/groups");
-export const serviceAcctsElement = sidebarItem.withAttribute(
- "href",
- "/account"
-);
-export const iamPoliciesElement = sidebarItem.withAttribute(
- "href",
- "/policies"
-);
-export const settingsElement = sidebarItem.withAttribute("href", "/settings");
-export const notificationEndpointsElement = sidebarItem.withAttribute(
- "href",
- "/notification-endpoints"
-);
-export const tiersElement = sidebarItem.withAttribute("href", "/tiers");
-export const toolsElement = sidebarItem.withAttribute("href", "/tools");
-export const licenseElement = sidebarItem.withAttribute("href", "/license");
-
//----------------------------------------------------
// Buttons
//----------------------------------------------------
@@ -59,7 +29,7 @@ export const manageButton = Selector("h1")
.parent(4)
.find("button:enabled")
.withText("Manage");
-export const browseButton = Selector("h1")
+export const testBucketBrowseButton = Selector("h1")
.withText(constants.TEST_BUCKET_NAME)
.parent(4)
.find("button:enabled")
@@ -175,15 +145,15 @@ export const bucketAccessText = Selector("h1")
.parent(1)
.find("p")
.nth(-1);
-export const groupStatusText = Selector('span[class*="statusValue-"]');
+export const groupStatusText = Selector("#group-status");
//----------------------------------------------------
// Tables, table headers and content
//----------------------------------------------------
export const table = Selector(".ReactVirtualized__Table");
-export const bucketsTableDisabled = Selector(
- 'div[class*="TableWrapper-disabled"]'
-);
+export const bucketsTableDisabled = Selector("#object-list-wrapper")
+ .find(".MuiPaper-root")
+ .withText("This location is empty, please try uploading a new file");
export const createGroupUserTable = Selector(
".MuiDialog-container .ReactVirtualized__Table"
);
@@ -197,9 +167,7 @@ export const bucketAccessRulesTab =
//----------------------------------------------------
// Settings window
//----------------------------------------------------
-export const settingsWindow = Selector(
- 'div[class*="ConfigurationOptions-settingsOptionsContainer"]'
-);
+export const settingsWindow = Selector("#settings-container");
//----------------------------------------------------
// Settings page vertical tabs
@@ -252,4 +220,4 @@ export const settingsAuditWebhookTab = Selector(".MuiTab-root").withAttribute(
//----------------------------------------------------
// Log window
//----------------------------------------------------
-export const logWindow = Selector('div[class*="logList"]');
+export const logWindow = Selector("#logs-container");
diff --git a/portal-ui/tests/utils/functions.ts b/portal-ui/tests/utils/functions.ts
index 9edd9601d..37229886a 100644
--- a/portal-ui/tests/utils/functions.ts
+++ b/portal-ui/tests/utils/functions.ts
@@ -18,30 +18,31 @@ import * as roles from "./roles";
import * as elements from "./elements";
import * as constants from "./constants";
import { Selector } from "testcafe";
+import { logoutItem } from "./elements-menu";
export const setUpBucket = (t) => {
return t
.useRole(roles.admin)
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.createBucketButton)
.typeText(elements.bucketNameInput, constants.TEST_BUCKET_NAME)
.click(elements.createBucketButton)
- .click(elements.logoutItem);
+ .click(logoutItem);
};
export const cleanUpBucket = (t) => {
return (
t
// useRole doesn't work here so we would need to enter the commands manually
- .navigateTo("http://localhost:5005/login")
+ .navigateTo("http://localhost:9090/login")
.typeText("#accessKey", "minioadmin")
.typeText("#secretKey", "minioadmin")
.click(elements.loginSubmitButton)
- .navigateTo("http://localhost:5005/buckets")
+ .navigateTo("http://localhost:9090/buckets")
.click(elements.manageButton)
.click(elements.deleteBucketButton)
.click(elements.deleteButton)
- .click(elements.logoutItem)
+ .click(logoutItem)
);
};
@@ -49,25 +50,25 @@ export const cleanUpBucketAndUploads = (t) => {
return (
t
// useRole doesn't work here so we would need to enter the commands manually
- .navigateTo("http://localhost:5005/login")
+ .navigateTo("http://localhost:9090/login")
.typeText("#accessKey", "minioadmin")
.typeText("#secretKey", "minioadmin")
.click(elements.loginSubmitButton)
- .navigateTo("http://localhost:5005/buckets")
- .click(elements.browseButton)
+ .navigateTo("http://localhost:9090/buckets")
+ .click(elements.testBucketBrowseButton)
.click(elements.deleteIconButtonAlt)
.click(elements.deleteButton)
.click(elements.configureBucketButton)
.click(elements.deleteBucketButton)
.click(elements.deleteButton)
- .click(elements.logoutItem)
+ .click(logoutItem)
);
};
export const createUser = (t) => {
return t
.useRole(roles.admin)
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(elements.createUserButton)
.typeText(elements.usersAccessKeyInput, constants.TEST_USER_NAME)
.typeText(elements.usersSecretKeyInput, constants.TEST_PASSWORD)
@@ -86,7 +87,7 @@ export const cleanUpUser = (t) => {
return t
.useRole(roles.admin)
- .navigateTo("http://localhost:5005/users")
+ .navigateTo("http://localhost:9090/identity/users")
.click(userDeleteIconButton)
.click(elements.deleteButton);
};
diff --git a/portal-ui/tests/utils/roles.ts b/portal-ui/tests/utils/roles.ts
index b6c83155c..bcf0b62ad 100644
--- a/portal-ui/tests/utils/roles.ts
+++ b/portal-ui/tests/utils/roles.ts
@@ -4,7 +4,7 @@ import { Role, Selector } from "testcafe";
const data = readFileSync(__dirname + "/../constants/timestamp.txt", "utf-8");
const unixTimestamp = data.trim();
-const loginUrl = "http://localhost:5005/login";
+const loginUrl = "http://localhost:9090/login";
// diagnostics/watch/trace need to run in port 9090 (through the server) to work
const loginUrlServer = "http://localhost:9090/login";
const submitButton = Selector("form button");