Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.5.1: Organizational Member Edit Pages #460

Merged
merged 39 commits into from
Jun 2, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
3387f1d
Basic org page with members tab
OAGr May 26, 2016
523e917
Basic user org membership works
OAGr May 26, 2016
d99cae9
Very basic version of user org addition
OAGr May 27, 2016
bf1d70f
Basic method for adding users to organization
OAGr May 28, 2016
54d2c70
Added httpRequests reducer
OAGr May 28, 2016
d2456bb
Added appropriate http responses in organizations
OAGr May 29, 2016
f15dfc8
Distinguish users who already exist
OAGr May 29, 2016
0149af3
User input form should be immediately focussed and enter should work
OAGr May 29, 2016
8432041
Cleaned styles and components for organizations show page
OAGr May 29, 2016
e0d4778
Added basic confirmation modal for user removal
OAGr May 29, 2016
1447e39
Hide org members actions from non-admins
OAGr May 29, 2016
8777722
Hide user page from non-members
OAGr May 29, 2016
964a003
Modify userOrganizationMemberships to work with invites
OAGr May 30, 2016
3dff706
Set up basic invitations actions.
mmcdermott May 31, 2016
1793528
Invitations store set up, piped through. Still need to display invite…
mmcdermott May 31, 2016
f04155d
Minor refinements and some basic style.
mmcdermott May 31, 2016
2e4e540
Viewing setup all working.
mmcdermott May 31, 2016
6cf5a57
Receive the new invitations after membership creation.
mmcdermott May 31, 2016
fdc069c
Basic cleanup.
mmcdermott May 31, 2016
9ed1818
Merge pull request #444 from getguesstimate/orgs-use-images-with-store
OAGr May 31, 2016
9ef4292
Minor changes to mail icon
OAGr May 31, 2016
f242880
Merge branch 'master' into orgs-use-images
OAGr Jun 1, 2016
f39334f
Begin passing updated_at back up.
mmcdermott Jun 1, 2016
d22a2e0
Merge branch 'master' into orgs-use-images
OAGr Jun 1, 2016
c6cbbce
Organization users page should hide for logged out users
OAGr Jun 1, 2016
9c4d7c9
WIP
mmcdermott Jun 1, 2016
f387301
removing console.log statements
mmcdermott Jun 1, 2016
df76374
Merge branch 'master' into get-memberships-and-invitations-from-org
mmcdermott Jun 1, 2016
d862fbe
Merge pull request #455 from getguesstimate/pass-updated-at-up
OAGr Jun 1, 2016
dde15fb
Always fetch and grab orgs from memberships.
mmcdermott Jun 1, 2016
738a79e
Merge pull request #457 from getguesstimate/get-memberships-and-invit…
OAGr Jun 1, 2016
9d4ad46
Merged and added invitations sinking.
mmcdermott Jun 1, 2016
e9a3963
Added necessary class to MeIsMember mode.
mmcdermott Jun 1, 2016
52a9bad
Removing unnecessary meIsAdmin dependence.
mmcdermott Jun 1, 2016
1674df7
Grab memberships (fixed typo members -> memberships)
mmcdermott Jun 1, 2016
e989975
Need to extract users from memberships with this new way.
mmcdermott Jun 1, 2016
f4cc4c4
Removing unnecessary cruft.
mmcdermott Jun 2, 2016
3c507d2
Merge pull request #459 from getguesstimate/org-page-fixes
OAGr Jun 2, 2016
f35b46f
Merge pull request #445 from getguesstimate/orgs-use-images
mmcdermott Jun 2, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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