Skip to content

Commit

Permalink
fix branch link bug (#372)
Browse files Browse the repository at this point in the history
* fix branch link bug

Fix the wrong field reference in the component `PullRequestActivity` to fix the branch link

* fix branch link bug

* fixed other refs issue and updated relevant props

Co-authored-by: Dan Wilson <daniel.wilson@harness.io>
  • Loading branch information
rohow and Dan Wilson committed Aug 31, 2021
1 parent a728dd5 commit db41809
Showing 1 changed file with 18 additions and 16 deletions.
34 changes: 18 additions & 16 deletions src/components/shared/activity/simple.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ function wrapBuildLink(child, {
}

const PushActivity = ({
className, avatar, actor, commit, branch, namespace, name, deeplink,
className, avatar, actor, commit, branch, namespace, name, deeplink, refs,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
Expand All @@ -58,14 +58,14 @@ const PushActivity = ({
<div className={cx('chunk')} data-type="chunk">
<span className={cx('info')}>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={branch} />, {
namespace, name, commit, deeplink,
namespace, name, refs, deeplink,
})}
</div>
</div>
);

const PullRequestActivity = ({
className, avatar, actor, branch, action, refs, namespace, name, commit, deeplink,
className, avatar, actor, branch, action, refs, namespace, name, deeplink,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
Expand All @@ -76,20 +76,20 @@ const PullRequestActivity = ({
<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,
namespace, name, refs, deeplink,
})}
</div>
<div className={cx('chunk')} data-type="chunk">
<span className={cx('info')}>to</span>
{wrapReferenceLink(<BranchLabel className={cx('label')} branch={branch} />, {
namespace, name, commit, deeplink,
namespace, name, refs, deeplink,
})}
</div>
</div>
);

const TagActivity = ({
className, avatar, actor, refs, namespace, name, commit, deeplink,
className, avatar, actor, refs, namespace, name, deeplink,
}) => (
<div className={cx('activity', className)}>
<div className={cx('chunk')} data-type="chunk">
Expand All @@ -99,7 +99,7 @@ const TagActivity = ({
<div className={cx('chunk')} data-type="chunk">
<span className={cx('info')}>created</span>
{wrapReferenceLink(<TagLabel className={cx('label')} tag={refs} />, {
namespace, name, commit, deeplink,
namespace, name, refs, deeplink,
})}
</div>
</div>
Expand Down Expand Up @@ -218,48 +218,48 @@ PushActivity.propTypes = {
branch: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
deeplink: PropTypes.bool,
refs: PropTypes.string.isRequired,
};

PushActivity.defaultProps = {
className: '',
commit: undefined,
branch: undefined,
deeplink: 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,
deeplink: PropTypes.bool,
refs: PropTypes.string.isRequired,
action: PropTypes.string.isRequired,
};

PullRequestActivity.defaultProps = {
className: '',
commit: undefined,
branch: undefined,
deeplink: 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,
deeplink: PropTypes.bool,
refs: PropTypes.string.isRequired,
};

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

PromoteActivity.propTypes = {
Expand All @@ -269,14 +269,15 @@ PromoteActivity.propTypes = {
commit: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
deeplink: PropTypes.bool,
parent: PropTypes.string.isRequired,
target: PropTypes.string.isRequired,
};

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

RollbackActivity.propTypes = {
Expand All @@ -286,14 +287,15 @@ RollbackActivity.propTypes = {
commit: PropTypes.string,
namespace: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
deeplink: PropTypes.string.isRequired,
deeplink: PropTypes.bool,
parent: PropTypes.string.isRequired,
target: PropTypes.string.isRequired,
};

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

CronActivity.propTypes = {
Expand Down

0 comments on commit db41809

Please sign in to comment.