Skip to content
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

Jump to bottom

[FIX] Unarchive permission not honored #3237

Merged
merged 10 commits into from
Aug 16, 2021
Merged

[FIX] Unarchive permission not honored #3237

Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a8a2d4d
[FIX] Show alert when unarchive error
reinaldonetof Jun 23, 2021
50c38cf
Title in alert
reinaldonetof Jun 23, 2021
d238aa3
Disable button when the user donesn't have the role permission
reinaldonetof Jun 23, 2021
0a6aad1
Use ARCHIVE/UNARCHIVE instead of their lowercase in alert and removed…
reinaldonetof Jun 24, 2021
2c5ac0a
Check if the error eis translated before parse through i18n
reinaldonetof Jul 5, 2021
944b658
Merge branch 'develop' into fix.unarchive-rooms
reinaldonetof Jul 13, 2021
b4e7ce5
Merge branch 'develop' into fix.unarchive-rooms
diegolmello Jul 22, 2021
c36050a
Remove unnecessary code
diegolmello Jul 22, 2021
8a79b73
Merge branch 'develop' into fix.unarchive-rooms
reinaldonetof Jul 22, 2021
a7790b3
Merge branch 'develop' into fix.unarchive-rooms
LevyCosta Jul 29, 2021
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
12 changes: 5 additions & 7 deletions app/views/RoomInfoEditView/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import { MessageTypeValues } from '../../utils/messageTypes';
import SafeAreaView from '../../containers/SafeAreaView';
import Avatar from '../../containers/Avatar';
import { CustomIcon } from '../../lib/Icons';
import i18nEnJson from '../../i18n/locales/en.json';

const PERMISSION_SET_READONLY = 'set-readonly';
const PERMISSION_SET_REACT_WHEN_READONLY = 'set-react-when-readonly';
Expand Down Expand Up @@ -393,6 +394,8 @@ class RoomInfoEditView extends React.Component {
} catch (e) {
logEvent(events.RI_EDIT_TOGGLE_ARCHIVE_F);
log(e);
const errorType = e?.data?.errorType || e?.data?.error;
showErrorAlert(i18nEnJson[errorType] ? I18n.t(errorType) : errorType);
}
}
}
Expand All @@ -415,11 +418,6 @@ class RoomInfoEditView extends React.Component {
return permissions[PERMISSION_DELETE_C];
}

hasArchivePermission = () => {
const { permissions } = this.state;
return (permissions[PERMISSION_ARCHIVE] || permissions[PERMISSION_UNARCHIVE]);
};

renderSystemMessages = () => {
const { systemMessages, enableSysMes } = this.state;
const { theme } = this.props;
Expand Down Expand Up @@ -691,11 +689,11 @@ class RoomInfoEditView extends React.Component {
style={[
styles.buttonInverted,
styles.buttonContainer_inverted,
!this.hasArchivePermission() && sharedStyles.opacity5,
archived ? !permissions[PERMISSION_UNARCHIVE] && sharedStyles.opacity5 : !permissions[PERMISSION_ARCHIVE] && sharedStyles.opacity5,
{ flex: 1, marginLeft: 10, borderColor: dangerColor }
]}
onPress={this.toggleArchive}
disabled={!this.hasArchivePermission()}
disabled={archived ? !permissions[PERMISSION_UNARCHIVE] : !permissions[PERMISSION_ARCHIVE]}
testID={archived ? 'room-info-edit-view-unarchive' : 'room-info-edit-view-archive'}
>
<Text
Expand Down