Skip to content

Hide advanced settings during room creation when UIFeature.advancedSettings=false #30684

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 3, 2025
Merged

Hide advanced settings during room creation when UIFeature.advancedSettings=false #30684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fddb9d
fix: hide advanced settings during room creation when UI.advancedSett…
florianduros Sep 3, 2025
9a31517
test: add tests
florianduros Sep 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions src/components/views/dialogs/CreateRoomDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { KeyBindingAction } from "../../../accessibility/KeyboardShortcuts";
import { privateShouldBeEncrypted } from "../../../utils/rooms";
import SettingsStore from "../../../settings/SettingsStore";
import LabelledCheckbox from "../elements/LabelledCheckbox";
import { UIFeature } from "../../../settings/UIFeature";

interface IProps {
type?: RoomType;
Expand Down Expand Up @@ -83,6 +84,7 @@ interface IState {

export default class CreateRoomDialog extends React.Component<IProps, IState> {
private readonly askToJoinEnabled: boolean;
private readonly advancedSettingsEnabled: boolean;
private readonly supportsRestricted: boolean;
private nameField = createRef<Field>();
private aliasField = createRef<RoomAliasField>();
Expand All @@ -91,6 +93,8 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
super(props);

this.askToJoinEnabled = SettingsStore.getValue("feature_ask_to_join");
this.advancedSettingsEnabled = SettingsStore.getValue(UIFeature.AdvancedSettings);

this.supportsRestricted = !!this.props.parentSpace;

let joinRule = JoinRule.Invite;
Expand Down Expand Up @@ -427,19 +431,21 @@ export default class CreateRoomDialog extends React.Component<IProps, IState> {
{visibilitySection}
{e2eeSection}
{aliasField}
<details onToggle={this.onDetailsToggled} className="mx_CreateRoomDialog_details">
<summary className="mx_CreateRoomDialog_details_summary">
{this.state.detailsOpen ? _t("action|hide_advanced") : _t("action|show_advanced")}
</summary>
<LabelledToggleSwitch
label={_t("create_room|unfederated", {
serverName: MatrixClientPeg.safeGet().getDomain(),
})}
onChange={this.onNoFederateChange}
value={this.state.noFederate}
/>
<p>{federateLabel}</p>
</details>
{this.advancedSettingsEnabled && (
<details onToggle={this.onDetailsToggled} className="mx_CreateRoomDialog_details">
<summary className="mx_CreateRoomDialog_details_summary">
{this.state.detailsOpen ? _t("action|hide_advanced") : _t("action|show_advanced")}
</summary>
<LabelledToggleSwitch
label={_t("create_room|unfederated", {
serverName: MatrixClientPeg.safeGet().getDomain(),
})}
onChange={this.onNoFederateChange}
value={this.state.noFederate}
/>
<p>{federateLabel}</p>
</details>
)}
</div>
</form>
<DialogButtons
Expand Down
13 changes: 12 additions & 1 deletion test/unit-tests/components/views/dialogs/CreateRoomDialog-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { JoinRule, MatrixError, Preset, Visibility } from "matrix-js-sdk/src/mat
import CreateRoomDialog from "../../../../../src/components/views/dialogs/CreateRoomDialog";
import { flushPromises, getMockClientWithEventEmitter, mockClientMethodsUser } from "../../../../test-utils";
import SettingsStore from "../../../../../src/settings/SettingsStore";
import { UIFeature } from "../../../../../src/settings/UIFeature";

describe("<CreateRoomDialog />", () => {
const userId = "@alice:server.org";
Expand Down Expand Up @@ -181,8 +182,9 @@ describe("<CreateRoomDialog />", () => {

it("should create a private room", async () => {
const onFinished = jest.fn();
getComponent({ onFinished });
const { asFragment } = getComponent({ onFinished });
await flushPromises();
expect(asFragment()).toMatchSnapshot();

const roomName = "Test Room Name";
fireEvent.change(screen.getByLabelText("Name"), { target: { value: roomName } });
Expand All @@ -199,6 +201,15 @@ describe("<CreateRoomDialog />", () => {
roomType: undefined,
});
});

it("should render not the advanced options when UI.advancedSettings is disabled", async () => {
jest.spyOn(SettingsStore, "getValue").mockImplementation(
(setting) => setting !== UIFeature.AdvancedSettings,
);
const { asFragment } = getComponent();
await flushPromises();
expect(asFragment()).toMatchSnapshot();
});
});

describe("for a knock room", () => {
Expand Down
Loading
Loading