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.

Sign up for GitHub

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

some changes and improvements alongside bugfixes #158

Merged
merged 3 commits into from
Sep 10, 2023
Merged

some changes and improvements alongside bugfixes #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a5da252
some changes and improvements alongside bugfixes
DaveDarsa Sep 8, 2023
052e622
sorter key change
DaveDarsa Sep 8, 2023
3fa6196
small fixes
DaveDarsa Sep 10, 2023
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
9 changes: 6 additions & 3 deletions src/components/Button/StyledButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const sharedStyles = css`
border-radius: 3px;
color: ${color.white};
cursor: pointer;
&:not(:has(span[role="img"])){
&:not(:has(span[role='img'])) {
padding: 10px 30px;
}
&:has(span[aria-label='loading']) {
padding: 10px 30px;
}
@media ${bp.tinyUp} {
Expand Down Expand Up @@ -42,7 +45,7 @@ const sharedStyles = css`
&.btn-white {
// background-color: ${color.white};
background: transparent;
color: ${color.blue};
color: ${color.blue};
border: 1px solid ${color.blue};
&.btn--disabled {
background-color: ${color.lightestGrey};
Expand Down Expand Up @@ -103,7 +106,7 @@ const sharedStyles = css`
width: 48px;
height: 36px;
}

i.edit {
background-image: url('/static/images/edit.svg');
width: 48px;
Expand Down
22 changes: 20 additions & 2 deletions src/components/Button/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
import React, { FC, MouseEvent, ReactNode } from 'react';

import { LoadingOutlined } from '@ant-design/icons';

import { ButtonElem, LinkElement } from './StyledButton';

interface ButtonProps {
action: (e: MouseEvent<HTMLButtonElement>) => void;
href?: string;
disabled?: boolean;
loading?: boolean;
children?: ReactNode;
variant?: string;
icon?: string;
}

const Button: FC<ButtonProps> = ({ action = undefined, href = undefined, disabled, children, variant, icon }) => {
const Button: FC<ButtonProps> = ({
action = undefined,
href = undefined,
disabled,
loading,
children,
variant,
icon,
}) => {
const createClassName = () => {
let className = `${variant ? `btn-${variant}` : 'btn'} ${disabled ? 'btn--disabled' : ''}`;
if (icon) {
Expand All @@ -34,10 +45,17 @@ const Button: FC<ButtonProps> = ({ action = undefined, href = undefined, disable
{icon && <i className={icon} />} {children}
</LinkElement>
) : (
<ButtonElem className={createClassName()} onClick={onClick} disabled={disabled}>
<ButtonElem
style={{ display: 'inline-block' }}
className={createClassName()}
onClick={onClick}
disabled={loading || disabled}
>
{icon && (typeof icon === 'string' ? <i className={`icon ${icon}`} /> : icon)}

{!icon && children}

{loading && <LoadingOutlined style={{ marginLeft: '0.5rem' }} />}
</ButtonElem>
);

Expand Down
5 changes: 3 additions & 2 deletions src/components/Organizations/AddGroupToProject/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export const AddGroupToProject = ({
<Modal isOpen={open} onRequestClose={closeModal} contentLabel={`Confirm`} style={customStyles}>
<React.Fragment>
<Mutation mutation={ADD_GROUP_PROJECT_MUTATION} onError={e => console.error(e)}>
{(addGroupProject, { error, data }) => {
{(addGroupProject, { called, error, data }) => {
if (error) {
return <div>{error.message}</div>;
}
Expand Down Expand Up @@ -86,7 +86,7 @@ export const AddGroupToProject = ({
</label>
<Footer>
<Button
disabled={selectedProject === null}
disabled={called || selectedProject === null}
action={() => {
addGroupProject({
variables: {
Expand All @@ -96,6 +96,7 @@ export const AddGroupToProject = ({
});
}}
variant="primary"
loading={called}
>
Add
</Button>
Expand Down
7 changes: 4 additions & 3 deletions src/components/Organizations/AddNotificationToProject/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ export const AddNotificationToProject = ({
<Modal isOpen={open} onRequestClose={closeModal} contentLabel={`Confirm`} style={customStyles}>
<React.Fragment>
<Mutation mutation={ADD_PROJECT_NOTIFICATION_MUTATION} onError={e => console.error(e)}>
{(addNotificationToProject, { error, data }) => {
{(addNotificationToProject, { called, error, data }) => {
if (error) {
return <div>{error.message}</div>;
}
Expand All @@ -84,7 +84,7 @@ export const AddNotificationToProject = ({
Notification
<RoleSelect>
<ReactSelect
className='select'
className="select"
menuPortalTarget={document.body}
styles={{
menuPortal: base => ({ ...base, zIndex: 9999, color: 'black', fontSize: '16px' }),
Expand All @@ -105,7 +105,7 @@ export const AddNotificationToProject = ({
</label>
<Footer>
<Button
disabled={selectedProject === null}
disabled={called || selectedProject === null}
action={() => {
addNotificationToProject({
variables: {
Expand All @@ -116,6 +116,7 @@ export const AddNotificationToProject = ({
});
}}
variant="primary"
loading={called}
>
Add
</Button>
Expand Down
14 changes: 9 additions & 5 deletions src/components/Organizations/AddUserToGroup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,13 @@ export const AddUserToGroup = ({
selectedRole,
setSelectedRole,
onAddUser,
users,
}) => {
const userAlreadyExists = users && users.find(u => u.user.email === inputValueEmail);

return (
<Mutation mutation={ADD_GROUP_MEMBER_MUTATION} onError={err => console.error(err)}>
{(addGroupMember, { error, data }) => {
{(addGroupMember, { called, error, data }) => {
if (error) {
return <div>{error.message}</div>;
}
Expand All @@ -67,7 +70,7 @@ export const AddUserToGroup = ({
}
return (
<NewMember>
<h4>Add User</h4>
<h4>{userAlreadyExists ? 'Update User' : 'Add User'}</h4>
<div className="form-box">
<label>
User Email: <span style={{ color: '#E30000' }}>*</span>
Expand All @@ -76,7 +79,7 @@ export const AddUserToGroup = ({
type="text"
placeholder="Enter Email"
value={inputValueEmail}
onChange={setInputValue}
onChange={e => setInputValue({ target: { value: e.target.value.trim() } })}
/>
</label>
</div>
Expand Down Expand Up @@ -106,7 +109,7 @@ export const AddUserToGroup = ({
<div>
<Footer>
<Button
disabled={inputValueEmail === '' || !selectedRole}
disabled={called || inputValueEmail === '' || !selectedRole}
action={() => {
addGroupMember({
variables: {
Expand All @@ -117,8 +120,9 @@ export const AddUserToGroup = ({
});
}}
variant="primary"
loading={called}
>
Add
{userAlreadyExists ? 'Update' : 'Add'}
</Button>
<Button variant="ghost" action={() => close()}>
Cancel
Expand Down
7 changes: 4 additions & 3 deletions src/components/Organizations/AddUserToGroupSelect/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
mutation={ADD_GROUP_MEMBER_MUTATION}
onError={err => console.error(err)}
>
{(addGroupMember, { error, data }) => {
{(addGroupMember, { called, error, data }) => {
if (error) {
return <div>{error.message}</div>;
}
Expand All @@ -94,7 +94,7 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
type="text"
placeholder="Enter Email"
value={newUserState.email}
onChange={e => setNewUserState({ ...newUserState, email: e.target.value })}
onChange={e => setNewUserState({ ...newUserState, email: e.target.value.trim() })}
/>
</label>
</div>
Expand Down Expand Up @@ -151,7 +151,8 @@ const AddUserToGroupSelect: FC<Props> = ({ groups, newUserState, setNewUserState
<div>
<Footer>
<Button
disabled={!Object.values(newUserState).every(item => !!item)}
loading={called}
disabled={called || !Object.values(newUserState).every(item => !!item)}
action={() => {
void addGroupMember({
variables: {
Expand Down
14 changes: 8 additions & 6 deletions src/components/Organizations/AddUserToOrganization/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,12 @@ export const AddUserToOrganization = ({
checkboxValueOwner,
setCheckboxValueOwner,
onAddUser,
users,
}) => {

const userAlreadyExists = users.find(u => u.email === inputValueEmail);
return (
<Mutation mutation={ADD_USER_MUTATION} onError={err => console.error(err)}>
{(addUser, { error, data }) => {
{(addUser, { called, error, data }) => {
if (error) {
return <div>{error.message}</div>;
}
Expand All @@ -45,7 +46,7 @@ export const AddUserToOrganization = ({
}
return (
<NewUser>
<h4>Add User</h4>
<h4>{userAlreadyExists ? 'Update user' : 'Add User'}</h4>
<div className="form-box">
<label>
User Email: <span style={{ color: '#E30000' }}>*</span>
Expand All @@ -54,7 +55,7 @@ export const AddUserToOrganization = ({
type="text"
placeholder="Enter Email"
value={inputValueEmail}
onChange={setInputValue}
onChange={e => setInputValue({ target: { value: e.target.value.trim() } })}
/>
</label>
</div>
Expand All @@ -71,7 +72,8 @@ export const AddUserToOrganization = ({
<div>
<Footer>
<Button
disabled={inputValueEmail === ''}
disabled={called || inputValueEmail === ''}
loading={called}
action={() => {
addUser({
variables: {
Expand All @@ -83,7 +85,7 @@ export const AddUserToOrganization = ({
}}
variant="primary"
>
Add
{userAlreadyExists ? 'Update' : 'Add'}
</Button>
<Button variant="ghost" action={() => close()}>
Cancel
Expand Down
Loading