Merge pull request #1077 from openedx/jhynes/APER-2823_remove-2U-demo…

…graphics-collection

feat!: remove 2U demographics collection

.env

@@ -2,10 +2,8 @@ ACCESS_TOKEN_COOKIE_NAME=''
 BASE_URL=''
 CREDENTIALS_BASE_URL=''
 CSRF_TOKEN_API_PATH=''
-DEMOGRAPHICS_BASE_URL=''
 DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL=''
-ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=''
 LANGUAGE_PREFERENCE_COOKIE_NAME=''
 LMS_BASE_URL=''

.env.development

@@ -2,10 +2,8 @@ ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='localhost:1997'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
 DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'

.env.test

@@ -2,10 +2,8 @@ ACCESS_TOKEN_COOKIE_NAME='edx-jwt-cookie-header-payload'
 BASE_URL='localhost:1997'
 CREDENTIALS_BASE_URL='http://localhost:18150'
 CSRF_TOKEN_API_PATH='/csrf/api/v1/token'
-DEMOGRAPHICS_BASE_URL='http://localhost:18360'
 DISCOVERY_API_BASE_URL=''
 ECOMMERCE_BASE_URL='http://localhost:18130'
-ENABLE_DEMOGRAPHICS_COLLECTION=''
 FAVICON_URL=https://edx-cdn.org/v3/default/favicon.ico
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'

README.rst

@@ -16,9 +16,6 @@ What is the domain of this MFE?
 In this MFE: Private user settings UIs. Public facing profile is in a `separate MFE (Profile) <https://github.com/openedx/frontend-app-profile>`_
 
 - Account settings page
-
-- Demographics collection
-
 - IDV (Identity Verification)
 
 ***************
@@ -99,23 +96,6 @@ Example: ``'false'`` | ``''`` (empty strings are true)
 Enable the account deletion option, defaults to true.
 To disable account deletion set ``ENABLE_ACCOUNT_DELETION`` to ``'false'`` (string), otherwise it will default to true.
 
-edX-specific Environment Variables
-==================================
-
-Furthermore, there are several edX-specific environment variables that enable integrations with closed-source services private to the edX organization, and are unsupported in Open edX. Enabling these environment variables will result in undefined behavior in Open edX installations:
-
-``ENABLE_DEMOGRAPHICS_COLLECTION``
-
-Example: ``true`` | ``''`` (empty strings are falsy)
-
-Enables support for a section of the account settings page where a user can enter demographics information. Integrates with a private demographics service and is only used by edx.org.
-
-``DEMOGRAPHICS_BASE_URL``
-
-Example: ``https://demographics.example.com``
-
-Required only if ``ENABLE_DEMOGRAPHICS_COLLECTION`` is true. The fully-qualified URL to the private demographics service in the target environment.
-
 Example build syntax with a single environment variable:
 
 .. code:: bash
@@ -160,7 +140,6 @@ Development Roadmap
 
 We don't have anything planned for the core of the MFE (the account settings page) - this MFE is currently in maintenance mode.
 There may be a replacement for IDV coming down the pipe, so that may be DEPRed.
-In the future, it's possible that demographics could be modeled as a plugin rather than being hard-coded into this MFE.
 
 License
 =======

src/account-settings/AccountSettingsPage.jsx

@@ -49,7 +49,6 @@ import {
  getStatesList,
 } from './data/constants';
 import { fetchSiteLanguages } from './site-language';
-import DemographicsSection from './demographics/DemographicsSection';
 import { fetchCourseList } from '../notification-preferences/data/thunks';
 import { withLocation, withNavigate } from './hoc';
 
