Skip to content

Commit 3bf66cf

Browse files
Haider8Haider8
authored
fix: Enable link on view and edit in event overview (#4643)
1 parent c66b5aa commit 3bf66cf

File tree

9 files changed

+44
-87
lines changed

9 files changed

+44
-87
lines changed

‎app/controllers/admin/events/list.js

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
2222
hasRestorePrivileges: this.hasRestorePrivileges
2323
},
2424
actions: {
25-
moveToDetails : this.moveToDetails.bind(this),
26-
editEvent : this.editEvent.bind(this),
2725
openDeleteEventModal : this.openDeleteEventModal.bind(this),
2826
deleteEvent : this.deleteEvent.bind(this),
2927
restoreEvent : this.restoreEvent.bind(this)
@@ -104,25 +102,15 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
104102
}
105103

106104
@action
107-
moveToDetails(id) {
108-
this.transitionToRoute('events.view', id);
105+
openDeleteEventModal(id, name) {
106+
this.setProperties({
107+
isEventDeleteModalOpen : true,
108+
confirmName : '',
109+
eventName : name,
110+
eventId : id
111+
});
109112
}
110113

111-
@action
112-
editEvent(id) {
113-
this.transitionToRoute('events.view.edit.basic-details', id);
114-
}
115-
116-
@action
117-
openDeleteEventModal(id, name) {
118-
this.setProperties({
119-
isEventDeleteModalOpen : true,
120-
confirmName : '',
121-
eventName : name,
122-
eventId : id
123-
});
124-
}
125-
126114
@action
127115
async deleteEvent() {
128116
this.set('isLoading', true);

‎app/controllers/admin/users/view/events/list.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
2121
hasRestorePrivileges: this.hasRestorePrivileges
2222
},
2323
actions: {
24-
moveToDetails : this.moveToDetails.bind(this),
25-
editEvent : this.editEvent.bind(this),
2624
openDeleteEventModal : this.openDeleteEventModal.bind(this),
2725
deleteEvent : this.deleteEvent.bind(this),
2826
restoreEvent : this.restoreEvent.bind(this)
@@ -61,16 +59,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
6159
];
6260
}
6361

