Skip to content

chore: Deduplicate session lock/unlock code #4708

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 1 commit into from
Aug 4, 2020
Merged

chore: Deduplicate session lock/unlock code #4708

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
69 changes: 23 additions & 46 deletions app/controllers/events/view/sessions/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
extraValuePaths : ['isLocked'],
cellComponent : 'ui-table/cell/events/view/sessions/cell-lock-session',
actions : {
unlockSession : this.unlockSession.bind(this),
lockSession : this.lockSession.bind(this)
lockSession: this.lockSession.bind(this)
}
}
];
Expand Down Expand Up @@ -137,51 +136,29 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
}

@action
lockSession(session_id) {
let session = this.store.peekRecord('session', session_id, { backgroundReload: false });
session.set('isLocked', true);
this.set('isLoading', true);
session.save()
.then(() => {
this.notify.success(this.l10n.t('Session has been locked successfully.'),
{
id: 'session_locked'
});
this.refreshModel.bind(this)();
})
.catch(() => {
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'session_lock_error'
});
})
.finally(() => {
this.set('isLoading', false);
});
}

@action
unlockSession(session_id) {
let session = this.store.peekRecord('session', session_id, { backgroundReload: false });
session.set('isLocked', false);
async lockSession(session_id, lock) {
const session = this.store.peekRecord('session', session_id, { backgroundReload: false });
const { isLocked } = session;
session.set('isLocked', lock);
this.set('isLoading', true);
session.save()
.then(() => {
this.notify.success(this.l10n.t('Session has been unlocked successfully.'),
{
id: 'session_unlock'
});
this.refreshModel.bind(this)();
})
.catch(() => {
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'session_unexpected_unlock'
});
})
.finally(() => {
this.set('isLoading', false);
});
const lockMessage = lock ? 'locked' : 'unlocked';
try {
await session.save();
this.notify.success(this.l10n.t(`Session has been ${ lockMessage } successfully.`),
{
id: 'session_lock'
});
this.refreshModel.bind(this)();
} catch (e) {
session.set('isLocked', isLocked);
console.error('Error while changing session lock in organizer session list', e);
this.notify.error(this.l10n.t('An unexpected error has occurred.'),
{
id: 'session_unexpected_lock'
});
} finally {
this.set('isLoading', false);
}
}

@action
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/ui-table/cell/events/view/sessions/cell-lock-session.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{{#if this.extraRecords.isLocked}}
<UiPopup @content={{t "Unlock Session"}} @class="ui basic button" @click={{action this.props.actions.unlockSession this.record}} @position="left center">
<UiPopup @content={{t "Unlock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record false}} @position="left center">
<i class="lock icon"></i>
</UiPopup>
{{else}}
<UiPopup @content={{t "Lock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record}} @position="left center">
<UiPopup @content={{t "Lock Session"}} @class="ui basic button" @click={{action this.props.actions.lockSession this.record true}} @position="left center">
<i class="unlock icon"></i>
</UiPopup>
{{/if}}