@@ -65,7 +64,6 @@ class AccountSettingsPage extends React.Component {
  this.navLinkRefs = {
  '#basic-information': React.createRef(),
  '#profile-information': React.createRef(),
- '#demographics-information': React.createRef(),
  '#social-media': React.createRef(),
  '#site-preferences': React.createRef(),
  '#linked-accounts': React.createRef(),
@@ -460,16 +458,6 @@ class AccountSettingsPage extends React.Component {
  );
  }
 
- renderDemographicsSection() {
- // check the result of an LMS API call to determine if we should render the DemographicsSection component
- if (this.props.formValues.shouldDisplayDemographicsSection) {
- return (
- <DemographicsSection forwardRef={this.navLinkRefs['#demographics-information']} />
- );
- }
- return null;
- }
-
  renderContent() {
  const editableFieldProps = {
  onChange: this.handleEditableFieldChange,
@@ -718,7 +706,6 @@ class AccountSettingsPage extends React.Component {
  {...editableFieldProps}
  />
  </div>
- {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && this.renderDemographicsSection()}
  <div className="account-section pt-3 mb-5" id="social-media">
  <h2 className="section-heading h4 mb-3">
  {this.props.intl.formatMessage(messages['account.settings.section.social.media'])}
@@ -844,9 +831,7 @@ class AccountSettingsPage extends React.Component {
  <div>
  <div className="row">
  <div className="col-md-2">
- <JumpNav
- displayDemographicsLink={this.props.formValues.shouldDisplayDemographicsSection}
- />
+ <JumpNav />
  </div>
  <div className="col-md-10">
  {loading ? this.renderLoading() : null}
@@ -888,7 +873,6 @@ AccountSettingsPage.propTypes = {
  social_link_twitter: PropTypes.string,
  time_zone: PropTypes.string,
  state: PropTypes.string,
- shouldDisplayDemographicsSection: PropTypes.bool,
  useVerifiedNameForCerts: PropTypes.bool.isRequired,
  verified_name: PropTypes.string,
  }).isRequired,

src/account-settings/AccountSettingsPage.messages.jsx

@@ -46,11 +46,6 @@ const messages = defineMessages({
  defaultMessage: 'Profile Information',
  description: 'The profile information section heading.',
  },
- 'account.settings.section.demographics.information': {
- id: 'account.settings.section.demographics.information',
- defaultMessage: 'Optional Information',
- description: 'The optional information section heading.',
- },
  'account.settings.section.site.preferences': {
  id: 'account.settings.section.site.preferences',
  defaultMessage: 'Site Preferences',

src/account-settings/JumpNav.jsx

@@ -3,7 +3,6 @@ import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
 import { breakpoints, useWindowSize, Icon } from '@openedx/paragon';
 import { OpenInNew } from '@openedx/paragon/icons';
 import classNames from 'classnames';
-import PropTypes from 'prop-types';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { NavHashLink } from 'react-router-hash-link';
@@ -14,7 +13,6 @@ import { selectShowPreferences } from '../notification-preferences/data/selector
 
 const JumpNav = ({
  intl,
- displayDemographicsLink,
 }) => {
  const stickToTop = useWindowSize().width > breakpoints.small.minWidth;
  const showPreferences = useSelector(selectShowPreferences());
@@ -25,7 +23,6 @@ const JumpNav = ({
  items={[
  'basic-information',
  'profile-information',
- 'demographics-information',
  'social-media',
  'site-preferences',
  'linked-accounts',
@@ -44,14 +41,6 @@ const JumpNav = ({
  {intl.formatMessage(messages['account.settings.section.profile.information'])}
  </NavHashLink>
  </li>
- {getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && displayDemographicsLink
- && (
- <li>
- <NavHashLink to="#demographics-information">
- {intl.formatMessage(messages['account.settings.section.demographics.information'])}
- </NavHashLink>
- </li>
- )}
  <li>
  <NavHashLink to="#social-media">
  {intl.formatMessage(messages['account.settings.section.social.media'])}
@@ -97,7 +86,6 @@ const JumpNav = ({
 
 JumpNav.propTypes = {
  intl: intlShape.isRequired,
- displayDemographicsLink: PropTypes.bool.isRequired,
 };
 
 export default injectIntl(JumpNav);

src/account-settings/data/selectors.js

@@ -298,21 +298,6 @@ export const certPreferenceSelector = createSelector(
  }),
 );
 
-export const demographicsSectionSelector = createSelector(
- formValuesSelector,
- draftsSelector,
- errorSelector,
- (
- formValues,
- drafts,
- errors,
- ) => ({
- formValues,
- drafts,
- formErrors: errors,
- }),
-);
-
 export const nameChangeSelector = createSelector(
  accountSettingsSelector,
  formValuesSelector,

src/account-settings/data/service.js

@@ -1,15 +1,12 @@
 import { getConfig } from '@edx/frontend-platform';
 import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth';
 import pick from 'lodash.pick';
-import pickBy from 'lodash.pickby';
 import omit from 'lodash.omit';
 import isEmpty from 'lodash.isempty';
 
 import { handleRequestError, unpackFieldErrors } from './utils';
 import { getThirdPartyAuthProviders } from '../third-party-auth';
 import { postVerifiedNameConfig } from '../certificate-preference/data/service';
-import { getDemographics, getDemographicsOptions, patchDemographics } from '../demographics/data/service';
-import { DEMOGRAPHICS_FIELDS } from '../demographics/data/utils';
 
 const SOCIAL_PLATFORMS = [
  { id: 'twitter', key: 'social_link_twitter' },
@@ -154,28 +151,6 @@ export async function getProfileDataManager(username, userRoles) {
  return null;
 }
 
-/**
- * A function to determine if the Demographics questions should be displayed to the user. For the
- * MVP release of Demographics we are limiting the Demographics question visibility only to
- * MicroBachelors learners.
- */
-export async function shouldDisplayDemographicsQuestions() {
- const requestUrl = `${getConfig().LMS_BASE_URL}/api/demographics/v1/demographics/status/`;
- let data = {};
-
- try {
- ({ data } = await getAuthenticatedHttpClient().get(requestUrl));
- if (data.display) {
- return data.display;
- }
- } catch (error) {
- // if there was an error then we just hide the section
- return false;
- }
-
- return false;
-}
-
 export async function getVerifiedName() {
  let data;
  const client = getAuthenticatedHttpClient();
@@ -212,28 +187,22 @@ export async function postVerifiedName(data) {
 }
 
 /**
- * A single function to GET everything considered a setting.
- * Currently encapsulates Account, Preferences, ThirdPartyAuth, and Demographics
+ * A single function to GET everything considered a setting. Currently encapsulates Account, Preferences, and
+ * ThirdPartyAuth.
  */
-export async function getSettings(username, userRoles, userId) {
+export async function getSettings(username, userRoles) {
  const [
  account,
  preferences,
  thirdPartyAuthProviders,
  profileDataManager,
  timeZones,
- shouldDisplayDemographicsQuestionsResponse,
- demographics,
- demographicsOptions,
  ] = await Promise.all([
  getAccount(username),
  getPreferences(username),
  getThirdPartyAuthProviders(),
  getProfileDataManager(username, userRoles),
  getTimeZones(),
- getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && shouldDisplayDemographicsQuestions(),
- getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographics(userId),
- getConfig().ENABLE_DEMOGRAPHICS_COLLECTION && getDemographicsOptions(),
  ]);
 
  return {
@@ -242,32 +211,25 @@ export async function getSettings(username, userRoles, userId) {
  thirdPartyAuthProviders,
  profileDataManager,
  timeZones,
- shouldDisplayDemographicsSection: shouldDisplayDemographicsQuestionsResponse,
- ...demographics,
- demographicsOptions,
  };
 }
 
 /**
  * A single function to PATCH everything considered a setting.
  * Currently encapsulates Account, Preferences, ThirdPartyAuth
  */
-export async function patchSettings(username, commitValues, userId) {
+export async function patchSettings(username, commitValues) {
  // Note: time_zone exists in the return value from user/v1/accounts
  // but it is always null and won't update. It also exists in
  // user/v1/preferences where it does update. This is the one we use.
  const preferenceKeys = ['time_zone'];
- const demographicsKeys = DEMOGRAPHICS_FIELDS;
  const certificateKeys = ['useVerifiedNameForCerts'];
- const isDemographicsKey = (value, key) => key.includes('demographics');
  const accountCommitValues = omit(
  commitValues,
  preferenceKeys,
- demographicsKeys,
  certificateKeys,
  );
  const preferenceCommitValues = pick(commitValues, preferenceKeys);
- const demographicsCommitValues = pickBy(commitValues, isDemographicsKey);
  const certCommitValues = pick(commitValues, certificateKeys);
  const patchRequests = [];
 
@@ -277,9 +239,6 @@ export async function patchSettings(username, commitValues, userId) {
  if (!isEmpty(preferenceCommitValues)) {
  patchRequests.push(patchPreferences(username, preferenceCommitValues));
  }
- if (!isEmpty(demographicsCommitValues)) {
- patchRequests.push(patchDemographics(userId, demographicsCommitValues));
- }
  if (!isEmpty(certCommitValues)) {
  patchRequests.push(postVerifiedNameConfig(username, certCommitValues));
  }