remove hackey code and use proper typescript (mattermost#5208)

Revanth47 · Mar 30, 2020 · 456055e · 456055e
1 parent 2de33f5
commit 456055e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/components/admin_console/team_channel_settings/channel/details/channel_details.tsx b/components/admin_console/team_channel_settings/channel/details/channel_details.tsx
@@ -146,7 +146,7 @@ export default class ChannelDetails extends React.Component<ChannelDetailsProps,
  private restrictChannelMentions() {
  // Disabling use_channel_mentions on every role that create_post is either disabled or has a value of false
  let channelPermissions = this.props.channelPermissions;
- const currentCreatePostRoles: any = channelPermissions!.find((element) => element.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.CREATE_POST)?.['roles'];
+ const currentCreatePostRoles: any = channelPermissions!.find((element) => element.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.CREATE_POST)?.roles;
  for (const channelRole of Object.keys(currentCreatePostRoles)) {
  channelPermissions = channelPermissions!.map((permission) => {
  if (permission.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.USE_CHANNEL_MENTIONS && (!currentCreatePostRoles[channelRole].value || !currentCreatePostRoles[channelRole].enabled)) {
@@ -238,7 +238,7 @@ export default class ChannelDetails extends React.Component<ChannelDetailsProps,
  let channelPermissions = [...this.state.channelPermissions!];
 
  if (name === Permissions.CHANNEL_MODERATED_PERMISSIONS.CREATE_POST) {
- const originalObj = this.props.channelPermissions!.find((element) => element.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.USE_CHANNEL_MENTIONS)?.['roles']![channelRole];
+ const originalObj = this.props.channelPermissions!.find((element) => element.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.USE_CHANNEL_MENTIONS)?.roles![channelRole];
  channelPermissions = channelPermissions.map((permission) => {
  if (permission.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.USE_CHANNEL_MENTIONS && !newValue) {
  return {
@@ -257,8 +257,8 @@ export default class ChannelDetails extends React.Component<ChannelDetailsProps,
  roles: {
  ...permission.roles,
  [channelRole]: {
- value: originalObj?.['value'],
- enabled: originalObj?.['enabled'],
+ value: originalObj?.value,
+ enabled: originalObj?.enabled,
  }
  }
  };
@@ -497,7 +497,7 @@ export default class ChannelDetails extends React.Component<ChannelDetailsProps,
  <ChannelModeration
  channelPermissions={channelPermissions}
  onChannelPermissionsChanged={this.channelPermissionsChanged}
- teamSchemeID={teamScheme?.['id']}
+ teamSchemeID={teamScheme?.id}
  teamSchemeDisplayName={teamScheme?.['display_name']}
  guestAccountsEnabled={this.props.guestAccountsEnabled}
  />

diff --git a/components/admin_console/team_channel_settings/channel/details/channel_moderation.tsx b/components/admin_console/team_channel_settings/channel/details/channel_moderation.tsx
@@ -254,7 +254,7 @@ export const ChannelModerationTableRow: React.FunctionComponent<RowProps> = (pro
 export default class ChannelModeration extends React.Component<Props> {
  private errorMessagesToDisplay = (entry: ChannelPermissions): Array<any> => {
  const errorMessages: Array<any> = [];
- const isGuestsDisabled = !isNil(entry.roles.guests?.['enabled']) && !entry.roles.guests?.['enabled'] && this.props.guestAccountsEnabled;
+ const isGuestsDisabled = !isNil(entry.roles.guests?.enabled) && !entry.roles.guests?.enabled && this.props.guestAccountsEnabled;
  const isMembersDisabled = !entry.roles.members.enabled;
  let createPostsKey = '';
  if (entry.name === Permissions.CHANNEL_MODERATED_PERMISSIONS.USE_CHANNEL_MENTIONS) {
@@ -369,13 +369,13 @@ export default class ChannelModeration extends React.Component<Props> {
  </tr>
  </thead>
  <tbody>
- {channelPermissions && channelPermissions.map((entry) => {
+ {channelPermissions?.map((entry) => {
  return (
  <ChannelModerationTableRow
  key={entry.name}
  name={entry.name}
- guests={entry.roles.guests?.['value']}
- guestsDisabled={!entry.roles.guests?.['enabled']}
+ guests={entry.roles.guests?.value}
+ guestsDisabled={!entry.roles.guests?.enabled}
  members={entry.roles.members.value}
  membersDisabled={!entry.roles.members.enabled}
  onClick={onChannelPermissionsChanged}