OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Iterate PR

pull/21833/head
Michael Telatynski 2021-06-22 22:01:18 +01:00
parent 5098a304c9
commit 5dc542f189
7 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/views/dialogs/SpaceSettingsDialog.tsx
View File

@ -91,4 +91,3 @@ const SpaceSettingsDialog: React.FC<IProps> = ({ matrixClient: cli, space, onFin
};
export default SpaceSettingsDialog;

2
src/components/views/elements/LabelledToggleSwitch.tsx
View File

@ -1,5 +1,5 @@
/*
Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

14
src/components/views/elements/RoomAliasField.tsx
View File

@ -1,5 +1,5 @@
/*
Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -39,9 +39,13 @@ interface IState {
export default class RoomAliasField extends React.PureComponent<IProps, IState> {
private fieldRef = createRef<Field>();
public state = {
constructor(props, context) {
super(props, context);
this.state = {
isValid: true,
};
}
private asFullAlias(localpart: string): string {
return `#${localpart}:${this.props.domain}`;
@ -123,15 +127,15 @@ export default class RoomAliasField extends React.PureComponent<IProps, IState>
],
});
get isValid() {
public get isValid() {
return this.state.isValid;
}
validate(options: IValidateOpts) {
public validate(options: IValidateOpts) {
return this.fieldRef.current?.validate(options);
}
focus() {
public focus() {
this.fieldRef.current?.focus();
}
}

8
src/components/views/room_settings/RoomPublishSetting.tsx
View File

@ -1,5 +1,5 @@
/*
Copyright 2020, 2021 The Matrix.org Foundation C.I.C.
Copyright 2020 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -33,9 +33,13 @@ interface IState {
@replaceableComponent("views.room_settings.RoomPublishSetting")
export default class RoomPublishSetting extends React.PureComponent<IProps, IState> {
public state = {
constructor(props, context) {
super(props, context);
this.state = {
isRoomPublished: false,
};
}
private onRoomPublishChange = (e) => {
const valueBefore = this.state.isRoomPublished;

9
src/components/views/settings/tabs/room/AdvancedRoomSettingsTab.tsx
View File

@ -1,5 +1,5 @@
/*
Copyright 2019, 2021 The Matrix.org Foundation C.I.C.
Copyright 2019 - 2021 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@ -15,6 +15,7 @@ limitations under the License.
*/
import React from 'react';
import { EventType } from 'matrix-js-sdk/src/@types/event';
import { _t } from "../../../../../languageHandler";
import { MatrixClientPeg } from "../../../../../MatrixClientPeg";
@ -56,10 +57,10 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
// we handle lack of this object gracefully later, so don't worry about it failing here.
const room = MatrixClientPeg.get().getRoom(this.props.roomId);
room.getRecommendedVersion().then((v) => {
const tombstone = room.currentState.getStateEvents("m.room.tombstone", "");
const tombstone = room.currentState.getStateEvents(EventType.RoomTombstone, "");
const additionalStateChanges: Partial<IState> = {};
const createEvent = room.currentState.getStateEvents("m.room.create", "");
const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, "");
const predecessor = createEvent ? createEvent.getContent().predecessor : null;
if (predecessor && predecessor.room_id) {
additionalStateChanges.oldRoomId = predecessor.room_id;
@ -100,7 +101,7 @@ export default class AdvancedRoomSettingsTab extends React.Component<IProps, ISt
const room = client.getRoom(this.props.roomId);
let unfederatableSection;
const createEvent = room.currentState.getStateEvents('m.room.create', '');
const createEvent = room.currentState.getStateEvents(EventType.RoomCreate, '');
if (createEvent && createEvent.getContent()['m.federate'] === false) {
unfederatableSection = <div>{ _t('This room is not accessible by remote Matrix servers') }</div>;
}