- {!sortedItems.filter(deployment => filterResults(deployment)).length && (
-
- )}
- {sortedItems
- .filter(deployment => filterResults(deployment))
- .map(deployment => {
- return (
-
-
-
- {formatString(deployment.environment.project.name, 'project')}
-
-
-
-
- {formatString(deployment.environment.name, 'environment')}
-
-
-
{formatString(deployment.environment.openshift.name, 'cluster')}
-
-
- {deployment.name}
-
-
-
{deployment.priority}
-
- {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')}
-
-
- {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)}
-
- {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && (
-
- )}
-
-
{getDeploymentDuration(deployment)}
-
- {['new', 'pending', 'queued', 'running'].includes(deployment.status) && (
-
- )}
-
+ {!sortedFilteredItems.length &&
No deployments
}
+ {sortedFilteredItems.map(deployment => {
+ return (
+
+
+
+ {formatString(deployment.environment.project.name, 'project')}
+
+
+
+
+ {formatString(deployment.environment.name, 'environment')}
+
+
+
{formatString(deployment.environment.openshift.name, 'cluster')}
+
+
+ {deployment.name}
+
+
+
{deployment.priority}
+
+ {moment.utc(deployment.created).local().format('DD MMM YYYY, HH:mm:ss (Z)')}
+
+
+ {deployment.status.charAt(0).toUpperCase() + deployment.status.slice(1)}
+
+ {!['complete', 'cancelled', 'failed'].includes(deployment.status) && deployment.buildStep && (
+
+ )}
+
+
{getDeploymentDuration(deployment)}
+
+ {['new', 'pending', 'queued', 'running'].includes(deployment.status) && (
+
+ )}
- );
- })}
+
+ );
+ })}
);
diff --git a/src/components/Organizations/AddUserToOrganization/index.js b/src/components/Organizations/AddUserToOrganization/index.js
index 895415f8..600591ce 100644
--- a/src/components/Organizations/AddUserToOrganization/index.js
+++ b/src/components/Organizations/AddUserToOrganization/index.js
@@ -7,12 +7,15 @@ import Button from 'components/Button';
import withLogic from 'components/Organizations/AddUserToOrganization/logic';
import gql from 'graphql-tag';
+import { userTypeOptions } from '../Manage';
import { Footer } from '../SharedStyles';
import { NewUser } from './Styles';
export const ADD_USER_MUTATION = gql`
- mutation AddUserToOrganization($email: String!, $organization: Int!, $owner: Boolean) {
- addUserToOrganization(input: { user: { email: $email }, organization: $organization, owner: $owner }) {
+ mutation AddUserToOrganization($email: String!, $organization: Int!, $owner: Boolean, $admin: Boolean) {
+ addUserToOrganization(
+ input: { user: { email: $email }, organization: $organization, owner: $owner, admin: $admin }
+ ) {
id
}
}
@@ -21,17 +24,11 @@ export const ADD_USER_MUTATION = gql`
/**
* Adds/edits user to an organization
*/
-export const AddUserToOrganization = ({
- organization,
- close,
- inputValueEmail,
- setInputValue,
- checkboxValueOwner,
- setCheckboxValueOwner,
- onAddUser,
- users,
-}) => {
+export const AddUserToOrganization = ({ organization, close, inputValueEmail, setInputValue, onAddUser, users }) => {
const userAlreadyExists = users.find(u => u.email === inputValueEmail);
+
+ const [newUserType, setNewUserType] = useState('viewer');
+
return (
console.error(err)}>
{(addUser, { called, error, data }) => {
@@ -60,17 +57,31 @@ export const AddUserToOrganization = ({
/>