diff --git a/mon-pix/app/adapters/user.js b/mon-pix/app/adapters/user.js index d3099d6d853..078afc6ce10 100644 --- a/mon-pix/app/adapters/user.js +++ b/mon-pix/app/adapters/user.js @@ -50,11 +50,6 @@ export default class User extends ApplicationAdapter { return url + '/remember-user-has-seen-assessment-instructions'; } - if (adapterOptions && adapterOptions.rememberUserHasSeenLevelSevenBanner) { - delete adapterOptions.rememberUserHasSeenLevelSevenBanner; - return url + '/user-has-seen-level-seven-info'; - } - if (adapterOptions && adapterOptions.rememberUserHasSeenNewDashboardInfo) { delete adapterOptions.rememberUserHasSeenNewDashboardInfo; return url + '/has-seen-new-dashboard-info'; diff --git a/mon-pix/app/components/profile-content.hbs b/mon-pix/app/components/profile-content.hbs index e94ef732e1e..2233c6ae9d0 100644 --- a/mon-pix/app/components/profile-content.hbs +++ b/mon-pix/app/components/profile-content.hbs @@ -2,19 +2,6 @@
- {{#if this.displayLevelSevenBanner}} -
-
- -
-
- {{/if}}

{{t "pages.profile.accessibility.title"}}

diff --git a/mon-pix/app/components/profile-content.js b/mon-pix/app/components/profile-content.js deleted file mode 100644 index c60d846837a..00000000000 --- a/mon-pix/app/components/profile-content.js +++ /dev/null @@ -1,32 +0,0 @@ -import { action } from '@ember/object'; -import { service } from '@ember/service'; -import Component from '@glimmer/component'; - -const LEVEL_SEVEN = 7; - -export default class ProfileContent extends Component { - @service intl; - @service url; - - get lvlSevenInformation() { - return this.intl.t('common.new-information-banner.lvl-seven', { lvlSevenUrl: this.lvlSevenUrl }); - } - - get lvlSevenUrl() { - return this.url.levelSevenNewsUrl; - } - - get maxReachableLevel() { - return this.args.model.profile.get('maxReachableLevel'); - } - - get displayLevelSevenBanner() { - return this.maxReachableLevel === LEVEL_SEVEN && !this.args.model.hasSeenLevelSevenInfo; - } - - @action - async closeLevelSevenBanner(event) { - event.preventDefault(); - await this.args.model.save({ adapterOptions: { rememberUserHasSeenLevelSevenBanner: true } }); - } -} diff --git a/mon-pix/app/models/user.js b/mon-pix/app/models/user.js index 47cf110bb53..d7cd6b6cfd0 100644 --- a/mon-pix/app/models/user.js +++ b/mon-pix/app/models/user.js @@ -13,7 +13,6 @@ export default class User extends Model { @attr('boolean') hasSeenNewDashboardInfo; @attr('boolean') hasSeenFocusedChallengeTooltip; @attr('boolean') hasSeenOtherChallengesTooltip; - @attr('boolean') hasSeenLevelSevenInfo; @attr('boolean') hasAssessmentParticipations; @attr('boolean') hasRecommendedTrainings; @attr('string') codeForLastProfileToShare; diff --git a/mon-pix/app/services/url.js b/mon-pix/app/services/url.js index eb15fc2c932..5ff81cd3099 100644 --- a/mon-pix/app/services/url.js +++ b/mon-pix/app/services/url.js @@ -126,15 +126,6 @@ export default class Url extends Service { } } - get levelSevenNewsUrl() { - const currentLanguage = this.intl.primaryLocale; - - if (currentLanguage === ENGLISH_INTERNATIONAL_LOCALE) { - return 'https://pix.org/en/news/discover-level-7-on-pix'; - } - return 'https://pix.fr/actualites/decouvrez-le-niveau-7-des-maintenant-sur-pix'; - } - get serverStatusUrl() { const currentLanguage = this.intl.primaryLocale; return `https://status.pix.org/?locale=${currentLanguage}`; diff --git a/mon-pix/mirage/factories/user.js b/mon-pix/mirage/factories/user.js index dd32520bc93..abf2821875f 100644 --- a/mon-pix/mirage/factories/user.js +++ b/mon-pix/mirage/factories/user.js @@ -271,9 +271,6 @@ export default Factory.extend({ isAnonymous() { return false; }, - hasSeenLevelSevenInfo() { - return false; - }, shouldChangePassword: trait({ shouldChangePassword: true, }), @@ -298,15 +295,6 @@ export default Factory.extend({ hasSeenNewDashboardInfo: trait({ hasSeenNewDashboardInfo: true, }), - withMaxReachableLevelSeven: trait({ - afterCreate(user, server) { - user.update({ - profile: server.create('profile', { - maxReachableLevel: 7, - }), - }); - }, - }), withMaxReachableLevelSix: trait({ afterCreate(user, server) { user.update({ diff --git a/mon-pix/mirage/routes/users/index.js b/mon-pix/mirage/routes/users/index.js index 3bc1e92c2da..0fb4dd6a03f 100644 --- a/mon-pix/mirage/routes/users/index.js +++ b/mon-pix/mirage/routes/users/index.js @@ -64,12 +64,6 @@ export default function index(config) { return user; }); - config.patch('/users/:id/user-has-seen-level-seven-info', (schema, request) => { - const user = schema.users.find(request.params.id); - user.update({ hasSeenLevelSevenInfo: true }); - return user; - }); - config.patch('/users/:id/has-seen-challenge-tooltip/:challengeType', (schema, request) => { const user = schema.users.find(request.params.id); user.update({ tooltipChallengeType: request.params.challengeType }); diff --git a/mon-pix/mirage/serializers/user.js b/mon-pix/mirage/serializers/user.js index 498a6079eb5..cc884de0479 100644 --- a/mon-pix/mirage/serializers/user.js +++ b/mon-pix/mirage/serializers/user.js @@ -12,7 +12,6 @@ export default ApplicationSerializer.extend({ 'pixCertifTermsOfServiceAccepted', 'hasSeenAssessmentInstructions', 'hasSeenNewDashboardInfo', - 'hasSeenLevelSevenInfo', 'isAnonymous', 'hasRecommendedTrainings', ], diff --git a/mon-pix/tests/acceptance/profile-test.js b/mon-pix/tests/acceptance/profile-test.js index 36ee22f9bb5..84e3e6983b6 100644 --- a/mon-pix/tests/acceptance/profile-test.js +++ b/mon-pix/tests/acceptance/profile-test.js @@ -66,64 +66,6 @@ module('Acceptance | Profile', function (hooks) { }); }); - module('Authenticated cases as a user with specific max reachable level', function () { - module('max reachable level is set to seven', function (hooks) { - hooks.beforeEach(async function () { - const userWithMaxReachableLevelSeven = server.create('user', 'withMaxReachableLevelSeven'); - await authenticate(userWithMaxReachableLevelSeven); - }); - module('user has never closed the banner', function () { - test('should display the level seven information banner', async function (assert) { - // when - await visit('/competences'); - - // then - assert.ok( - getByTextWithHtml( - t('common.new-information-banner.lvl-seven', { lvlSevenUrl: this.url.levelSevenNewsUrl }), - ), - ); - }); - }); - - module('user has closed the banner', function () { - test('should not display the level seven information banner', async function (assert) { - // given - const screen = await visit('/competences'); - - // when - await click(screen.getByRole('button', { name: t('common.new-information-banner.close-label') })); - - // then - assert.strictEqual( - queryByTextWithHtml( - t('common.new-information-banner.lvl-seven', { lvlSevenUrl: this.url.levelSevenNewsUrl }), - ), - null, - ); - }); - }); - }); - - module('max reachable level is not set to seven', function (hooks) { - hooks.beforeEach(async function () { - const userWithMaxReachableLevelSix = server.create('user', 'withMaxReachableLevelSix'); - await authenticate(userWithMaxReachableLevelSix); - }); - test('should not display the level seven information banner', async function (assert) { - // when - await visit('/competences'); - - assert.strictEqual( - queryByTextWithHtml( - t('common.new-information-banner.lvl-seven', { lvlSevenUrl: this.url.levelSevenNewsUrl }), - ), - null, - ); - }); - }); - }); - module('Not authenticated cases', function () { test('should redirect to home, when user is not authenticated', async function (assert) { // when diff --git a/mon-pix/tests/unit/services/url-test.js b/mon-pix/tests/unit/services/url-test.js index 955c83b013d..67571274844 100644 --- a/mon-pix/tests/unit/services/url-test.js +++ b/mon-pix/tests/unit/services/url-test.js @@ -424,38 +424,6 @@ module('Unit | Service | url', function (hooks) { }); }); - module('#levelSevenNewsUrl', function () { - test('returns the French URL page', function (assert) { - // given - const service = this.owner.lookup('service:url'); - service.currentDomain = { isFranceDomain: true }; - service.intl = { primaryLocale: FRENCH_INTERNATIONAL_LOCALE }; - const expectedLevelSevenNewsUrl = 'https://pix.fr/actualites/decouvrez-le-niveau-7-des-maintenant-sur-pix'; - - // when - const levelSevenNewsUrl = service.levelSevenNewsUrl; - - // then - assert.strictEqual(levelSevenNewsUrl, expectedLevelSevenNewsUrl); - }); - - module('when current language is "en"', function () { - test('returns the English URL page', function (assert) { - // given - const service = this.owner.lookup('service:url'); - service.currentDomain = { isFranceDomain: false }; - service.intl = { primaryLocale: ENGLISH_INTERNATIONAL_LOCALE }; - const expectedLevelSevenNewsUrl = 'https://pix.org/en/news/discover-level-7-on-pix'; - - // when - const levelSevenNewsUrl = service.levelSevenNewsUrl; - - // then - assert.strictEqual(levelSevenNewsUrl, expectedLevelSevenNewsUrl); - }); - }); - }); - module('#supportHomeUrl', function () { module('when website is pix.fr', function () { test('returns the French page URL', function (assert) { diff --git a/mon-pix/translations/en.json b/mon-pix/translations/en.json index 35b8a3680bd..c9eefcab2cf 100644 --- a/mon-pix/translations/en.json +++ b/mon-pix/translations/en.json @@ -98,8 +98,7 @@ "test": "Your test is loading" }, "new-information-banner": { - "close-label": "Close banner", - "lvl-seven": "Level 7 is now available! Learn more '<'a href=\"{lvlSevenUrl}\" class=\"link\" target=\"_blank\" rel=\"noopener noreferrer\"'>'here''." + "close-label": "Close banner" }, "or": "or", "pagination": { diff --git a/mon-pix/translations/es.json b/mon-pix/translations/es.json index b233f5b7ecb..274894880d4 100644 --- a/mon-pix/translations/es.json +++ b/mon-pix/translations/es.json @@ -91,8 +91,7 @@ "test": "Tu prueba se está cargando" }, "new-information-banner": { - "close-label": "Cerrar el banner", - "lvl-seven": "¡Por fin está disponible el nivel 7! Puedes obtener más información en '<'a href=\"{lvlSevenUrl}\" class=\"link\" target=\"_blank\" rel=\"noopener noreferrer\"'>'esta noticia''." + "close-label": "Cerrar el banner" }, "or": "o", "pagination": { diff --git a/mon-pix/translations/fr.json b/mon-pix/translations/fr.json index 9f26f35c67d..69c437b8478 100644 --- a/mon-pix/translations/fr.json +++ b/mon-pix/translations/fr.json @@ -98,8 +98,7 @@ "test": "Votre test est en cours de chargement" }, "new-information-banner": { - "close-label": "Fermer la bannière", - "lvl-seven": "Le niveau 7 est enfin disponible ! Vous pouvez en apprendre plus via '<'a href=\"{lvlSevenUrl}\" class=\"link\" target=\"_blank\" rel=\"noopener noreferrer\"'>'cette actualité''." + "close-label": "Fermer la bannière" }, "or": "ou", "pagination": { diff --git a/mon-pix/translations/nl.json b/mon-pix/translations/nl.json index fd5c8db3440..5bf710f9fe0 100644 --- a/mon-pix/translations/nl.json +++ b/mon-pix/translations/nl.json @@ -91,8 +91,7 @@ "test": "Je test wordt geladen" }, "new-information-banner": { - "close-label": "Sluit de banner", - "lvl-seven": "Pix wordt geleidelijk aan vertaald naar het Nederlands! De vertaling van al onze vaardigheden zal binnenkort beschikbaar zijn. '<'a href=\"https://pix.org/nl-be/de-planning-voor-de-uitrol-van-pix-in-het-nederlan\" class=\"link\" target=\"_blank\" rel=\"noopener noreferrer\"'>'Meer informatie''" + "close-label": "Sluit de banner" }, "or": "of", "pagination": {