Skip to content

Commit 7fde03a

Browse files
committed
Merge branch 'main' into feat/create-plugin
2 parents 888f57c + 7ef87b1 commit 7fde03a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1052
-211
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.1.19-beta-1",
3+
"version": "0.2.2",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Assets/Icon/ic-book-open.svg

Lines changed: 16 additions & 0 deletions
Loading

src/Assets/Icon/ic-filter-applied.svg

Lines changed: 16 additions & 0 deletions
Loading

src/Assets/Icon/ic-filter.svg

Lines changed: 16 additions & 0 deletions
Loading

src/Assets/Icon/ic-lego-block.svg

Lines changed: 16 additions & 0 deletions
Loading

src/Common/AddCDButton/AddCDButton.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* limitations under the License.
1515
*/
1616

17-
import React from 'react'
1817
import Tippy from '@tippyjs/react'
1918
import { AddCDButtonProps, TooltipContentProps } from './types'
2019
import { AddCDPositions } from '../Types'

src/Common/ChartVersionAndTypeSelector.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
7070
return (
7171
<div className="flex">
7272
<div className="chart-type-options flex" data-testid="chart-type-options">
73-
<span className="chart-type-options-label mr-4">Chart Type</span>
73+
<span className="cn-7 mr-4">Chart Type</span>
7474
<ReactSelect
7575
value={selectedChartType ?? chartTypeOptions[0]}
7676
options={chartTypeOptions}
@@ -79,7 +79,7 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
7979
/>
8080
</div>
8181
<div className="chart-version-options flex" data-testid="chart-version-options">
82-
<span className="chart-version-options-label mr-4">Chart Version</span>
82+
<span className="cn-7 mr-4">Chart Version</span>
8383
<ReactSelect
8484
value={selectedChartVersion ?? chartVersionOptions[0]}
8585
options={chartVersionOptions}

src/Common/ClipboardButton/ClipboardButton.tsx

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export default function ClipboardButton({
5252
},
5353
[content],
5454
)
55+
const iconClassName = `icon-dim-${iconSize} dc__no-shrink`
5556

5657
useEffect(() => {
5758
if (!copied) return
@@ -71,28 +72,22 @@ export default function ClipboardButton({
7172
}
7273
}, [trigger, handleCopyContent])
7374
return (
74-
<div className="icon-dim-16 flex center">
75-
<Tippy
76-
className="default-tt"
77-
content={copied ? copiedTippyText : 'Copy'}
78-
placement="bottom"
79-
visible={copied || enableTippy}
80-
arrow={false}
75+
<Tippy
76+
className="default-tt"
77+
content={copied ? copiedTippyText : 'Copy'}
78+
placement="bottom"
79+
visible={copied || enableTippy}
80+
arrow={false}
81+
>
82+
<button
83+
type="button"
84+
className={`dc__outline-none-imp p-0 flex dc__transparent--unstyled dc__no-border ${rootClassName}`}
85+
onMouseEnter={handleEnableTippy}
86+
onMouseLeave={handleDisableTippy}
87+
onClick={handleCopyContent}
8188
>
82-
<button
83-
type="button"
84-
className={`dc__outline-none-imp p-0 flex bcn-0 dc__no-border ${rootClassName}`}
85-
onMouseEnter={handleEnableTippy}
86-
onMouseLeave={handleDisableTippy}
87-
onClick={handleCopyContent}
88-
>
89-
{copied ? (
90-
<Check className={`icon-dim-${iconSize}`} />
91-
) : (
92-
<ICCopy className={`icon-dim-${iconSize}`} />
93-
)}
94-
</button>
95-
</Tippy>
96-
</div>
89+
{copied ? <Check className={iconClassName} /> : <ICCopy className={iconClassName} />}
90+
</button>
91+
</Tippy>
9792
)
9893
}

src/Common/Constants.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export const PATTERNS = {
3434
KUBERNETES_KEY_NAME: /^(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$/,
3535
START_END_ALPHANUMERIC: /^([Az09].*[A-Za-z0-9])$|[A-Za-z0-9]$/,
3636
ALPHANUMERIC_WITH_SPECIAL_CHAR: /^[A-Za-z0-9._-]+$/, // allow alphanumeric,(.) ,(-),(_)
37+
ESCAPED_CHARACTERS: /[.*+?^${}()|[\]\\]/g,
3738
}
3839

3940
export const URLS = {
@@ -95,6 +96,8 @@ export const ROUTES = {
9596
CONFIG_CD_PIPELINE: 'config/cd-pipeline',
9697
MODULE_CONFIGURED: 'module/config',
9798
RESOURCE_HISTORY_DEPLOYMENT: 'resource/history/deployment',
99+
APP_LIST_MIN: 'app/min',
100+
CLUSTER_LIST_MIN: 'cluster/autocomplete',
98101
PLUGIN_GLOBAL_LIST_DETAIL_V2: 'plugin/global/list/detail/v2',
99102
PLUGIN_GLOBAL_LIST_V2: 'plugin/global/list/v2',
100103
PLUGIN_GLOBAL_LIST_TAGS: 'plugin/global/list/tags',

0 commit comments

Comments
 (0)