Get all data from FetchUser

HubSpot · Oct 31, 2016 · a570511 · a570511
1 parent f5bc21a
commit a570511
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 40 deletions.
diff --git a/SingularityBase/src/main/java/com/hubspot/singularity/SingularityUserSettings.java b/SingularityBase/src/main/java/com/hubspot/singularity/SingularityUserSettings.java
@@ -16,6 +16,10 @@ public SingularityUserSettings(
     this.starredRequestIds = Objects.firstNonNull(starredRequestIds, Collections.<String>emptySet());
   }
 
+  public static SingularityUserSettings empty() {
+    return new SingularityUserSettings(Collections.<String>emptySet());
+  }
+
   public Set<String> getStarredRequestIds() {
     return starredRequestIds;
   }

diff --git a/SingularityService/src/main/java/com/hubspot/singularity/resources/UserResource.java b/SingularityService/src/main/java/com/hubspot/singularity/resources/UserResource.java
@@ -36,8 +36,8 @@ public UserResource(UserManager userManager, Optional<SingularityUser> user, Sin
 
   @GET
   @Path("/settings")
-  public Optional<SingularityUserSettings> getUserSettings() {
+  public SingularityUserSettings getUserSettings() {
-    return userManager.getUserSettings(authorizationHelper.getAuthUserId(user));
+    return userManager.getUserSettings(authorizationHelper.getAuthUserId(user)).or(SingularityUserSettings.empty());
   }
 
   @POST

diff --git a/SingularityUI/app/actions/api/users.es6 b/SingularityUI/app/actions/api/users.es6
@@ -1,22 +1,5 @@
 import { buildApiAction, buildJsonApiAction } from './base';
 
-export const FetchUserSettings = buildApiAction(
-  'FETCH_USER_SETTINGS',
-  {
-    url: `/users/settings`,
-    catchStatusCodes: [404] // Remove this once the API doesn't 404 when user has nothing set
-  }
-);
-
-export const UpdateUserSettings = buildJsonApiAction(
-  'UPDATE_USER_SETTINGS',
-  'POST',
-  (settings) => ({
-    url: `/users/settings`,
-    body: settings
-  })
-);
-
 export const AddStarredRequests = buildJsonApiAction(
   'ADD_STARRED_REQUESTS',
   'POST',

diff --git a/SingularityUI/app/components/requests/RequestStar.jsx b/SingularityUI/app/components/requests/RequestStar.jsx
@@ -1,6 +1,7 @@
 import React, { PropTypes } from 'react';
 import { connect } from 'react-redux';
-import { FetchUserSettings, AddStarredRequests, DeleteStarredRequests } from '../../actions/api/users';
+import { FetchUser } from 'actions/api/auth';
+import { AddStarredRequests, DeleteStarredRequests } from '../../actions/api/users';
 import Utils from '../../utils';
 
 const RequestStar = ({requestId, changeStar, starred}) => (
@@ -17,17 +18,17 @@ RequestStar.propTypes = {
 
 const mapStateToProps = (state, ownProps) => {
   return {
-    starred: _.contains(Utils.maybe(state.api.userSettings, ['data', 'starredRequestIds'], []), ownProps.requestId)
+    starred: _.contains(Utils.maybe(state.api.user, ['data', 'settings', 'starredRequestIds'], []), ownProps.requestId)
   };
 };
 
 const mapDispatchToProps = (dispatch) => {
   return {
     changeStar: (requestId, starred) => {
       if (starred) {
-        dispatch(DeleteStarredRequests.trigger([requestId])).then(() => dispatch(FetchUserSettings.trigger()));
+        dispatch(DeleteStarredRequests.trigger([requestId])).then(() => dispatch(FetchUser.trigger()));
       } else {
-        dispatch(AddStarredRequests.trigger([requestId])).then(() => dispatch(FetchUserSettings.trigger()));
+        dispatch(AddStarredRequests.trigger([requestId])).then(() => dispatch(FetchUser.trigger()));
       }
     }
   };

diff --git a/SingularityUI/app/initialize.jsx b/SingularityUI/app/initialize.jsx
@@ -8,7 +8,7 @@ import AppRouter from './router';
 import configureStore from 'store';
 import { FetchUser } from 'actions/api/auth';
 import { FetchGroups } from 'actions/api/requestGroups';
-import { FetchUserSettings, AddStarredRequests } from 'actions/api/users';
+import { AddStarredRequests } from 'actions/api/users';
 import Utils from './utils';
 
 // Set up third party configurations
@@ -88,8 +88,8 @@ function renderUserIdForm() {
   ).show();
 }
 
-function maybeImportStarredRequests(store, userSettingsResponse, userId) {
+function maybeImportStarredRequests(store, userState, userId) {
-  const apiStarredRequests = Utils.maybe(userSettingsResponse.data, ['starredRequestIds']);
+  const apiStarredRequests = Utils.maybe(userState, ['data', 'settings', 'starredRequestIds']);
   const locallyStarredRequests = window.localStorage.hasOwnProperty('starredRequests')
     ? JSON.parse(window.localStorage.getItem('starredRequests'))
     : [];
@@ -127,9 +127,7 @@ document.addEventListener('DOMContentLoaded', () => {
 
     if (!willRenderUserIdForm) {
       // Set up starred requests
-      store.dispatch(FetchUserSettings.trigger(userId)).then((userSettingsResponse) =>
+      maybeImportStarredRequests(store, store.getState().api.user, userId);
-        maybeImportStarredRequests(store, userSettingsResponse, userId)
-      );
 
       // set up request groups
       store.dispatch(FetchGroups.trigger([404, 500]));

diff --git a/SingularityUI/app/reducers/api/index.es6 b/SingularityUI/app/reducers/api/index.es6
@@ -5,8 +5,6 @@ import buildKeyedApiActionReducer from './keyed';
 import { FetchUser } from '../../actions/api/auth';
 
 import {
-  FetchUserSettings,
-  UpdateUserSettings,
   AddStarredRequests,
   DeleteStarredRequests
 } from '../../actions/api/users';
@@ -84,8 +82,6 @@ import {
 import { FetchGroups } from '../../actions/api/requestGroups';
 
 const user = buildApiActionReducer(FetchUser);
-const userSettings = buildApiActionReducer(FetchUserSettings);
-const updateUserSettings = buildApiActionReducer(UpdateUserSettings, []);
 const addStarredRequests = buildApiActionReducer(AddStarredRequests, []);
 const deleteStarredRequests = buildApiActionReducer(DeleteStarredRequests, []);
 const webhooks = buildApiActionReducer(FetchWebhooks, []);
@@ -135,8 +131,6 @@ const requestGroups = buildApiActionReducer(FetchGroups, []);
 
 export default combineReducers({
   user,
-  userSettings,
-  updateUserSettings,
   addStarredRequests,
   deleteStarredRequests,
   webhooks,

diff --git a/SingularityUI/app/selectors/requests.es6 b/SingularityUI/app/selectors/requests.es6
@@ -15,12 +15,10 @@ function findRequestIds(requests) {
   });
 }
 
-export const getUserSettings = (state) => state.api.userSettings;
-
 export const getStarredRequests = createSelector(
-  [getUserSettings, getRequestsAPI],
+  [getUserAPI, getRequestsAPI],
-  (userSettings, requestsAPI) => {
+  (userAPI, requestsAPI) => {
-    const starredRequests = Utils.maybe(userSettings, ['data', 'starredRequestIds'], []);
+    const starredRequests = Utils.maybe(userAPI, ['data', 'settings', 'starredRequestIds'], []);
     const requests = findRequestIds(requestsAPI.data);
     return requests.filter((requestParent) => _.contains(starredRequests, requestParent.request.id));
   }