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

Jump to bottom

fix off centre alt avatar bug #368

Merged
merged 2 commits into from
Aug 18, 2021
Merged

fix off centre alt avatar bug #368

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cb76ac
fix off centre alt avatar bug
Aug 18, 2021
26b1de1
add go binary
Aug 18, 2021
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 package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"dagre": "^0.8.5",
"date-fns": "^2.16.1",
"immer": "^9.0.3",
"lodash": "^4.17.20",
"lodash": "^4.17.21",
"normalize.css": "^8.0.1",
"pathfinding": "^0.4.18",
"paths-js": "^0.4.11",
Expand Down
256 changes: 191 additions & 65 deletions src/components/shared/activity/simple.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,121 +17,150 @@ import styles from './simple.module.scss';

const cx = classNames.bind(styles);

const PushActivity = (props) => (
<div className={cx('activity', props.className || '')}>
function wrapReferenceLink(child, {
namespace, name, refs, deeplink,
}) {
return deeplink === true ? (
<a href={`/link/${namespace}/${name}/tree/${refs}`} target="_blank" rel="noreferrer">{child}</a>
) : child;
}

function wrapCommitLink(child, {
namespace, name, commit, deeplink,
}) {
return deeplink === true ? (
<a href={`/link/${namespace}/${name}/commit/${commit}`} target="_blank" rel="noreferrer">{child}</a>
) : child;
}

function wrapBuildLink(child, {
namespace, name, number, deeplink,
}) {
return deeplink === true ? (
<a href={`/${namespace}/${name}/${number}`}>{child}</a>
) : child;
}

const PushActivity = ({
className, avatar, actor, commit, branch, namespace, name, deeplink,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<span>{props.actor}</span>
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
<span className={cx('info')}>{actor}</span>
</div>
<div className={cx('chunk')} data-type="chunk">
<span>pushed</span>
{wrapCommitLink(<CommitLabel className={cx('label')} commit={props?.commit.substr(0, 8)} />, props)}
<span className={cx('info')}>pushed</span>
{wrapCommitLink(<CommitLabel className={cx('label')} commit={commit.substr(0, 8)} />, {
namespace, name, commit, deeplink,
})}
</div>
<div className={cx('chunk')} data-type="chunk">
<span>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={props?.branch} />, props)}
<span className={cx('info')}>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={branch} />, {
namespace, name, commit, deeplink,
})}
</div>
</div>
);

const PullRequestActivity = (props) => (
<div className={cx('activity', props.className || '')}>
const PullRequestActivity = ({
className, avatar, actor, branch, action, refs, namespace, name, commit, deeplink,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<span>{props.actor}</span>
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
<span className={cx('info')}>{actor}</span>
</div>
<div className={cx('chunk')} data-type="chunk">
<span>{props.action == 'opened' ? 'opened' : 'synchronized'}</span>
<span>pull request</span>
{wrapReferenceLink(<PullRequestLabel className={cx('label')} pr={props.refs} />, props)}
<span className={cx('info')}>{action === 'opened' ? 'opened' : 'synchronized'}</span>
<span className={cx('info')}>pull request</span>
{wrapReferenceLink(<PullRequestLabel className={cx('label')} pr={refs} />, {
namespace, name, commit, deeplink,
})}
</div>
<div className={cx('chunk')} data-type="chunk">
<span>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={props?.branch} />, props)}
<span className={cx('info')}>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={branch} />, {
namespace, name, commit, deeplink,
})}
</div>
</div>
);

