diff --git a/addons/calendar/static/src/components/activity/activity.xml b/addons/calendar/static/src/components/activity/activity.xml index 11e0b9c8c07..0eff5a09232 100644 --- a/addons/calendar/static/src/components/activity/activity.xml +++ b/addons/calendar/static/src/components/activity/activity.xml @@ -1,13 +1,13 @@ - - + + !activityView.activity.calendar_event_id - + - diff --git a/addons/calendar/static/tests/activity_tests.js b/addons/calendar/static/tests/activity_tests.js index bd5bd01761f..d884f78b354 100644 --- a/addons/calendar/static/tests/activity_tests.js +++ b/addons/calendar/static/tests/activity_tests.js @@ -37,7 +37,7 @@ QUnit.test('activity click on Reschedule', async function (assert) { }, ); - await click('.o_Activity_editButton'); + await click('.o_ActivityView_editButton'); assert.containsOnce( document.body, '.o_calendar_view', diff --git a/addons/mail/static/src/components/activity/activity.js b/addons/mail/static/src/components/activity/activity.js index fa44ca9487d..b2b215d3d13 100644 --- a/addons/mail/static/src/components/activity/activity.js +++ b/addons/mail/static/src/components/activity/activity.js @@ -7,7 +7,7 @@ import Popover from "web.Popover"; const { Component } = owl; -export class Activity extends Component { +export class ActivityView extends Component { /** * @override @@ -26,10 +26,10 @@ export class Activity extends Component { } -Object.assign(Activity, { +Object.assign(ActivityView, { props: { record: Object }, - template: 'mail.Activity', + template: 'mail.ActivityView', components: { Popover }, }); -registerMessagingComponent(Activity); +registerMessagingComponent(ActivityView); diff --git a/addons/mail/static/src/components/activity/activity.scss b/addons/mail/static/src/components/activity/activity.scss index 46a6a2b21a6..93007064a9e 100644 --- a/addons/mail/static/src/components/activity/activity.scss +++ b/addons/mail/static/src/components/activity/activity.scss @@ -2,25 +2,25 @@ // Layout // ------------------------------------------------------------------ -.o_Activity_core { +.o_ActivityView_core { min-width: 0; } -.o_Activity_detailsUserAvatar { +.o_ActivityView_detailsUserAvatar { object-fit: cover; height: 18px; width: 18px; } -.o_Activity_iconContainer { +.o_ActivityView_iconContainer { @include o-position-absolute($top: auto, $left: auto, $bottom: -16%, $right: -5%); } -.o_Activity_note p { +.o_ActivityView_note p { margin-bottom: map-get($spacers, 0); } -.o_Activity_sidebar { +.o_ActivityView_sidebar { width: $o-mail-thread-avatar-size; min-width: $o-mail-thread-avatar-size; height: $o-mail-thread-avatar-size; @@ -39,10 +39,10 @@ // Style // ------------------------------------------------------------------ -.o_Activity_detailsButton { +.o_ActivityView_detailsButton { @include o-hover-text-color($default-color: $o-main-color-muted); } -.o_Activity_iconContainer { +.o_ActivityView_iconContainer { box-shadow: 0 0 0 2px $o-view-background-color; } diff --git a/addons/mail/static/src/components/activity/activity.xml b/addons/mail/static/src/components/activity/activity.xml index 8b438eb4c45..eca0af60191 100644 --- a/addons/mail/static/src/components/activity/activity.xml +++ b/addons/mail/static/src/components/activity/activity.xml @@ -1,28 +1,28 @@ - + -
-
-
+
+
+
- + -
- +
-
-
-
+
+
- + - + -
+
-
+
Activity type
-
+
Created
-
+
,
by - - + +
Assigned to
-
- +
+
Due on
-
- + -
+
-
+
@@ -120,19 +120,19 @@ -
- - - -
diff --git a/addons/mail/static/src/components/activity_box/activity_box.xml b/addons/mail/static/src/components/activity_box/activity_box.xml index 0c20f845be3..3c8af338b71 100644 --- a/addons/mail/static/src/components/activity_box/activity_box.xml +++ b/addons/mail/static/src/components/activity_box/activity_box.xml @@ -34,7 +34,7 @@
- +
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js index 422974003a0..fbe0e86655e 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js @@ -25,7 +25,7 @@ QUnit.test('activity mark done popover simplest layout', async function (assert) res_id: resPartnerId1, views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.containsOnce( document.body, @@ -77,7 +77,7 @@ QUnit.test('activity with force next mark done popover simplest layout', async f res_id: resPartnerId1, views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.containsOnce( document.body, @@ -145,7 +145,7 @@ QUnit.test('activity mark done popover mark done without feedback', async functi res_id: resPartnerId1, views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); await click('.o_ActivityMarkDonePopoverContent_doneButton'); assert.verifySteps( ['action_feedback'], @@ -187,7 +187,7 @@ QUnit.test('activity mark done popover mark done with feedback', async function res_id: resPartnerId1, views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); let feedbackTextarea = document.querySelector('.o_ActivityMarkDonePopoverContent_feedback'); feedbackTextarea.focus(); @@ -237,7 +237,7 @@ QUnit.test('activity mark done popover mark done and schedule next', async funct throw new Error("The do-action event should not be triggered when the route doesn't return an action"); }, }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); let feedbackTextarea = document.querySelector('.o_ActivityMarkDonePopoverContent_feedback'); feedbackTextarea.focus(); @@ -282,7 +282,7 @@ QUnit.test('[technical] activity mark done & schedule next with new action', asy ); }, }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); await click('.o_ActivityMarkDonePopoverContent_doneScheduleNextButton'); assert.verifySteps( diff --git a/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js index fb899a2a915..cbd9f7b1fe7 100644 --- a/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js +++ b/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js @@ -25,62 +25,62 @@ QUnit.test('activity simplest layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_sidebar').length, + document.querySelectorAll('.o_ActivityView_sidebar').length, 1, "should have activity sidebar" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_core').length, + document.querySelectorAll('.o_ActivityView_core').length, 1, "should have activity core" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_user').length, + document.querySelectorAll('.o_ActivityView_user').length, 1, "should have activity user" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_info').length, + document.querySelectorAll('.o_ActivityView_info').length, 1, "should have activity info" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_note').length, + document.querySelectorAll('.o_ActivityView_note').length, 0, "should not have activity note" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_details').length, + document.querySelectorAll('.o_ActivityView_details').length, 0, "should not have activity details" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_mailTemplates').length, + document.querySelectorAll('.o_ActivityView_mailTemplates').length, 0, "should not have activity mail templates" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_editButton').length, + document.querySelectorAll('.o_ActivityView_editButton').length, 0, "should not have activity Edit button" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_cancelButton').length, + document.querySelectorAll('.o_ActivityView_cancelButton').length, 0, "should not have activity Cancel button" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_markDoneButton').length, + document.querySelectorAll('.o_ActivityView_markDoneButton').length, 0, "should not have activity Mark as Done button" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_uploadButton').length, + document.querySelectorAll('.o_ActivityView_uploadButton').length, 0, "should not have activity Upload button" ); @@ -103,17 +103,17 @@ QUnit.test('activity with note layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_note').length, + document.querySelectorAll('.o_ActivityView_note').length, 1, "should have activity note" ); assert.strictEqual( - document.querySelector('.o_Activity_note').textContent, + document.querySelector('.o_ActivityView_note').textContent, "There is no good or bad note", "activity note should be 'There is no good or bad note'" ); @@ -140,21 +140,21 @@ QUnit.test('activity info layout when planned after tomorrow', async function (a views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_dueDateText').length, + document.querySelectorAll('.o_ActivityView_dueDateText').length, 1, "should have activity delay" ); assert.ok( - document.querySelector('.o_Activity_dueDateText').classList.contains('text-success'), + document.querySelector('.o_ActivityView_dueDateText').classList.contains('text-success'), "activity delay should have the right color modifier class (text-success)" ); assert.strictEqual( - document.querySelector('.o_Activity_dueDateText').textContent, + document.querySelector('.o_ActivityView_dueDateText').textContent, "Due in 5 days:", "activity delay should have 'Due in 5 days:' as label" ); @@ -181,21 +181,21 @@ QUnit.test('activity info layout when planned tomorrow', async function (assert) views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_dueDateText').length, + document.querySelectorAll('.o_ActivityView_dueDateText').length, 1, "should have activity delay" ); assert.ok( - document.querySelector('.o_Activity_dueDateText').classList.contains('text-success'), + document.querySelector('.o_ActivityView_dueDateText').classList.contains('text-success'), "activity delay should have the right color modifier class (text-success)" ); assert.strictEqual( - document.querySelector('.o_Activity_dueDateText').textContent, + document.querySelector('.o_ActivityView_dueDateText').textContent, 'Tomorrow:', "activity delay should have 'Tomorrow:' as label" ); @@ -219,21 +219,21 @@ QUnit.test('activity info layout when planned today', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_dueDateText').length, + document.querySelectorAll('.o_ActivityView_dueDateText').length, 1, "should have activity delay" ); assert.ok( - document.querySelector('.o_Activity_dueDateText').classList.contains('text-warning'), + document.querySelector('.o_ActivityView_dueDateText').classList.contains('text-warning'), "activity delay should have the right color modifier class (text-warning)" ); assert.strictEqual( - document.querySelector('.o_Activity_dueDateText').textContent, + document.querySelector('.o_ActivityView_dueDateText').textContent, "Today:", "activity delay should have 'Today:' as label" ); @@ -260,21 +260,21 @@ QUnit.test('activity info layout when planned yesterday', async function (assert views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_dueDateText').length, + document.querySelectorAll('.o_ActivityView_dueDateText').length, 1, "should have activity delay" ); assert.ok( - document.querySelector('.o_Activity_dueDateText').classList.contains('text-danger'), + document.querySelector('.o_ActivityView_dueDateText').classList.contains('text-danger'), "activity delay should have the right color modifier class (text-danger)" ); assert.strictEqual( - document.querySelector('.o_Activity_dueDateText').textContent, + document.querySelector('.o_ActivityView_dueDateText').textContent, "Yesterday:", "activity delay should have 'Yesterday:' as label" ); @@ -301,21 +301,21 @@ QUnit.test('activity info layout when planned before yesterday', async function views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_dueDateText').length, + document.querySelectorAll('.o_ActivityView_dueDateText').length, 1, "should have activity delay" ); assert.ok( - document.querySelector('.o_Activity_dueDateText').classList.contains('text-danger'), + document.querySelector('.o_ActivityView_dueDateText').classList.contains('text-danger'), "activity delay should have the right color modifier class (text-danger)" ); assert.strictEqual( - document.querySelector('.o_Activity_dueDateText').textContent, + document.querySelector('.o_ActivityView_dueDateText').textContent, "5 days overdue:", "activity delay should have '5 days overdue:' as label" ); @@ -338,22 +338,22 @@ QUnit.test('activity with a summary layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_summary').length, + document.querySelectorAll('.o_ActivityView_summary').length, 1, "should have activity summary" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_type').length, + document.querySelectorAll('.o_ActivityView_type').length, 0, "should not have the activity type as summary" ); assert.strictEqual( - document.querySelector('.o_Activity_summary').textContent.trim(), + document.querySelector('.o_ActivityView_summary').textContent.trim(), "“test summary”", "should have the specific activity summary in activity summary" ); @@ -376,27 +376,27 @@ QUnit.test('activity without summary layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_type').length, + document.querySelectorAll('.o_ActivityView_type').length, 1, "activity details should have an activity type section" ); assert.strictEqual( - document.querySelector('.o_Activity_type').textContent.trim(), + document.querySelector('.o_ActivityView_type').textContent.trim(), "Email", "activity details should have the activity type display name in type section" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_summary.o_Activity_type').length, + document.querySelectorAll('.o_ActivityView_summary.o_ActivityView_type').length, 1, "should have activity type as summary" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_summary:not(.o_Activity_type)').length, + document.querySelectorAll('.o_ActivityView_summary:not(.o_ActivityView_type)').length, 0, "should not have a specific summary" ); @@ -425,31 +425,31 @@ QUnit.test('activity details toggle', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_details').length, + document.querySelectorAll('.o_ActivityView_details').length, 0, "activity details should not be visible by default" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsButton').length, + document.querySelectorAll('.o_ActivityView_detailsButton').length, 1, "activity should have a details button" ); - await click('.o_Activity_detailsButton'); + await click('.o_ActivityView_detailsButton'); assert.strictEqual( - document.querySelectorAll('.o_Activity_details').length, + document.querySelectorAll('.o_ActivityView_details').length, 1, "activity details should be visible after clicking on details button" ); - await click('.o_Activity_detailsButton'); + await click('.o_ActivityView_detailsButton'); assert.strictEqual( - document.querySelectorAll('.o_Activity_details').length, + document.querySelectorAll('.o_ActivityView_details').length, 0, "activity details should no longer be visible after clicking again on details button" ); @@ -482,59 +482,59 @@ QUnit.test('activity details layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_userAvatar').length, + document.querySelectorAll('.o_ActivityView_userAvatar').length, 1, "should have activity user avatar" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsButton').length, + document.querySelectorAll('.o_ActivityView_detailsButton').length, 1, "activity should have a details button" ); - await click('.o_Activity_detailsButton'); + await click('.o_ActivityView_detailsButton'); assert.strictEqual( - document.querySelectorAll('.o_Activity_details').length, + document.querySelectorAll('.o_ActivityView_details').length, 1, "activity details should be visible after clicking on details button" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_details .o_Activity_type').length, + document.querySelectorAll('.o_ActivityView_details .o_ActivityView_type').length, 1, "activity details should have type" ); assert.strictEqual( - document.querySelector('.o_Activity_details .o_Activity_type').textContent, + document.querySelector('.o_ActivityView_details .o_ActivityView_type').textContent, "Email", "activity details type should be 'Email'" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsCreation').length, + document.querySelectorAll('.o_ActivityView_detailsCreation').length, 1, "activity details should have creation date " ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsCreator').length, + document.querySelectorAll('.o_ActivityView_detailsCreator').length, 1, "activity details should have creator" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsAssignation').length, + document.querySelectorAll('.o_ActivityView_detailsAssignation').length, 1, "activity details should have assignation information" ); assert.strictEqual( - document.querySelector('.o_Activity_detailsAssignation').textContent.indexOf('Pauvre pomme'), + document.querySelector('.o_ActivityView_detailsAssignation').textContent.indexOf('Pauvre pomme'), 0, "activity details assignation information should contain creator display name" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_detailsAssignationUserAvatar').length, + document.querySelectorAll('.o_ActivityView_detailsAssignationUserAvatar').length, 1, "activity details should have user avatar" ); @@ -560,22 +560,22 @@ QUnit.test('activity with mail template layout', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_sidebar').length, + document.querySelectorAll('.o_ActivityView_sidebar').length, 1, "should have activity sidebar" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_mailTemplates').length, + document.querySelectorAll('.o_ActivityView_mailTemplates').length, 1, "should have activity mail templates" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_mailTemplate').length, + document.querySelectorAll('.o_ActivityView_mailTemplate').length, 1, "should have activity mail template" ); @@ -655,7 +655,7 @@ QUnit.test('activity with mail template: preview mail', async function (assert) }, }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); @@ -703,7 +703,7 @@ QUnit.test('activity with mail template: send mail', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); @@ -740,12 +740,12 @@ QUnit.test('activity upload document is available', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_uploadButton').length, + document.querySelectorAll('.o_ActivityView_uploadButton').length, 1, "should have activity upload button" ); @@ -775,24 +775,24 @@ QUnit.test('activity click on mark as done', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_markDoneButton').length, + document.querySelectorAll('.o_ActivityView_markDoneButton').length, 1, "should have activity Mark as Done button" ); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.strictEqual( document.querySelectorAll('.o_ActivityMarkDonePopoverContent').length, 1, "should have opened the mark done popover" ); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.strictEqual( document.querySelectorAll('.o_ActivityMarkDonePopoverContent').length, 0, @@ -821,16 +821,16 @@ QUnit.test('activity mark as done popover should focus feedback input on open [R }); assert.containsOnce( document.body, - '.o_Activity', + '.o_ActivityView', "should have activity component" ); assert.containsOnce( document.body, - '.o_Activity_markDoneButton', + '.o_ActivityView_markDoneButton', "should have activity Mark as Done button" ); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.strictEqual( document.querySelector('.o_ActivityMarkDonePopoverContent_feedback'), document.activeElement, @@ -890,17 +890,17 @@ QUnit.test('activity click on edit', async function (assert) { }, }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_editButton').length, + document.querySelectorAll('.o_ActivityView_editButton').length, 1, "should have activity edit button" ); - await click('.o_Activity_editButton'); + await click('.o_ActivityView_editButton'); assert.verifySteps( ['do_action'], "should have called 'schedule activity' action correctly" @@ -958,43 +958,43 @@ QUnit.test('activity edition', async function (assert) { }); assert.containsOnce( document.body, - '.o_Activity', + '.o_ActivityView', "should have activity component" ); assert.containsOnce( document.body, - '.o_Activity_editButton', + '.o_ActivityView_editButton', "should have activity edit button" ); assert.containsOnce( document.body, - '.o_Activity_icon', + '.o_ActivityView_icon', "should have activity icon" ); assert.containsOnce( document.body, - '.o_Activity_icon.fa-times', + '.o_ActivityView_icon.fa-times', "should have initial activity icon" ); assert.containsNone( document.body, - '.o_Activity_icon.fa-check', + '.o_ActivityView_icon.fa-check', "should not have new activity icon when not edited yet" ); - await click('.o_Activity_editButton'); + await click('.o_ActivityView_editButton'); assert.verifySteps( ['do_action'], "should have called 'schedule activity' action correctly" ); assert.containsNone( document.body, - '.o_Activity_icon.fa-times', + '.o_ActivityView_icon.fa-times', "should no more have initial activity icon once edited" ); assert.containsOnce( document.body, - '.o_Activity_icon.fa-check', + '.o_ActivityView_icon.fa-check', "should now have new activity icon once edited" ); }); @@ -1026,23 +1026,23 @@ QUnit.test('activity click on cancel', async function (assert) { views: [[false, 'form']], }); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 1, "should have activity component" ); assert.strictEqual( - document.querySelectorAll('.o_Activity_cancelButton').length, + document.querySelectorAll('.o_ActivityView_cancelButton').length, 1, "should have activity cancel button" ); - await click('.o_Activity_cancelButton'); + await click('.o_ActivityView_cancelButton'); assert.verifySteps( ['unlink'], "should have called unlink rpc after clicking on cancel" ); assert.strictEqual( - document.querySelectorAll('.o_Activity').length, + document.querySelectorAll('.o_ActivityView').length, 0, "should no longer display activity after clicking on cancel" ); @@ -1069,7 +1069,7 @@ QUnit.test('activity mark done popover close on ESCAPE', async function (assert) views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.containsOnce( document.body, '.o_ActivityMarkDonePopoverContent', @@ -1109,7 +1109,7 @@ QUnit.test('activity mark done popover click on discard', async function (assert views: [[false, 'form']], }); - await click('.o_Activity_markDoneButton'); + await click('.o_ActivityView_markDoneButton'); assert.containsOnce( document.body, '.o_ActivityMarkDonePopoverContent', @@ -1170,16 +1170,16 @@ QUnit.test('data-oe-id & data-oe-model link redirection on click', async functio }); assert.containsOnce( document.body, - '.o_Activity_note', + '.o_ActivityView_note', "activity should have a note" ); assert.containsOnce( - document.querySelector('.o_Activity_note'), + document.querySelector('.o_ActivityView_note'), 'a', "activity note should have a link" ); - document.querySelector(`.o_Activity_note a`).click(); + document.querySelector(`.o_ActivityView_note a`).click(); assert.verifySteps( ['do-action:openFormView_some.model_250'], "should have open form view on related record after click on link" @@ -1219,12 +1219,12 @@ QUnit.test('button related to file uploading is replaced when updating activity }); assert.containsOnce( document.body, - '.o_Activity_markDoneButton', + '.o_ActivityView_markDoneButton', "should have a mark done button when changing activity type from 'Upload Document' to 'Email'" ); assert.containsNone( document.body, - '.o_Activity_uploadButton', + '.o_ActivityView_uploadButton', "should not have an upload button after changing the activity type from 'Upload Document' to 'Email'" ); }); diff --git a/addons/website_slides/static/src/components/activity/activity.xml b/addons/website_slides/static/src/components/activity/activity.xml index 4678f5b6e27..e16c372838d 100644 --- a/addons/website_slides/static/src/components/activity/activity.xml +++ b/addons/website_slides/static/src/components/activity/activity.xml @@ -1,13 +1,13 @@ - + -
- -
diff --git a/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js b/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js index f4a6a6c9ab5..3ba769a7684 100644 --- a/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js +++ b/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js @@ -37,10 +37,10 @@ QUnit.test('grant course access', async function (assert) { views: [[false, 'form']], }); - assert.containsOnce(document.body, '.o_Activity', "should have activity component"); - assert.containsOnce(document.body, '.o_Activity_grantAccessButton', "should have grant access button"); + assert.containsOnce(document.body, '.o_ActivityView', "should have activity component"); + assert.containsOnce(document.body, '.o_ActivityView_grantAccessButton', "should have grant access button"); - document.querySelector('.o_Activity_grantAccessButton').click(); + document.querySelector('.o_ActivityView_grantAccessButton').click(); assert.verifySteps(['access_grant'], "Grant button should trigger the right rpc call"); }); @@ -75,10 +75,10 @@ QUnit.test('refuse course access', async function (assert) { views: [[false, 'form']], }); - assert.containsOnce(document.body, '.o_Activity', "should have activity component"); - assert.containsOnce(document.body, '.o_Activity_refuseAccessButton', "should have refuse access button"); + assert.containsOnce(document.body, '.o_ActivityView', "should have activity component"); + assert.containsOnce(document.body, '.o_ActivityView_refuseAccessButton', "should have refuse access button"); - document.querySelector('.o_Activity_refuseAccessButton').click(); + document.querySelector('.o_ActivityView_refuseAccessButton').click(); assert.verifySteps(['access_refuse'], "refuse button should trigger the right rpc call"); });