You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by kl...@apache.org on 2024/03/12 07:15:48 UTC
(incubator-devlake) branch main updated: feat: adjust the bitbucket cloud and server (#7157)
This is an automated email from the ASF dual-hosted git repository.
klesh pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/main by this push:
new ed3d17d7f feat: adjust the bitbucket cloud and server (#7157)
ed3d17d7f is described below
commit ed3d17d7fea11cabb7aaf75925dde69e821c5e10
Author: 青湛 <0x...@gmail.com>
AuthorDate: Tue Mar 12 20:15:43 2024 +1300
feat: adjust the bitbucket cloud and server (#7157)
---
config-ui/src/plugins/register/bitbucket-server/config.tsx | 8 ++++----
config-ui/src/plugins/register/bitbucket/config.tsx | 14 ++++++--------
.../src/plugins/register/bitbucket/transformation.tsx | 6 +++---
config-ui/src/plugins/register/index.ts | 8 ++++----
4 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/config-ui/src/plugins/register/bitbucket-server/config.tsx b/config-ui/src/plugins/register/bitbucket-server/config.tsx
index d55328377..15c14eaa6 100644
--- a/config-ui/src/plugins/register/bitbucket-server/config.tsx
+++ b/config-ui/src/plugins/register/bitbucket-server/config.tsx
@@ -21,9 +21,9 @@ import { IPluginConfig } from '@/types';
import Icon from './assets/icon.svg?react';
-export const BitBucketServerConfig: IPluginConfig = {
+export const BitbucketServerConfig: IPluginConfig = {
plugin: 'bitbucket_server',
- name: 'BitBucket Data Center',
+ name: 'Bitbucket Server',
icon: ({ color }) => <Icon fill={color} />,
sort: 5,
connection: {
@@ -42,10 +42,10 @@ export const BitBucketServerConfig: IPluginConfig = {
{
key: 'rateLimitPerHour',
subLabel:
- 'By default, DevLake uses dynamic rate limit for optimized data collection for BitBucket Server. But you can adjust the collection speed by entering a fixed value.',
+ 'By default, DevLake uses dynamic rate limit for optimized data collection for Bitbucket Server. But you can adjust the collection speed by entering a fixed value.',
learnMore: DOC_URL.PLUGIN.BITBUCKET_SERVER.RATE_LIMIT,
externalInfo:
- 'The maximum rate limit for different entities in BitBucket Server is 60,000 or 1,000 requests/hour.',
+ 'The maximum rate limit for different entities in Bitbucket Server is 60,000 or 1,000 requests/hour.',
defaultValue: 1000,
},
],
diff --git a/config-ui/src/plugins/register/bitbucket/config.tsx b/config-ui/src/plugins/register/bitbucket/config.tsx
index dde2e1c76..25b1d7599 100644
--- a/config-ui/src/plugins/register/bitbucket/config.tsx
+++ b/config-ui/src/plugins/register/bitbucket/config.tsx
@@ -21,9 +21,9 @@ import { IPluginConfig } from '@/types';
import Icon from './assets/icon.svg?react';
-export const BitBucketConfig: IPluginConfig = {
+export const BitbucketConfig: IPluginConfig = {
plugin: 'bitbucket',
- name: 'BitBucket',
+ name: 'Bitbucket Cloud',
icon: ({ color }) => <Icon fill={color} />,
sort: 5,
connection: {
@@ -35,10 +35,8 @@ export const BitBucketConfig: IPluginConfig = {
'name',
{
key: 'endpoint',
- multipleVersions: {
- cloud: 'https://api.bitbucket.org/2.0/',
- server: '',
- },
+ subLabel: 'You do not need to enter the endpoint URL, because all versions use the same URL.',
+ disabled: true,
},
'username',
{
@@ -49,10 +47,10 @@ export const BitBucketConfig: IPluginConfig = {
{
key: 'rateLimitPerHour',
subLabel:
- 'By default, DevLake uses dynamic rate limit for optimized data collection for BitBucket. But you can adjust the collection speed by entering a fixed value.',
+ 'By default, DevLake uses dynamic rate limit for optimized data collection for Bitbucket. But you can adjust the collection speed by entering a fixed value.',
learnMore: DOC_URL.PLUGIN.BITBUCKET.RATE_LIMIT,
externalInfo:
- 'The maximum rate limit for different entities in BitBucket Cloud is 60,000 or 1,000 requests/hour.',
+ 'The maximum rate limit for different entities in Bitbucket Cloud is 60,000 or 1,000 requests/hour.',
defaultValue: 1000,
},
],
diff --git a/config-ui/src/plugins/register/bitbucket/transformation.tsx b/config-ui/src/plugins/register/bitbucket/transformation.tsx
index 9e0bc4a79..40b2c5e38 100644
--- a/config-ui/src/plugins/register/bitbucket/transformation.tsx
+++ b/config-ui/src/plugins/register/bitbucket/transformation.tsx
@@ -198,11 +198,11 @@ const renderCollapseItems = ({
<ExternalLink link={DOC_URL.PLUGIN.BITBUCKET.TRANSFORMATION}>Learn more</ExternalLink>
</p>
<Checkbox disabled checked>
- <span>Convert a BitBucket Deployment to a DevLake Deployment</span>
+ <span>Convert a Bitbucket Deployment to a DevLake Deployment</span>
<HelpTooltip content={<img src={ExampleJpg} alt="" width={400} />} />
</Checkbox>
<Checkbox checked={useCustom} onChange={onChangeUseCustom}>
- Convert a BitBucket Pipeline to a DevLake Deployment when its branch/tag name
+ Convert a Bitbucket Pipeline to a DevLake Deployment when its branch/tag name
</Checkbox>
<div style={{ margin: '8px 0', paddingLeft: 28 }}>
<span>matches</span>
@@ -219,7 +219,7 @@ const renderCollapseItems = ({
}
/>
<span>.</span>
- <HelpTooltip content="View your BitBucket Pipelines: https://support.atlassian.com/bitbucket-cloud/docs/view-your-pipeline/" />
+ <HelpTooltip content="View your Bitbucket Pipelines: https://support.atlassian.com/bitbucket-cloud/docs/view-your-pipeline/" />
</div>
<div style={{ margin: '8px 0', paddingLeft: 28 }}>
<span>If the name also matches</span>
diff --git a/config-ui/src/plugins/register/index.ts b/config-ui/src/plugins/register/index.ts
index e97f75957..f581eb8d1 100644
--- a/config-ui/src/plugins/register/index.ts
+++ b/config-ui/src/plugins/register/index.ts
@@ -20,9 +20,9 @@ import { IPluginConfig } from '@/types';
import { AzureConfig } from './azure';
import { BambooConfig } from './bamboo';
-import { BitBucketConfig } from './bitbucket';
+import { BitbucketConfig } from './bitbucket';
+import { BitbucketServerConfig } from './bitbucket-server';
import { CircleCIConfig } from './circleci';
-import { BitBucketServerConfig } from './bitbucket-server';
import { GitHubConfig } from './github';
import { GitLabConfig } from './gitlab';
import { JenkinsConfig } from './jenkins';
@@ -37,8 +37,8 @@ import { OpsgenieConfig } from './opsgenie';
export const pluginConfigs: IPluginConfig[] = [
AzureConfig,
BambooConfig,
- BitBucketConfig,
- BitBucketServerConfig,
+ BitbucketConfig,
+ BitbucketServerConfig,
CircleCIConfig,
GitHubConfig,
GitLabConfig,