64-
@action
65-
moveToDetails(id) {
66-
this.transitionToRoute('events.view', id);
67-
}
68-
69-
@action
70-
editEvent(id) {
71-
this.transitionToRoute('events.view.edit.basic-details', id);
72-
}
73-
7462
@action
7563
openDeleteEventModal(id, name) {
7664
this.setProperties({

‎app/controllers/events/list.js

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
1616
cellComponent : 'ui-table/cell/cell-event-general',
1717
options : {
1818
dateFormat: 'MMMM DD, YYYY - HH:mm A'
19-
},
20-
actions: {
21-
moveToPublic : this.moveToPublic.bind(this),
22-
moveToDetails : this.moveToDetails.bind(this),
23-
editEvent : this.editEvent.bind(this)
2419
}
2520
},
2621
{
@@ -59,21 +54,6 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
5954
];
6055
}
6156

62-
@action
63-
moveToPublic(id) {
64-
this.transitionToRoute('public', id);
65-
}
66-
67-
@action
68-
moveToDetails(id) {
69-
this.transitionToRoute('events.view', id);
70-
}
71-
72-
@action
73-
editEvent(id) {
74-
this.transitionToRoute('events.view.edit.basic-details', id);
75-
}
76-
7757
@action
7858
openDeleteEventModal(id, name) {
7959
this.setProperties({

‎app/templates/components/ui-table/cell/cell-buttons.hbs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
<div class="ui {{if this.device.isMobile 'horizontal' 'vertical'}} compact basic buttons">
2-
<UiPopup @tagName="a" @click={{action this.moveToDetails this.record.identifier}} @content={{t "View"}} @class="ui icon button" @position="left center">
3-
<i class="unhide icon"></i>
4-
</UiPopup>
5-
<UiPopup @content={{t "Edit"}} @click={{action this.editEvent this.record.identifier}} @class="ui icon button" @position="left center">
6-
<i class="edit icon"></i>
7-
</UiPopup>
2+
<LinkTo @route="events.view" @model={{this.record.identifier}}>
3+
<UiPopup @content={{t "View"}} @class="ui icon button" @position="left center">
4+
<i class="unhide icon"></i>
5+
</UiPopup>
6+
</LinkTo>
7+
<LinkTo @route="events.view.edit.basic-details" @model={{this.record.identifier}}>
8+
<UiPopup @content={{t "Edit"}} @class="ui icon button" @position="left center">
9+
<i class="edit icon"></i>
10+
</UiPopup>
11+
</LinkTo>
812
{{#if (and this.hasRestorePrivileges (get this.record this.column.propertyName))}}
913
<UiPopup @content={{t "Restore"}} @click={{action this.restoreEvent this.record}} @class="ui icon button" @position="left center">
1014
<i class="undo icon"></i>

‎app/templates/components/ui-table/cell/cell-event-general.hbs

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,19 @@
22
<img src="{{if this.extraRecords.logoUrl this.extraRecords.logoUrl '/images/placeholders/Other.jpg'}}" alt="Event Logo" class="ui image"> <br> {{this.record}}
33
</div>
44
<div class="ui horizontal large basic buttons">
5-
<UiPopup @tagName="a" @click={{action this.props.actions.moveToDetails this.extraRecords.identifier}} @content={{t "Event Dashboard"}} @class="ui icon button" @position="top center">
6-
<i class="tasks icon"></i>
7-
</UiPopup>
8-
<UiPopup @tagName="a" @click={{action this.props.actions.moveToPublic this.extraRecords.identifier}} @content={{t "View"}} @class="ui icon button" @position="top center">
9-
<i class="unhide icon"></i>
10-
</UiPopup>
11-
<UiPopup @content={{t "Edit"}} @click={{action this.props.actions.editEvent this.extraRecords.identifier}} @class="ui icon button" @position="top center">
12-
<i class="edit icon"></i>
13-
</UiPopup>
5+
<LinkTo @route="events.view" @model={{this.extraRecords.identifier}}>
6+
<UiPopup @content={{t "Event Dashboard"}} @class="ui icon button" @position="top center">
7+
<i class="tasks icon"></i>
8+
</UiPopup>
9+
</LinkTo>
10+
<LinkTo @route="public" @model={{this.extraRecords.identifier}}>
11+
<UiPopup @content={{t "View"}} @class="ui icon button" @position="top center">
12+
<i class="unhide icon"></i>
13+
</UiPopup>
14+
</LinkTo>
15+
<LinkTo @route="events.view.edit.basic-details" @model={{this.extraRecords.identifier}}>
16+
<UiPopup @content={{t "Edit"}} @class="ui icon button" @position="top center">
17+
<i class="edit icon"></i>
18+
</UiPopup>
19+
</LinkTo>
1420
</div>

‎app/templates/components/ui-table/cell/cell-event.hbs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33
</div>
44

55
<div class="ui horizontal compact basic buttons">
6-
<UiPopup @tagName="a" @click={{action this.props.actions.moveToDetails this.extraRecords.identifier}} @content={{t "View"}} @class="ui icon button" @position="left center">
7-
<i class="unhide icon"></i>
8-
</UiPopup>
9-
<UiPopup @content={{t "Edit"}} @click={{action this.props.actions.editEvent this.extraRecords.identifier}} @class="ui icon button" @position="left center">
10-
<i class="edit icon"></i>
11-
</UiPopup>
6+
<LinkTo @route="events.view" @model={{this.extraRecords.identifier}}>
7+
<UiPopup @content={{t "View"}} @class="ui icon button" @position="left center">
8+
<i class="unhide icon"></i>
9+
</UiPopup>
10+
</LinkTo>
11+
<LinkTo @route="events.view.edit.basic-details" @model={{this.extraRecords.identifier}}>
12+
<UiPopup @content={{t "Edit"}} @class="ui icon button" @position="left center">
13+
<i class="edit icon"></i>
14+
</UiPopup>
15+
</LinkTo>
1216
{{#if (and this.props.options.hasRestorePrivileges this.extraRecords.deletedAt)}}
1317
<UiPopup @content={{t "Restore"}} @click={{action this.props.actions.restoreEvent this.extraRecords.identifier}} @class="ui icon button" @position="left center">
1418
<i class="undo icon"></i>

‎tests/integration/components/ui-table/cell/cell-buttons-test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,8 @@ module('Integration | Component | ui table/cell/cell buttons', function(hooks) {
77
setupIntegrationTest(hooks);
88

99
test('it renders', async function(assert) {
10-
this.set('editEvent', () => {});
11-
this.set('moveToDetails', () => {});
1210
this.set('openDeleteEventModal', () => {});
13-
await render(hbs`{{ui-table/cell/cell-buttons editEvent=(action editEvent) moveToDetails=(action moveToDetails) openDeleteEventModal=(action openDeleteEventModal)}}`);
11+
await render(hbs`{{ui-table/cell/cell-buttons openDeleteEventModal=(action openDeleteEventModal)}}`);
1412
assert.ok(this.element.textContent.trim().includes(''));
1513
});
1614
});

‎tests/integration/components/ui-table/cell/cell-event-general-test.js

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,14 @@ module('Integration | Component | ui table/cell/cell event general', function(ho
99
const extraRecords = { identifier: 'abc215f', logoUrl: 'url' };
1010
const record = 'Event';
1111

12-
const props = {
13-
actions: {
14-
editEvent : () => {},
15-
moveToDetails : () => {},
16-
moveToPublic : () => {}
17-
}
18-
};
19-
2012
test('it renders', async function(assert) {
2113

2214
this.setProperties({
2315
record,
24-
props,
2516
extraRecords
2617
});
2718

28-
await render(hbs`{{ui-table/cell/cell-event-general extraRecords=extraRecords record=record props=props}}`);
19+
await render(hbs`{{ui-table/cell/cell-event-general extraRecords=extraRecords record=record}}`);
2920
assert.ok(this.element.textContent.trim().includes('Event'));
3021
});
3122
});

‎tests/integration/components/ui-table/cell/cell-event-test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ module('Integration | Component | ui table/cell/cell event', function(hooks) {
99
const record = { name: 'Event', image: 'url' };
1010
const props = {
1111
actions: {
12-
moveToDetails : () => {},
13-
editEvent : () => {},
1412
openDeleteEventModal : () => {},
1513
deleteEvent : () => {},
1614
restoreEvent : () => {}

0 commit comments

Comments
 (0)