Skip to content

Commit

Permalink
fix(config-ui): some bugs for transformation (#6313)
Browse files Browse the repository at this point in the history
* fix(config-ui): copywriting errors

* fix(config-ui): the transformation default value

* fix(config-ui): adjust the copywriting in bitbucket transformation
  • Loading branch information
mintsweet authored Oct 25, 2023
1 parent 98b6062 commit b52a936
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
5 changes: 1 addition & 4 deletions config-ui/src/plugins/register/bitbucket/transformation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,7 @@ export const BitbucketTransformation = ({ entities, transformation, setTransform
</div>
<div className="text">
<Checkbox checked={useCustom} onChange={handleChangeUseCustom} />
<span>
Convert a BitBucket Pipeline to a DevLake Deployment when its branch/tag name or one of its pipeline
steps’ names
</span>
<span>Convert a BitBucket Pipeline to a DevLake Deployment when its branch/tag name</span>
</div>
<div className="sub-text">
<span>matches</span>
Expand Down
5 changes: 3 additions & 2 deletions config-ui/src/plugins/register/github/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,9 @@ export const GitHubConfig: PluginConfigType = {
issuePriority: '(highest|high|medium|low|p0|p1|p2|p3)',
issueComponent: 'component(.*)',
issueSeverity: 'severity(.*)',
deploymentPattern: '(deploy|push-image)',
productionPattern: 'prod(.*)',
envNamePattern: '(?i)prod(.*)',
deploymentPattern: '',
productionPattern: '',
prType: 'type(.*)',
prComponent: 'component(.*)',
prBodyClosePattern:
Expand Down
10 changes: 6 additions & 4 deletions config-ui/src/plugins/register/github/transformation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ export const GitHubTransformation = ({ entities, transformation, setTransformati
</p>
<div className="text">
<Checkbox disabled checked />
<span>Convert a GitHub Workflow to a DevLake Deployment </span>
<span>Convert a GitHub Deployment to a DevLake Deployment </span>
</div>
<div className="sub-text">
<span>If its environment name matches</span>
Expand All @@ -216,10 +216,12 @@ export const GitHubTransformation = ({ entities, transformation, setTransformati
</div>
<div className="text">
<Checkbox checked={useCustom} onChange={handleChangeUseCustom} />
<span>Convert a GitHub Workflow to a DevLake Deployment</span>
<span>Convert a GitHub workflow run as a DevLake Deployment when: </span>
</div>
<div className="sub-text">
<span>Its branch/tag name or one of its jobs matches</span>
<span>
The name of the <strong>GitHub workflow run</strong> or <strong> one of its jobs</strong> matches
</span>
<InputGroup
style={{ width: 180, margin: '0 8px' }}
placeholder="(deploy|push-image)"
Expand Down Expand Up @@ -248,7 +250,7 @@ export const GitHubTransformation = ({ entities, transformation, setTransformati
})
}
/>
<span>, this Deployment is a ‘Production Deployment’</span>
<span>, this deployment is a ‘Production Deployment’</span>
<HelpTooltip content="If you leave this field empty, all Deployments will be tagged as in the Production environment. " />
</div>
</S.CICD>
Expand Down
5 changes: 3 additions & 2 deletions config-ui/src/plugins/register/gitlab/config.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ export const GitLabConfig: PluginConfigType = {
scopeConfig: {
entities: ['CODE', 'TICKET', 'CODEREVIEW', 'CROSS', 'CICD'],
transformation: {
deploymentPattern: '(deploy|push-image)',
productionPattern: 'prod(.*)',
envNamePattern: '(?i)prod(.*)',
deploymentPattern: '',
productionPattern: '',
},
},
};
8 changes: 5 additions & 3 deletions config-ui/src/plugins/register/gitlab/transformation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ export const GitLabTransformation = ({ entities, transformation, setTransformati
</p>
<div className="text">
<Checkbox disabled checked />
<span>Convert a GitLab Deployment to a DevLake Deployment</span>
<span>Convert a GitLab Deployment to a DevLake Deployment </span>
</div>
<div className="sub-text">
<span>If its environment name matches</span>
Expand All @@ -91,10 +91,12 @@ export const GitLabTransformation = ({ entities, transformation, setTransformati
</div>
<div className="text">
<Checkbox checked={useCustom} onChange={handleChangeUseCustom} />
<span>Convert a GitLab Pipeline as a DevLake Deployment when:</span>
<span>Convert a GitLab Pipeline as a DevLake Deployment when: </span>
</div>
<div className="sub-text">
<span>Its branch/tag name or one of its jobs matches</span>
<span>
Its branch/tag name or <strong>one of its jobs</strong> matches
</span>
<InputGroup
style={{ width: 180, margin: '0 8px' }}
placeholder="(deploy|push-image)"
Expand Down

0 comments on commit b52a936

Please sign in to comment.