const TagActivity = (props) => (
<div className={cx('activity', props.className || '')}>
const TagActivity = ({
className, avatar, actor, refs, namespace, name, commit, deeplink,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<span>{props.actor}</span>
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
<span className={cx('info')}>{actor}</span>
</div>
<div className={cx('chunk')} data-type="chunk">
<span>created</span>
{wrapReferenceLink(<TagLabel className={cx('label')} tag={props.refs} />, props)}
<span className={cx('info')}>created</span>
{wrapReferenceLink(<TagLabel className={cx('label')} tag={refs} />, {
namespace, name, commit, deeplink,
})}
</div>
</div>
);

const PromoteActivity = (props) => (
<div className={cx('activity', props.className || '')}>
const PromoteActivity = ({
className, avatar, actor, namespace, name, commit, deeplink, parent, target,
}) => (
<div className={cx('activity', className || '')}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<span>{props.actor}</span>
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
<span className={cx('info')}>{actor}</span>
</div>
<div className={cx('chunk')} data-type="chunk">
<span>promoted build</span>
{wrapBuildLink(<BuildLabel className={cx('label')} build={props.parent} />, props)}
<span className={cx('info')}>promoted build</span>
{wrapBuildLink(<BuildLabel className={cx('label')} build={parent} />, {
namespace, name, commit, deeplink,
})}
</div>
<div className={cx('chunk')} data-type="chunk">
<span>to</span>
<EnvironmentLabel className={cx('label')} environment={props.target} />
<span className={cx('info')}>to</span>
<EnvironmentLabel className={cx('label')} environment={target} />
</div>
</div>
);

const RollbackActivity = (props) => (
<div className={cx('activity', props.className || '')}>
const RollbackActivity = ({
className, avatar, actor, namespace, name, commit, deeplink, target, parent,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<span>{props.actor}</span>
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
<span className={cx('info')}>{actor}</span>
</div>
<div className={cx('chunk')} data-type="chunk">
<span>rolled back</span>
<EnvironmentLabel className={cx('label')} environment={props.target} />
<span className={cx('info')}>rolled back</span>
<EnvironmentLabel className={cx('label')} environment={target} />
</div>
<div className={cx('chunk')} data-type="chunk">
<span>to build</span>
{wrapBuildLink(<BuildLabel className={cx('label')} build={props.parent} />, props)}
<span className={cx('info')}>to build</span>
{wrapBuildLink(<BuildLabel className={cx('label')} build={parent} />, {
namespace, name, commit, deeplink,
})}
</div>
</div>
);

const CronActivity = (props) => (
<div className={cx('activity', props.className || '')}>
const CronActivity = ({
className, avatar, actor, cron,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
<Avatar path={props.avatar} alt={props.actor} text={props.actor} className={cx('avatar')} />
<Avatar path={avatar} alt={actor} text={actor} className={cx('avatar')} />
</div>
<div className={cx('chunk')} data-type="chunk">
<span>executed scheduled task</span>
<CronLabel className={cx('label')} name={props.cron} />
<span className={cx('info')}>executed scheduled task</span>
<CronLabel className={cx('label')} name={cron} />
</div>
</div>
);

// eslint-disable-next-line
function wrapReferenceLink(child, { namespace, name, refs, deeplink }) {
return deeplink === true ? (
<a href={`/link/${namespace}/${name}/tree/${refs}`} target="_blank">{child}</a>
) : child;
}

// eslint-disable-next-line
function wrapCommitLink(child, { namespace, name, commit, deeplink }) {
return deeplink === true ? (
<a href={`/link/${namespace}/${name}/commit/${commit}`} target="_blank">{child}</a>
) : child;
}

// eslint-disable-next-line
function wrapBuildLink(child, { namespace, name, number, deeplink }) {
return deeplink === true ? (
<a href={`/${namespace}/${name}/${number}`}>{child}</a>
) : child;
}

const SimpleActivity = (props) => {
switch (props.event) {
case 'pull_request':
Expand Down Expand Up @@ -181,4 +210,101 @@ SimpleActivity.defaultProps = {
refs: undefined,
};

PushActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
commit: PropTypes.string,
branch: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
};

PushActivity.defaultProps = {
className: '',
commit: undefined,
branch: undefined,
};

PullRequestActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
commit: PropTypes.string,
branch: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
refs: PropTypes.string.isRequired,
action: PropTypes.string.isRequired,
};

PullRequestActivity.defaultProps = {
className: '',
commit: undefined,
branch: undefined,
};

TagActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
commit: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
refs: PropTypes.string.isRequired,
};

TagActivity.defaultProps = {
className: '',
commit: undefined,
};

PromoteActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
commit: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
parent: PropTypes.string.isRequired,
target: PropTypes.string.isRequired,
};

PromoteActivity.defaultProps = {
className: '',
commit: undefined,
};

RollbackActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
commit: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
parent: PropTypes.string.isRequired,
target: PropTypes.string.isRequired,
};

RollbackActivity.defaultProps = {
className: '',
commit: undefined,
};

CronActivity.propTypes = {
className: PropTypes.string,
avatar: PropTypes.string.isRequired,
actor: PropTypes.string.isRequired,
cron: PropTypes.string.isRequired,
};

CronActivity.defaultProps = {
className: '',
};

export default SimpleActivity;
2 changes: 1 addition & 1 deletion src/components/shared/activity/simple.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
align-items: center;
}

span {
.info {
margin: 0px 2px;
display: inline-block;
color: #4f5162;
Expand Down