@@ -132,24 +135,28 @@ class UserProfile extends React.Component {
@@ -159,12 +166,14 @@ class UserProfile extends React.Component {
@@ -209,6 +218,8 @@ UserProfile.propTypes = {
username: PropTypes.string.isRequired,
}).isRequired,
}).isRequired,
+ accountPrivacy: PropTypes.string,
+ visibility: PropTypes.object, // eslint-disable-line
};
UserProfile.defaultProps = {
@@ -225,4 +236,6 @@ UserProfile.defaultProps = {
aboutMe: null,
bio: null,
certificates: null,
+ accountPrivacy: null,
+ visibility: {}, // eslint-disable-line
};
diff --git a/src/containers/UserProfile/index.jsx b/src/containers/UserProfile/index.jsx
index 98fccc5..0ed7324 100644
--- a/src/containers/UserProfile/index.jsx
+++ b/src/containers/UserProfile/index.jsx
@@ -28,6 +28,8 @@ const mapStateToProps = (state) => {
socialLinks: state.profilePage.profile.socialLinks,
bio: state.profilePage.profile.bio,
certificates: null,
+ accountPrivacy: state.preferences.accountPrivacy,
+ visibility: state.preferences.visibility || {},
};
};
diff --git a/src/data/apiClient.js b/src/data/apiClient.js
index 1c3c327..8e04bf0 100644
--- a/src/data/apiClient.js
+++ b/src/data/apiClient.js
@@ -1,3 +1,4 @@
+import _ from 'lodash';
import { getAuthenticatedAPIClient } from '@edx/frontend-auth';
import { configuration } from '../config';
@@ -15,14 +16,39 @@ const apiClient = getAuthenticatedAPIClient({
csrfCookieName: configuration.CSRF_COOKIE_NAME,
});
+const clientServerKeyMap = {
+ bio: 'bio',
+ socialLinks: 'social_links',
+ country: 'country',
+ education: 'level_of_education',
+ fullName: 'name',
+ username: 'username',
+ profileImage: 'profile_image',
+ dateJoined: 'date_joined',
+ languageProficiencies: 'language_proficiencies',
+ accountPrivacy: 'account_privacy',
+};
+
+const serverClientKeyMap = _.invert(clientServerKeyMap);
export function getPreferences(username) {
const url = `${lmsBaseUrl}/api/user/v1/preferences/${username}`;
return new Promise((resolve, reject) => {
apiClient.get(url)
- .then((response) => {
- resolve(response.data);
+ .then(({ data }) => {
+ const createPathsAndTransformKeys = (acc, key) => {
+ _.set(
+ acc,
+ key.split('.').map(pathKey => serverClientKeyMap[pathKey] || pathKey),
+ data[key],
+ );
+ return acc;
+ };
+
+ const preferences = Object.keys(data).reduce(createPathsAndTransformKeys, {});
+
+ resolve(preferences);
})
.catch((error) => {
reject(error);
diff --git a/src/data/reducers/PreferencesReducer.js b/src/data/reducers/PreferencesReducer.js
new file mode 100644
index 0000000..25bb510
--- /dev/null
+++ b/src/data/reducers/PreferencesReducer.js
@@ -0,0 +1,66 @@
+import {
+ FETCH_PREFERENCES,
+ SAVE_PREFERENCES,
+} from '../../actions/preferences';
+
+
+const initialState = {
+ fetchPreferencesState: null,
+ savePreferencesState: null,
+};
+
+
+const profile = (state = initialState, action) => {
+ switch (action.type) {
+ case FETCH_PREFERENCES.BEGIN:
+ return {
+ ...state,
+ fetchPreferencesState: 'pending',
+ };
+ case FETCH_PREFERENCES.SUCCESS:
+ return {
+ ...state,
+ fetchPreferencesState: 'complete',
+ ...action.preferences,
+ };
+ case FETCH_PREFERENCES.FAILURE:
+ return {
+ ...state,
+ fetchPreferencesState: 'error',
+ };
+ case FETCH_PREFERENCES.RESET:
+ return {
+ ...state,
+ fetchPreferencesState: null,
+ error: null,
+ };
+
+ case SAVE_PREFERENCES.BEGIN:
+ return {
+ ...state,
+ savePreferencesState: 'pending',
+ };
+ case SAVE_PREFERENCES.SUCCESS:
+ return {
+ ...state,
+ savePreferencesState: 'complete',
+ ...action.preferences,
+ };
+ case SAVE_PREFERENCES.FAILURE:
+ return {
+ ...state,
+ savePreferencesState: 'error',
+ };
+ case SAVE_PREFERENCES.RESET:
+ return {
+ ...state,
+ savePreferencesState: null,
+ error: null,
+ };
+
+ default:
+ return state;
+ }
+};
+
+export default profile;
diff --git a/src/data/reducers/ProfilePageReducer.js b/src/data/reducers/ProfilePageReducer.js
index dcda883..5bcf6c5 100644
--- a/src/data/reducers/ProfilePageReducer.js
+++ b/src/data/reducers/ProfilePageReducer.js
@@ -5,8 +5,6 @@ import {
EDITABLE_FIELD_CLOSE,
EDITABLE_FIELD_OPEN,
FETCH_PROFILE,
- FETCH_PREFERENCES,
- SAVE_PREFERENCES,
} from '../../actions/profile';
const initialState = {
@@ -15,8 +13,6 @@ const initialState = {
savePhotoState: null,
currentlyEditingField: null,
profile: {},
- fetchPreferencesState: null,
- savePreferencesState: null,
};
const profilePage = (state = initialState, action) => {
@@ -116,53 +112,6 @@ const profilePage = (state = initialState, action) => {
error: null,
};
- case FETCH_PREFERENCES.BEGIN:
- return {
- ...state,
- fetchPreferencesState: 'pending',
- };
- case FETCH_PREFERENCES.SUCCESS:
- return {
- ...state,
- fetchPreferencesState: 'complete',
- preferences: action.preferences,
- };
- case FETCH_PREFERENCES.FAILURE:
- return {
- ...state,
- fetchPreferencesState: 'error',
- };
- case FETCH_PREFERENCES.RESET:
- return {
- ...state,
- fetchPreferencesState: null,
- error: null,
- };
-
-
- case SAVE_PREFERENCES.BEGIN:
- return {
- ...state,
- savePreferencesState: 'pending',
- };
- case SAVE_PREFERENCES.SUCCESS:
- return {
- ...state,
- savePreferencesState: 'complete',
- preferences: action.preferences,
- };
- case SAVE_PREFERENCES.FAILURE:
- return {
- ...state,
- savePreferencesState: 'error',
- };
- case SAVE_PREFERENCES.RESET:
- return {
- ...state,
- savePreferencesState: null,
- error: null,
- };
-
default:
return state;
}
diff --git a/src/data/reducers/RootReducer.js b/src/data/reducers/RootReducer.js
index f7365b9..eddf099 100755
--- a/src/data/reducers/RootReducer.js
+++ b/src/data/reducers/RootReducer.js
@@ -1,6 +1,7 @@
import { combineReducers } from 'redux';
import { userAccount } from '@edx/frontend-auth';
import profilePage from './ProfilePageReducer';
+import preferences from './PreferencesReducer';
const identityReducer = (state) => {
const newState = { ...state };
@@ -13,6 +14,7 @@ const rootReducer = combineReducers({
authentication: identityReducer,
userAccount,
profilePage,
+ preferences,
});
export default rootReducer;
diff --git a/src/index.jsx b/src/index.jsx
index 5a1430a..b30686e 100755
--- a/src/index.jsx
+++ b/src/index.jsx
@@ -19,7 +19,7 @@ import FooterLogo from '../assets/edx-footer.png';
import './App.scss';
import NotFoundPage from './components/NotFoundPage';
-import { fetchPreferences } from './actions/profile';
+import { fetchPreferences } from './actions/preferences';
class App extends Component {
componentDidMount() {
diff --git a/src/sagas/RootSaga.js b/src/sagas/RootSaga.js
index 79a797c..cb04a0d 100644
--- a/src/sagas/RootSaga.js
+++ b/src/sagas/RootSaga.js
@@ -23,6 +23,9 @@ import {
deleteProfilePhotoSuccess,
deleteProfilePhotoFailure,
deleteProfilePhotoReset,
+} from '../actions/profile';
+
+import {
FETCH_PREFERENCES,
fetchPreferencesBegin,
fetchPreferencesSuccess,
@@ -33,8 +36,7 @@ import {
savePreferencesSuccess,
savePreferencesFailure,
savePreferencesReset,
-} from '../actions/profile';
-
+} from '../actions/preferences';
import * as ProfileApiService from '../services/ProfileApiService';
import { getPreferences, savePreferences } from '../data/apiClient';