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 558dabc58 fix: bitbucket server patch (#6968)
558dabc58 is described below
commit 558dabc588833f271f075137843da4c5ede03b6a
Author: 青湛 <[email protected]>
AuthorDate: Sun Feb 18 22:00:42 2024 +1300
fix: bitbucket server patch (#6968)
---
.../components/connection-form/fields/password.tsx | 2 +-
.../plugins/register/bitbucket-server/config.tsx | 6 +--
.../plugins/register/bitbucket-server/styled.ts | 46 ----------------------
.../register/bitbucket-server/transformation.tsx | 6 +--
4 files changed, 7 insertions(+), 53 deletions(-)
diff --git
a/config-ui/src/plugins/components/connection-form/fields/password.tsx
b/config-ui/src/plugins/components/connection-form/fields/password.tsx
index 8cbb8bd29..de6e7f190 100644
--- a/config-ui/src/plugins/components/connection-form/fields/password.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/password.tsx
@@ -58,7 +58,7 @@ export const ConnectionPassword = ({
return (
<Block title={label ?? 'Password'} description={subLabel ? subLabel :
null} required>
- <Input
+ <Input.Password
style={{ width: 386 }}
placeholder={type === 'update' ? '********' : placeholder ?
placeholder : 'Your Password'}
value={value}
diff --git a/config-ui/src/plugins/register/bitbucket-server/config.tsx
b/config-ui/src/plugins/register/bitbucket-server/config.tsx
index df30a217f..d55328377 100644
--- a/config-ui/src/plugins/register/bitbucket-server/config.tsx
+++ b/config-ui/src/plugins/register/bitbucket-server/config.tsx
@@ -17,13 +17,14 @@
*/
import { DOC_URL } from '@/release';
+import { IPluginConfig } from '@/types';
import Icon from './assets/icon.svg?react';
-export const BitBucketServerConfig = {
+export const BitBucketServerConfig: IPluginConfig = {
plugin: 'bitbucket_server',
name: 'BitBucket Data Center',
- icon: Icon,
+ icon: ({ color }) => <Icon fill={color} />,
sort: 5,
connection: {
docLink: DOC_URL.PLUGIN.BITBUCKET_SERVER.BASIS,
@@ -50,7 +51,6 @@ export const BitBucketServerConfig = {
],
},
dataScope: {
- localSearch: true,
searchPlaceholder: 'Enter the keywords to search for repositories that you
have read access',
title: 'Repositories',
millerColumn: {
diff --git a/config-ui/src/plugins/register/bitbucket-server/styled.ts
b/config-ui/src/plugins/register/bitbucket-server/styled.ts
deleted file mode 100644
index c2b51c5eb..000000000
--- a/config-ui/src/plugins/register/bitbucket-server/styled.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import styled from 'styled-components';
-
-export const Transformation = styled.div`
- .issue-tracking {
- .issue-type {
- .title {
- margin-bottom: 8px;
- }
-
- .list {
- padding-left: 40px;
- }
- }
- }
-
- .bp5-form-group {
- display: flex;
- align-items: center;
-
- .bp5-label {
- flex: 0 0 140px;
- }
-
- .bp5-form-content {
- flex: auto;
- }
- }
-`;
\ No newline at end of file
diff --git a/config-ui/src/plugins/register/bitbucket-server/transformation.tsx
b/config-ui/src/plugins/register/bitbucket-server/transformation.tsx
index 68544848d..f20660eab 100644
--- a/config-ui/src/plugins/register/bitbucket-server/transformation.tsx
+++ b/config-ui/src/plugins/register/bitbucket-server/transformation.tsx
@@ -17,8 +17,8 @@
*/
import { useMemo, useState, useEffect } from 'react';
-import { CaretRightOutlined, CheckCircleOutlined, CloseCircleOutlined } from
'@ant-design/icons';
-import { theme, Collapse, Tag, Form, Input, Checkbox, Select } from 'antd';
+import { CaretRightOutlined } from '@ant-design/icons';
+import { theme, Collapse, Form, Input } from 'antd';
import { ExternalLink, HelpTooltip } from '@/components';
import { DOC_URL } from '@/release';
@@ -111,7 +111,7 @@ const renderCollapseItems = ({
onChangeTransformation: any;
useCustom: boolean;
onChangeUseCustom: any;
-}) =>
+}) =>
[
{
key: 'CODEREVIEW',