feat: use isManagingStudents & showSkills from features

Author: Alexandre-Monney

admin/app/models/organization.js

@@ -9,13 +9,11 @@ export default class Organization extends Model {
   @attr('nullable-string') logoUrl;
   @attr('nullable-string') externalId;
   @attr('nullable-string') provinceCode;
-  @attr('boolean') isManagingStudents;
   @attr('number') credit;
   @attr('nullable-string') email;
   @attr() createdBy;
   @attr('date') createdAt;
   @attr('nullable-string') documentationUrl;
-  @attr('boolean') showSkills;
   @attr('nullable-string') archivistFullName;
   @attr('date') archivedAt;
   @attr('nullable-string') creatorFullName;
@@ -41,16 +39,44 @@ export default class Organization extends Model {
       PLACES_MANAGEMENT: 'PLACES_MANAGEMENT',
       COMPUTE_ORGANIZATION_LEARNER_CERTIFICABILITY: 'COMPUTE_ORGANIZATION_LEARNER_CERTIFICABILITY',
       LEARNER_IMPORT: 'LEARNER_IMPORT',
+      IS_MANAGING_STUDENTS: 'IS_MANAGING_STUDENTS',
       SHOW_NPS: 'SHOW_NPS',
+      SHOW_SKILLS: 'SHOW_SKILLS',
       ATTESTATIONS_MANAGEMENT: 'ATTESTATIONS_MANAGEMENT',
     };
   }
 
+  get isManagingStudents() {
+    if (!this.features) return false;
+    return this.features[Organization.featureList.IS_MANAGING_STUDENTS].active;
+  }
+
+  set isManagingStudents(value) {
+    if (!this.features) {
+      this.features = {};
+      this.features[Organization.featureList.IS_MANAGING_STUDENTS] = {};
+    }
+    this.features[Organization.featureList.IS_MANAGING_STUDENTS].active = value;
+  }
+
   get showNPS() {
     if (!this.features) return false;
     return this.features[Organization.featureList.SHOW_NPS].active;
   }
 
+  get showSkills() {
+    if (!this.features) return false;
+    return this.features[Organization.featureList.SHOW_SKILLS].active;
+  }
+
+  set showSkills(value) {
+    if (!this.features) {
+      this.features = {};
+      this.features[Organization.featureList.SHOW_SKILLS] = {};
+    }
+    this.features[Organization.featureList.SHOW_SKILLS].active = value;
+  }
+
   get formNPSUrl() {
     if (!this.features) return false;
     if (!this.showNPS) return null;

admin/tests/acceptance/authenticated/organizations/information-management-test.js

@@ -25,6 +25,8 @@ module('Acceptance | Organizations | Information management', function (hooks) {
           COMPUTE_ORGANIZATION_LEARNER_CERTIFICABILITY: { active: false },
           ATTESTATIONS_MANAGEMENT: { active: false },
           SHOW_NPS: { active: false },
+          SHOW_SKILLS: { active: false },
+          IS_MANAGING_STUDENTS: { active: false },
         },
       });
       this.server.create('organization', { id: '1234' });

admin/tests/integration/components/organizations/information-section-view-test.gjs

