Skip to content

Commit 47dccfd

Browse files
committed
no access control if acl is not enabled
1 parent fe3b127 commit 47dccfd

2 files changed

Lines changed: 7 additions & 4 deletions

File tree

packages/browser-tests/cypress/integration/console/topbar.spec.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,8 @@ describe("TopBar", () => {
5353
cy.getByDataHook("topbar-instance-color-option-g").click();
5454
cy.getByDataHook("topbar-instance-save-button").click();
5555
cy.getByDataHook("topbar-instance-save-button").should("not.exist");
56-
cy.getByDataHook("topbar-instance-name").should(
57-
"have.text",
58-
"Production | test-instance"
59-
);
56+
cy.getByDataHook("topbar-instance-name").should("contain", "Production");
57+
cy.getByDataHook("topbar-instance-name").should("contain", "test-instance");
6058
cy.getByDataHook("topbar-instance-icon").realHover();
6159
cy.contains("test description of the test instance").should("be.visible");
6260
cy.contains(

packages/web-console/src/components/TopBar/toolbar.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,11 @@ export const Toolbar = () => {
347347
}
348348

349349
const fetchEditSettingsPermission = async (currentUser: string | null) => {
350+
if (!settings["acl.enabled"]) {
351+
setCanEditInstanceName(true)
352+
return
353+
}
354+
350355
if (!currentUser) {
351356
setCanEditInstanceName(false)
352357
return

0 commit comments

Comments
 (0)