Skip to content

Commit

Permalink
Merge pull request #493 from devtron-labs/release-candidate-v0.26.0
Browse files Browse the repository at this point in the history
release: release candidate v0.26.0
  • Loading branch information
eshankvaish authored Jan 2, 2025
2 parents f9ce8ed + 1df6b3a commit dd65fc6
Show file tree
Hide file tree
Showing 106 changed files with 3,697 additions and 1,843 deletions.
421 changes: 361 additions & 60 deletions package-lock.json

Large diffs are not rendered by default.

16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devtron-labs/devtron-fe-common-lib",
"version": "1.3.0-patch-4",
"version": "1.4.0",
"description": "Supporting common component library",
"type": "module",
"main": "dist/index.js",
Expand All @@ -10,7 +10,7 @@
],
"repository": {
"type": "git",
"url": "https://github.com/devtron-labs/devtron-fe-common-lib.git"
"url": "git+https://github.com/devtron-labs/devtron-fe-common-lib.git"
},
"author": "Devtron",
"license": "ISC",
Expand All @@ -31,7 +31,8 @@
"build-watch": "NODE_OPTIONS=--max_old_space_size=3072 vite build --sourcemap --watch",
"build-lib": "vite build",
"preview": "vite preview",
"lint-staged": "lint-staged"
"lint-staged": "lint-staged",
"postinstall": "patch-package"
},
"devDependencies": {
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
Expand Down Expand Up @@ -61,13 +62,13 @@
"husky": "^7.0.4",
"lint-staged": "^12.5.0",
"moment": "^2.29.4",
"monaco-editor": "0.44.0",
"monaco-yaml": "5.1.1",
"prettier": "^3.1.1",
"react-ga4": "^1.4.1",
"react-toastify": "9.1.3",
"sharp": "^0.33.5",
"svgo": "^3.3.2",
"monaco-editor": "0.44.0",
"monaco-yaml": "5.1.1",
"typescript": "5.5.4",
"vite": "5.4.11",
"vite-plugin-dts": "4.0.3",
Expand All @@ -82,6 +83,7 @@
"@rjsf/validator-ajv8": "^5.13.3",
"@typeform/embed-react": "2.20.0",
"dompurify": "^3.0.2",
"patch-package": "^8.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-draggable": "^4.4.5",
Expand All @@ -100,15 +102,15 @@
"framer-motion": "^6.5.1",
"jsonpath-plus": "^10.0.0",
"marked": "^13.0.3",
"nanoid": "^3.3.8",
"react-dates": "^21.8.0",
"react-monaco-editor": "^0.54.0",
"react-diff-viewer-continued": "^3.4.0",
"react-monaco-editor": "^0.54.0",
"sass": "^1.69.7",
"tslib": "2.7.0"
},
"overrides": {
"cross-spawn": "^7.0.5",
"nanoid": "^3.3.8",
"react-dates": {
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand Down
137 changes: 137 additions & 0 deletions patches/react-select+5.8.0.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
diff --git a/node_modules/react-select/.DS_Store b/node_modules/react-select/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/node_modules/react-select/.DS_Store differ
diff --git a/node_modules/react-select/dist/declarations/src/components/Input.d.ts b/node_modules/react-select/dist/declarations/src/components/Input.d.ts
index e5f6741..c78fd13 100644
--- a/node_modules/react-select/dist/declarations/src/components/Input.d.ts
+++ b/node_modules/react-select/dist/declarations/src/components/Input.d.ts
@@ -13,6 +13,8 @@ export interface InputSpecificProps<Option = unknown, IsMulti extends boolean =
form?: string;
/** Set className for the input element */
inputClassName?: string;
+ /** Whether the input is textarea */
+ isTextArea?: boolean;
}
export declare type InputProps<Option = unknown, IsMulti extends boolean = boolean, Group extends GroupBase<Option> = GroupBase<Option>> = InputSpecificProps<Option, IsMulti, Group>;
export declare const inputCSS: <Option, IsMulti extends boolean, Group extends GroupBase<Option>>({ isDisabled, value, theme: { spacing, colors }, }: InputProps<Option, IsMulti, Group>, unstyled: boolean) => CSSObjectWithLabel;
diff --git a/node_modules/react-select/dist/index-665c4ed8.cjs.prod.js b/node_modules/react-select/dist/index-665c4ed8.cjs.prod.js
index 96cd04f..0636ebe 100644
--- a/node_modules/react-select/dist/index-665c4ed8.cjs.prod.js
+++ b/node_modules/react-select/dist/index-665c4ed8.cjs.prod.js
@@ -1090,7 +1090,7 @@ var GroupHeading = function GroupHeading(props) {
};
var Group$1 = Group;

-var _excluded = ["innerRef", "isDisabled", "isHidden", "inputClassName"];
+var _excluded = ["innerRef", "isDisabled", "isHidden", "isTextArea", "inputClassName"];
var inputCSS = function inputCSS(_ref, unstyled) {
var isDisabled = _ref.isDisabled,
value = _ref.value,
@@ -1145,13 +1145,25 @@ var Input = function Input(props) {
innerRef = _cleanCommonProps.innerRef,
isDisabled = _cleanCommonProps.isDisabled,
isHidden = _cleanCommonProps.isHidden,
+ isTextArea = _cleanCommonProps.isTextArea,
inputClassName = _cleanCommonProps.inputClassName,
innerProps = _objectWithoutProperties(_cleanCommonProps, _excluded);
return react.jsx("div", _extends({}, getStyleProps(props, 'input', {
'input-container': true
}), {
"data-value": value || ''
- }), react.jsx("input", _extends({
+ }), isTextArea ? react.jsx("textarea", _extends({
+ className: cx({
+ input: true
+ }, inputClassName),
+ ref: innerRef,
+ style: _objectSpread(_objectSpread({}, inputStyle(isHidden)), {}, {
+ resize: 'none'
+ }),
+ disabled: isDisabled
+ }, innerProps, {
+ rows: 1
+ })) : react.jsx("input", _extends({
className: cx({
input: true
}, inputClassName),
diff --git a/node_modules/react-select/dist/index-a301f526.esm.js b/node_modules/react-select/dist/index-a301f526.esm.js
index 514ba81..40d005d 100644
--- a/node_modules/react-select/dist/index-a301f526.esm.js
+++ b/node_modules/react-select/dist/index-a301f526.esm.js
@@ -1090,7 +1090,7 @@ var GroupHeading = function GroupHeading(props) {
};
var Group$1 = Group;

-var _excluded = ["innerRef", "isDisabled", "isHidden", "inputClassName"];
+var _excluded = ["innerRef", "isDisabled", "isHidden", "isTextArea", "inputClassName"];
var inputCSS = function inputCSS(_ref, unstyled) {
var isDisabled = _ref.isDisabled,
value = _ref.value,
@@ -1145,13 +1145,25 @@ var Input = function Input(props) {
innerRef = _cleanCommonProps.innerRef,
isDisabled = _cleanCommonProps.isDisabled,
isHidden = _cleanCommonProps.isHidden,
+ isTextArea = _cleanCommonProps.isTextArea,
inputClassName = _cleanCommonProps.inputClassName,
innerProps = _objectWithoutProperties(_cleanCommonProps, _excluded);
return jsx("div", _extends({}, getStyleProps(props, 'input', {
'input-container': true
}), {
"data-value": value || ''
- }), jsx("input", _extends({
+ }), isTextArea ? jsx("textarea", _extends({
+ className: cx({
+ input: true
+ }, inputClassName),
+ ref: innerRef,
+ style: _objectSpread(_objectSpread({}, inputStyle(isHidden)), {}, {
+ resize: 'none'
+ }),
+ disabled: isDisabled
+ }, innerProps, {
+ rows: 1
+ })) : jsx("input", _extends({
className: cx({
input: true
}, inputClassName),
diff --git a/node_modules/react-select/dist/index-d1cb43f3.cjs.dev.js b/node_modules/react-select/dist/index-d1cb43f3.cjs.dev.js
index 7defcdc..c8d796b 100644
--- a/node_modules/react-select/dist/index-d1cb43f3.cjs.dev.js
+++ b/node_modules/react-select/dist/index-d1cb43f3.cjs.dev.js
@@ -1096,7 +1096,7 @@ var GroupHeading = function GroupHeading(props) {
};
var Group$1 = Group;

-var _excluded = ["innerRef", "isDisabled", "isHidden", "inputClassName"];
+var _excluded = ["innerRef", "isDisabled", "isHidden", "isTextArea", "inputClassName"];
var inputCSS = function inputCSS(_ref, unstyled) {
var isDisabled = _ref.isDisabled,
value = _ref.value,
@@ -1151,13 +1151,25 @@ var Input = function Input(props) {
innerRef = _cleanCommonProps.innerRef,
isDisabled = _cleanCommonProps.isDisabled,
isHidden = _cleanCommonProps.isHidden,
+ isTextArea = _cleanCommonProps.isTextArea,
inputClassName = _cleanCommonProps.inputClassName,
innerProps = _objectWithoutProperties(_cleanCommonProps, _excluded);
return react.jsx("div", _extends({}, getStyleProps(props, 'input', {
'input-container': true
}), {
"data-value": value || ''
- }), react.jsx("input", _extends({
+ }), isTextArea ? react.jsx("textarea", _extends({
+ className: cx({
+ input: true
+ }, inputClassName),
+ ref: innerRef,
+ style: _objectSpread(_objectSpread({}, inputStyle(isHidden)), {}, {
+ resize: 'none'
+ }),
+ disabled: isDisabled
+ }, innerProps, {
+ rows: 1
+ })) : react.jsx("input", _extends({
className: cx({
input: true
}, inputClassName),
2 changes: 1 addition & 1 deletion src/Assets/Icon/ic-arrow-square-out.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/Assets/Icon/ic-check-circle-dots.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions src/Assets/Icon/ic-edit-file.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/Assets/Icon/ic-spray-can.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 0 additions & 7 deletions src/Assets/Icon/ic-stamp.svg

This file was deleted.

1 change: 1 addition & 0 deletions src/Assets/Icon/ic-upload-arrow-animated.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/Assets/Sounds/DeployAudio.mp3
Binary file not shown.
4 changes: 2 additions & 2 deletions src/Common/BreadCrumb/BreadcrumbStore.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const initialState = {
alias: {},
}

export const BreadcrumbText = ({ heading, isActive }: BreadcrumbTextProps) => (
<h2 className={`m-0 fs-16 fw-6 lh-32 ${isActive ? 'cn-9' : 'cb-5'}`}>{heading}</h2>
export const BreadcrumbText = ({ heading, isActive, shouldTruncate = false }: BreadcrumbTextProps) => (
<h2 className={`m-0 fs-16 fw-6 lh-32 ${shouldTruncate ? 'dc__truncate' : ''} ${isActive ? 'cn-9' : 'cb-5'}`}>{heading}</h2>
)

const Store = ({ children }) => {
Expand Down
4 changes: 4 additions & 0 deletions src/Common/BreadCrumb/Types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,8 @@ export type UseBreadcrumbOptionalProps = UseBreadcrumbProps | null
export interface BreadcrumbTextProps {
heading: string
isActive?: boolean
/**
* @default false
*/
shouldTruncate?: boolean
}
10 changes: 10 additions & 0 deletions src/Common/CIPipeline.Types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,11 @@ export interface DockerConfigOverrideType {
ciBuildConfig: CIBuildConfigType
}

export enum WORKFLOW_CACHE_CONFIG_ENUM {
INHERIT = 'INHERIT',
OVERRIDE = 'OVERRIDE',
}

export interface FormType {
name: string
args: { key: string; value: string }[]
Expand Down Expand Up @@ -291,6 +296,11 @@ export interface FormType {
isDockerConfigOverridden?: boolean
dockerConfigOverride?: DockerConfigOverrideType
isOffendingMandatoryPlugin?: boolean
workflowCacheConfig?: {
type: WORKFLOW_CACHE_CONFIG_ENUM
value: boolean
globalValue: boolean
}
}

export interface ErrorObj {
Expand Down
Loading

0 comments on commit dd65fc6

Please sign in to comment.