@@ -11,11 +11,22 @@ module('Integration | Component | organizations/information-section-view', funct
   setupIntlRenderingTest(hooks);
 
   module('when user has access', function (hooks) {
+    let features;
     hooks.beforeEach(function () {
       class AccessControlStub extends Service {
         hasAccessToOrganizationActionsScope = true;
       }
       this.owner.register('service:access-control', AccessControlStub);
+      features = {
+        IS_MANAGING_STUDENTS: { active: false },
+        SHOW_NPS: { active: false, params: { formNPSUrl: 'plop' } },
+        SHOW_SKILLS: { active: false },
+        LEARNER_IMPORT: { active: false },
+        MULTIPLE_SENDING_ASSESSMENT: { active: false },
+        PLACES_MANAGEMENT: { active: false },
+        COMPUTE_ORGANIZATION_LEARNER_CERTIFICABILITY: { active: false },
+        ATTESTATIONS_MANAGEMENT: { active: false },
+      };
     });
 
     test('it renders general information about organization', async function (assert) {
@@ -221,15 +232,17 @@ module('Integration | Component | organizations/information-section-view', funct
         assert.dom(screen.getByText('Archivée le 22/02/2022 par Rob Lochon.')).exists();
       });
     });
-
     module('when organization is parent', function () {
       test('it should display parent label', async function (assert) {
         //given
         const store = this.owner.lookup('service:store');
-        const child = store.createRecord('organization', { type: 'SCO', isManagingStudents: true });
+        const child = store.createRecord('organization', {
+          type: 'SCO',
+          features,
+        });
         const organization = store.createRecord('organization', {
           type: 'SCO',
-          isManagingStudents: true,
+          features,
           children: [child],
         });
 
@@ -245,10 +258,14 @@ module('Integration | Component | organizations/information-section-view', funct
       test('it displays child label and parent organization name', async function (assert) {
         //given
         const store = this.owner.lookup('service:store');
-        const parentOrganization = store.createRecord('organization', { id: 5, type: 'SCO', isManagingStudents: true });
+        const parentOrganization = store.createRecord('organization', {
+          id: 5,
+          type: 'SCO',
+          features,
+        });
         const organization = store.createRecord('organization', {
           type: 'SCO',
-          isManagingStudents: true,
+          features,
           parentOrganizationId: parentOrganization.id,
           parentOrganizationName: 'Shibusen',
         });
@@ -269,7 +286,7 @@ module('Integration | Component | organizations/information-section-view', funct
         const organization = store.createRecord('organization', {
           type: 'SCO',
           name: 'notParent',
-          isManagingStudents: true,
+          features,
         });
 
         // when

admin/tests/unit/components/organizations/information-section-edit-test.js

@@ -14,9 +14,14 @@ module('Unit | Component | organizations/information-section-edit', function (ho
       const organization = store.createRecord('organization', {
         id: 1,
         features: {
-          PLACES_MANAGEMENT: { active: false },
+          IS_MANAGING_STUDENTS: { active: false },
+          SHOW_NPS: { active: false, params: { formNPSUrl: 'plop' } },
+          SHOW_SKILLS: { active: false },
+          LEARNER_IMPORT: { active: false },
           MULTIPLE_SENDING_ASSESSMENT: { active: false },
+          PLACES_MANAGEMENT: { active: false },
           COMPUTE_ORGANIZATION_LEARNER_CERTIFICABILITY: { active: false },
+          ATTESTATIONS_MANAGEMENT: { active: false },
         },
       });
       const component = createGlimmerComponent('component:organizations/information-section-edit', {

api/src/organizational-entities/domain/models/OrganizationForAdmin.js

@@ -173,11 +173,13 @@ class OrganizationForAdmin {
     this.identityProviderForCampaigns = identityProviderForCampaigns;
   }
 
-  updateIsManagingStudents(isManagingStudents, features) {
+  updateIsManagingStudents(features) {
     const hasLearnerImportFeature =
       features[ORGANIZATION_FEATURE.LEARNER_IMPORT.key] && features[ORGANIZATION_FEATURE.LEARNER_IMPORT.key].active;
 
-    this.isManagingStudents = hasLearnerImportFeature ? false : isManagingStudents;
+    this.isManagingStudents = hasLearnerImportFeature
+      ? false
+      : features[ORGANIZATION_FEATURE.IS_MANAGING_STUDENTS.key].active;
   }
 
   updateWithDataProtectionOfficerAndTags(organization, dataProtectionOfficer = {}, tags = []) {
@@ -191,8 +193,8 @@ class OrganizationForAdmin {
     this.externalId = organization.externalId;
     this.updateProvinceCode(organization.provinceCode);
     this.documentationUrl = organization.documentationUrl;
-    this.updateIsManagingStudents(organization.isManagingStudents, organization.features);
-    this.showSkills = organization.showSkills;
+    this.updateIsManagingStudents(organization.features);
+    this.showSkills = organization.features[ORGANIZATION_FEATURE.SHOW_SKILLS.key].active;
     this.updateIdentityProviderForCampaigns(organization.identityProviderForCampaigns);
     this.dataProtectionOfficer.updateInformation(dataProtectionOfficer);
     this.features = organization.features;