feat(orga): display participant page in sidebar for schools

Co-authored-by: <[email protected] > Co-authored-by: <[email protected]>
1024pix · Nov 15, 2024 · c6227d3 · c6227d3
1 parent b4a4b88
commit c6227d3
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 43 deletions.
diff --git a/orga/app/components/layout/sidebar.hbs b/orga/app/components/layout/sidebar.hbs
@@ -31,14 +31,12 @@
         {{t "navigation.main.missions"}}
       </LinkTo>
     {{/if}}
-    {{#if this.shouldDisplayParticipantsEntry}}
-      <LinkTo @route={{this.organizationLearnersList.route}} class="sidebar-nav__item">
-        <span class="sidebar-nav__item-icon">
-          <PixIcon @name="infoUser" role="none" />
-        </span>
-        {{t this.organizationLearnersList.label}}
-      </LinkTo>
-    {{/if}}
+    <LinkTo @route={{this.organizationLearnersList.route}} class="sidebar-nav__item">
+      <span class="sidebar-nav__item-icon">
+        <PixIcon @name="infoUser" role="none" />
+      </span>
+      {{t this.organizationLearnersList.label}}
+    </LinkTo>
     <LinkTo @route="authenticated.team" class="sidebar-nav__item">
       <span class="sidebar-nav__item-icon">
         <PixIcon @name="users" role="none" />

diff --git a/orga/app/components/layout/sidebar.js b/orga/app/components/layout/sidebar.js
@@ -33,10 +33,6 @@ export default class SidebarMenu extends Component {
     return this.currentUser.canAccessCampaignsPage;
   }
 
-  get shouldDisplayParticipantsEntry() {
-    return this.currentUser.canAccessParticipantsPage;
-  }
-
   get organizationLearnersList() {
     if (this.currentUser.isSCOManagingStudents) {
       return {

diff --git a/orga/app/services/current-user.js b/orga/app/services/current-user.js
@@ -84,10 +84,6 @@ export default class CurrentUserService extends Service {
     return !this.prescriber.missionsManagement;
   }
 
-  get canAccessParticipantsPage() {
-    return !this.prescriber.missionsManagement;
-  }
-
   get hasLearnerImportFeature() {
     return this.prescriber.hasOrganizationLearnerImport;
   }

diff --git a/orga/tests/integration/components/layout/sidebar-test.js b/orga/tests/integration/components/layout/sidebar-test.js
@@ -56,7 +56,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1' });
         canAccessCampaignsPage = true;
-        canAccessParticipantsPage = true;
       }
       this.owner.register('service:current-user', CurrentUserStub);
       const intl = this.owner.lookup('service:intl');
@@ -125,7 +124,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       // given
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1', type: 'PRO' });
-        canAccessParticipantsPage = true;
       }
 
       this.owner.register('service:current-user', CurrentUserStub);
@@ -146,7 +144,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1', type: 'SUP' });
         isSUPManagingStudents = true;
-        canAccessParticipantsPage = true;
       }
 
       this.owner.register('service:current-user', CurrentUserStub);
@@ -165,7 +162,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1', type: 'SUP' });
         isSUPManagingStudents = false;
-        canAccessParticipantsPage = true;
       }
 
       this.owner.register('service:current-user', CurrentUserStub);
@@ -187,7 +183,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
         organization = Object.create({ id: '1', type: 'SCO' });
         isSCOManagingStudents = true;
         canAccessMissionsPage = false;
-        canAccessParticipantsPage = true;
       }
 
       this.owner.register('service:current-user', CurrentUserStub);
@@ -206,7 +201,6 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: '1', type: 'SCO' });
         isSCOManagingStudents = false;
-        canAccessParticipantsPage = true;
       }
 
       this.owner.register('service:current-user', CurrentUserStub);
@@ -306,7 +300,7 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       );
     });
 
-    test('should not display Campagne and Participants menus', async function (assert) {
+    test('should not display Campagne', async function (assert) {
       class CurrentUserStub extends Service {
         organization = Object.create({ id: 5 });
         canAccessMissionsPage = true;
@@ -318,9 +312,7 @@ module('Integration | Component | Layout::Sidebar', function (hooks) {
       const screen = await render(hbs`<Layout::Sidebar />`);
 
       assert.dom(screen.queryByText('Campagnes')).doesNotExist();
-      assert.dom(screen.queryByText('Participants')).doesNotExist();
       assert.dom(screen.queryByText('Étudiants')).doesNotExist();
-      assert.dom(screen.queryByText('Élèves')).doesNotExist();
     });
   });
 

diff --git a/orga/tests/unit/services/current-user-test.js b/orga/tests/unit/services/current-user-test.js
@@ -338,24 +338,6 @@ module('Unit | Service | current-user', function (hooks) {
       });
     });
 
-    module('#canAccessParticipantsPage', function () {
-      test('should return false if user has mission feature activated', function (assert) {
-        currentUserService.prescriber = {
-          missionsManagement: true,
-        };
-
-        assert.false(currentUserService.canAccessParticipantsPage);
-      });
-
-      test('should return true if user does not have missions feature activated', function (assert) {
-        currentUserService.prescriber = {
-          missionsManagement: false,
-        };
-
-        assert.true(currentUserService.canAccessParticipantsPage);
-      });
-    });
-
     module('#canAccessImportPage', function (hooks) {
       hooks.beforeEach(function () {
         currentUserService.prescriber = { hasOrganizationLearnerImport: false };