From 4b4f29ae19bcd7d132aa3d59cae2b4bfb10caa37 Mon Sep 17 00:00:00 2001 From: Waheed Ahmed Date: Wed, 27 Oct 2021 14:10:57 +0500 Subject: [PATCH] feat: remove `primary/elementary` option from education If COPPA compliance feature flag is enabled, remove the `primary/elementary` option from the level of education dropdown field on edit but keep the value showing for the users who have already selected it. VAN-762 --- .env | 2 +- .env.development | 2 +- .env.test | 2 +- src/account-settings/AccountSettingsPage.jsx | 2 +- src/account-settings/EditableField.jsx | 7 ++++++- src/index.jsx | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.env b/.env index 3e41fbc..aadf6a9 100644 --- a/.env +++ b/.env @@ -25,4 +25,4 @@ SITE_NAME='' STUDIO_BASE_URL='' SUPPORT_URL='' USER_INFO_COOKIE_NAME='' -COLLECT_YEAR_OF_BIRTH='true' +ENABLE_COPPA_COMPLIANCE='' diff --git a/.env.development b/.env.development index 70531ef..4357071 100644 --- a/.env.development +++ b/.env.development @@ -26,4 +26,4 @@ SITE_NAME=localhost STUDIO_BASE_URL='' SUPPORT_URL='http://localhost:18000/support' USER_INFO_COOKIE_NAME='edx-user-info' -COLLECT_YEAR_OF_BIRTH='true' +ENABLE_COPPA_COMPLIANCE='' diff --git a/.env.test b/.env.test index 475c577..acafba5 100644 --- a/.env.test +++ b/.env.test @@ -25,4 +25,4 @@ SITE_NAME=localhost STUDIO_BASE_URL='' SUPPORT_URL='http://localhost:18000/support' USER_INFO_COOKIE_NAME='edx-user-info' -COLLECT_YEAR_OF_BIRTH='true' +ENABLE_COPPA_COMPLIANCE='' diff --git a/src/account-settings/AccountSettingsPage.jsx b/src/account-settings/AccountSettingsPage.jsx index 05cea6b..0216fc4 100644 --- a/src/account-settings/AccountSettingsPage.jsx +++ b/src/account-settings/AccountSettingsPage.jsx @@ -583,7 +583,7 @@ class AccountSettingsPage extends React.Component { /> {this.renderSecondaryEmailField(editableFieldProps)} - {(getConfig().COLLECT_YEAR_OF_BIRTH === 'true') + {(!getConfig().ENABLE_COPPA_COMPLIANCE) && ( option.value !== 'el'); + } const handleSubmit = (e) => { e.preventDefault(); @@ -120,7 +125,7 @@ function EditableField(props) { type={type} value={value} onChange={handleChange} - options={options} + options={inputOptions} {...others} /> <>{others.children} diff --git a/src/index.jsx b/src/index.jsx index 4572490..e4dd7f6 100755 --- a/src/index.jsx +++ b/src/index.jsx @@ -63,7 +63,7 @@ initialize({ COACHING_ENABLED: (process.env.COACHING_ENABLED || false), ENABLE_DEMOGRAPHICS_COLLECTION: (process.env.ENABLE_DEMOGRAPHICS_COLLECTION || false), DEMOGRAPHICS_BASE_URL: process.env.DEMOGRAPHICS_BASE_URL, - COLLECT_YEAR_OF_BIRTH: (process.env.COLLECT_YEAR_OF_BIRTH || true), + ENABLE_COPPA_COMPLIANCE: (process.env.ENABLE_COPPA_COMPLIANCE || false), }, 'App loadConfig override handler'); }, },