You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by li...@apache.org on 2022/10/13 12:55:14 UTC
[incubator-devlake] 01/02: fix: display curl in the webhook page (#3406)
This is an automated email from the ASF dual-hosted git repository.
likyh pushed a commit to branch release-v0.14
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
commit ed87146572611c89f87f7f15de01465e0574821c
Author: Likyh <l...@likyh.com>
AuthorDate: Thu Oct 13 19:09:20 2022 +0800
fix: display curl in the webhook page (#3406)
* fix: display curl in webhook page
* fix: fix style
* fix: fix curl content
* fix: fix for lint
* fix: fix for review
* fix: fix for review
Co-authored-by: linyh <ya...@meri.co>
---
config-ui/src/pages/connections/incoming-webhook/add-modal.jsx | 8 ++++----
config-ui/src/pages/connections/incoming-webhook/index.jsx | 6 +++---
config-ui/src/pages/connections/incoming-webhook/styled.js | 7 +++++--
.../src/pages/connections/incoming-webhook/view-or-edit-modal.jsx | 2 +-
4 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/config-ui/src/pages/connections/incoming-webhook/add-modal.jsx b/config-ui/src/pages/connections/incoming-webhook/add-modal.jsx
index 7030feac..943976f2 100644
--- a/config-ui/src/pages/connections/incoming-webhook/add-modal.jsx
+++ b/config-ui/src/pages/connections/incoming-webhook/add-modal.jsx
@@ -55,9 +55,9 @@ export const AddModal = ({ onSubmit, onCancel }) => {
postIssuesEndpoint: `${postUrlPrefix}${res.postIssuesEndpoint}`,
closeIssuesEndpoint: `${postUrlPrefix}${res.closeIssuesEndpoint}`,
postDeploymentsCurl: `curl ${postUrlPrefix}${res.postPipelineDeployTaskEndpoint} -X 'POST' -d "{
- \\"repo_url\\":\\"$CIRCLE_REPOSITORY_URL\\",
- \\"commit_sha\\":\\"$CIRCLE_SHA1\\",
- \\"start_time\\":\\"$start_time\\"
+ \\"commit_sha\\":\\"the sha of deployment commit\\",
+ \\"repo_url\\":\\"the repo URL of the deployment commit\\",
+ \\"start_time\\":\\"Optional, eg. 2020-01-01T12:00:00+00:00\\"
}"`
})
}
@@ -142,7 +142,7 @@ export const AddModal = ({ onSubmit, onCancel }) => {
<h3>Deployment</h3>
<p>POST to register a deployment</p>
<div className='block'>
- <span style={{ flex: '1 0' }}>{record.postDeploymentsCurl}</span>
+ <span>{record.postDeploymentsCurl}</span>
<CopyToClipboard text={record.postDeploymentsCurl}>
<CopyIcon width={16} height={16} />
</CopyToClipboard>
diff --git a/config-ui/src/pages/connections/incoming-webhook/index.jsx b/config-ui/src/pages/connections/incoming-webhook/index.jsx
index f10cd75f..70214f7a 100644
--- a/config-ui/src/pages/connections/incoming-webhook/index.jsx
+++ b/config-ui/src/pages/connections/incoming-webhook/index.jsx
@@ -54,9 +54,9 @@ export const IncomingWebhook = () => {
postIssuesEndpoint: `${postUrlPrefix}${r.postIssuesEndpoint}`,
closeIssuesEndpoint: `${postUrlPrefix}${r.closeIssuesEndpoint}`,
postDeploymentsCurl: `curl ${postUrlPrefix}${r.postPipelineDeployTaskEndpoint} -X 'POST' -d "{
- \\"repo_url\\":\\"$CIRCLE_REPOSITORY_URL\\",
- \\"commit_sha\\":\\"$CIRCLE_SHA1\\",
- \\"start_time\\":\\"$start_time\\"
+ \\"commit_sha\\":\\"the sha of deployment commit\\",
+ \\"repo_url\\":\\"the repo URL of the deployment commit\\",
+ \\"start_time\\":\\"Optional, eg. 2020-01-01T12:00:00+00:00\\"
}"`
}
: existingRecord
diff --git a/config-ui/src/pages/connections/incoming-webhook/styled.js b/config-ui/src/pages/connections/incoming-webhook/styled.js
index e97baeae..91e4d47f 100644
--- a/config-ui/src/pages/connections/incoming-webhook/styled.js
+++ b/config-ui/src/pages/connections/incoming-webhook/styled.js
@@ -143,10 +143,13 @@ export const FormWrapper = styled.div`
display: flex;
align-items: center;
justify-content: space-between;
- padding: 0 10px;
- height: 38px;
+ padding: 10px;
background-color: #f0f4fe;
+ & > span {
+ flex: 1 0;
+ }
+
& > svg {
cursor: pointer;
}
diff --git a/config-ui/src/pages/connections/incoming-webhook/view-or-edit-modal.jsx b/config-ui/src/pages/connections/incoming-webhook/view-or-edit-modal.jsx
index fd63ffa6..32ede9ce 100644
--- a/config-ui/src/pages/connections/incoming-webhook/view-or-edit-modal.jsx
+++ b/config-ui/src/pages/connections/incoming-webhook/view-or-edit-modal.jsx
@@ -119,7 +119,7 @@ export const ViewOrEditModal = ({ record, onSubmit, onCancel }) => {
<h3>Deployment</h3>
<p>POST to register a deployment</p>
<div className='block'>
- <span style={{ flex: '1 0' }}>{record.postDeploymentsCurl}</span>
+ <span>{record.postDeploymentsCurl}</span>
<CopyToClipboard text={record.postDeploymentsCurl}>
<CopyIcon width={16} height={16} />
</CopyToClipboard>