Skip to content

Commit

Permalink
Merge pull request #460 from getguesstimate/master
Browse files Browse the repository at this point in the history
v0.5.1: Organizational Member Edit Pages
  • Loading branch information
OAGr committed Jun 2, 2016
2 parents fa1f5cc + f35b46f commit f33df19
Show file tree
Hide file tree
Showing 24 changed files with 792 additions and 109 deletions.
2 changes: 1 addition & 1 deletion src/components/metrics/card/token/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

.MetricToken .ui.tiny.label {
font-size: 0.85rem;
background-color: #25B530 !important;
background-color: $green-1 !important;
border-radius: 2px;
padding: 0.4em 0.45em 0.35em;
margin-top: 2px;
Expand Down
33 changes: 33 additions & 0 deletions src/components/organizations/show/httpRequestSelector.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { createSelector } from 'reselect';

const specificHttpRequestSelector = state => state.httpRequests
const organizationIdSelector = (state, props) => props.organizationId

function isExistingMember(request) {
return !!_.get(request, 'response.hasUser')
}

export const httpRequestSelector = createSelector(
specificHttpRequestSelector,
organizationIdSelector,
(httpRequests, organizationId) => {

let relevantRequests = httpRequests.filter(r => (
(r.metadata.organizationId === organizationId) &&
(r.entity === 'userOrganizationMembershipCreate')
))

let formattedRequests = relevantRequests.map(r => ({
id: r.id,
busy: r.busy,
success: r.success,
email: r.metadata.email,
created_at: r.created_at,
isExistingMember: isExistingMember(r)
}))

return {
httpRequests: formattedRequests
}
}
);
Loading

0 comments on commit f33df19

Please sign in to comment.