From c255232daf2c36af9abc92bd69aebbc6f72dca1c Mon Sep 17 00:00:00 2001
From: mintsweet <0x1304570@gmail.com>
Date: Tue, 24 Oct 2023 19:35:41 +1300
Subject: [PATCH 1/3] fix(config-ui): copywriting errors

---
 .../src/plugins/register/github/transformation.tsx     | 10 ++++++----
 .../src/plugins/register/gitlab/transformation.tsx     |  8 +++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/config-ui/src/plugins/register/github/transformation.tsx b/config-ui/src/plugins/register/github/transformation.tsx
index 397df17fe01..93a184fd13d 100644
--- a/config-ui/src/plugins/register/github/transformation.tsx
+++ b/config-ui/src/plugins/register/github/transformation.tsx
@@ -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>
@@ -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)"
@@ -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>
diff --git a/config-ui/src/plugins/register/gitlab/transformation.tsx b/config-ui/src/plugins/register/gitlab/transformation.tsx
index 5c09f239f55..e2505030ed4 100644
--- a/config-ui/src/plugins/register/gitlab/transformation.tsx
+++ b/config-ui/src/plugins/register/gitlab/transformation.tsx
@@ -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>
@@ -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)"

From 16de434e8c7e92ef413f403b717fb848ec16d0ad Mon Sep 17 00:00:00 2001
From: mintsweet <0x1304570@gmail.com>
Date: Tue, 24 Oct 2023 20:58:41 +1300
Subject: [PATCH 2/3] fix(config-ui): the transformation default value

---
 config-ui/src/plugins/register/github/config.tsx | 5 +++--
 config-ui/src/plugins/register/gitlab/config.tsx | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/config-ui/src/plugins/register/github/config.tsx b/config-ui/src/plugins/register/github/config.tsx
index f79b56eaaea..ecde8f1fe69 100644
--- a/config-ui/src/plugins/register/github/config.tsx
+++ b/config-ui/src/plugins/register/github/config.tsx
@@ -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:
diff --git a/config-ui/src/plugins/register/gitlab/config.tsx b/config-ui/src/plugins/register/gitlab/config.tsx
index 74bd7f007d8..a51a5f97102 100644
--- a/config-ui/src/plugins/register/gitlab/config.tsx
+++ b/config-ui/src/plugins/register/gitlab/config.tsx
@@ -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: '',
     },
   },
 };

From 53a2c723259db6a71ef777f93816f8b4547d98dd Mon Sep 17 00:00:00 2001
From: mintsweet <0x1304570@gmail.com>
Date: Tue, 24 Oct 2023 21:09:46 +1300
Subject: [PATCH 3/3] fix(config-ui): adjust the copywriting in bitbucket
 transformation

---
 config-ui/src/plugins/register/bitbucket/transformation.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/config-ui/src/plugins/register/bitbucket/transformation.tsx b/config-ui/src/plugins/register/bitbucket/transformation.tsx
index b495570ab09..5124c65fdb9 100644
--- a/config-ui/src/plugins/register/bitbucket/transformation.tsx
+++ b/config-ui/src/plugins/register/bitbucket/transformation.tsx
@@ -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>