From e08074f89d580ccb6d9869b9ccc236867053567d Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Mon, 18 Nov 2024 17:34:25 +0530 Subject: [PATCH 01/13] feat: add diff viewer component --- package-lock.json | 84 ++++++++++++------ package.json | 1 + .../DiffViewer/DiffViewer.component.tsx | 18 ++++ src/Shared/Components/DiffViewer/constants.ts | 87 +++++++++++++++++++ src/Shared/Components/DiffViewer/index.ts | 1 + src/Shared/Components/DiffViewer/types.ts | 4 + src/Shared/Components/index.ts | 1 + 7 files changed, 171 insertions(+), 25 deletions(-) create mode 100644 src/Shared/Components/DiffViewer/DiffViewer.component.tsx create mode 100644 src/Shared/Components/DiffViewer/constants.ts create mode 100644 src/Shared/Components/DiffViewer/index.ts create mode 100644 src/Shared/Components/DiffViewer/types.ts diff --git a/package-lock.json b/package-lock.json index 4e29cda9f..d8dffe47b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "fast-json-patch": "^3.1.1", "jsonpath-plus": "^10.0.0", "react-dates": "^21.8.0", + "react-diff-viewer-continued": "^3.4.0", "react-monaco-editor": "^0.54.0", "sass": "^1.69.7", "tslib": "2.7.0" @@ -612,7 +613,6 @@ "version": "11.12.0", "resolved": "https://registry.npmjs.org/@emotion/babel-plugin/-/babel-plugin-11.12.0.tgz", "integrity": "sha512-y2WQb+oP8Jqvvclh8Q55gLUyb7UFvgv7eJfsj7td5TToBrIUtPay2kMrZi4xjq9qw2vD0ZR5fSho0yqoFgX7Rw==", - "peer": true, "dependencies": { "@babel/helper-module-imports": "^7.16.7", "@babel/runtime": "^7.18.3", @@ -630,14 +630,12 @@ "node_modules/@emotion/babel-plugin/node_modules/convert-source-map": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "peer": true + "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==" }, "node_modules/@emotion/cache": { "version": "11.13.1", "resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.13.1.tgz", "integrity": "sha512-iqouYkuEblRcXmylXIwwOodiEK5Ifl7JcX7o6V4jI3iW4mLXX3dmt5xwBtIkJiQEXFAI+pC8X0i67yiPkH9Ucw==", - "peer": true, "dependencies": { "@emotion/memoize": "^0.9.0", "@emotion/sheet": "^1.4.0", @@ -646,17 +644,28 @@ "stylis": "4.2.0" } }, + "node_modules/@emotion/css": { + "version": "11.13.4", + "resolved": "https://registry.npmjs.org/@emotion/css/-/css-11.13.4.tgz", + "integrity": "sha512-CthbOD5EBw+iN0rfM96Tuv5kaZN4nxPyYDvGUs0bc7wZBBiU/0mse+l+0O9RshW2d+v5HH1cme+BAbLJ/3Folw==", + "license": "MIT", + "dependencies": { + "@emotion/babel-plugin": "^11.12.0", + "@emotion/cache": "^11.13.0", + "@emotion/serialize": "^1.3.0", + "@emotion/sheet": "^1.4.0", + "@emotion/utils": "^1.4.0" + } + }, "node_modules/@emotion/hash": { "version": "0.9.2", "resolved": "https://registry.npmjs.org/@emotion/hash/-/hash-0.9.2.tgz", - "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==", - "peer": true + "integrity": "sha512-MyqliTZGuOm3+5ZRSaaBGP3USLw6+EGykkwZns2EPC5g8jJ4z9OrdZY9apkl3+UP9+sdz76YYkwCKP5gh8iY3g==" }, "node_modules/@emotion/memoize": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.9.0.tgz", - "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==", - "peer": true + "integrity": "sha512-30FAj7/EoJ5mwVPOWhAyCX+FPfMDrVecJAM+Iw9NRoSl4BBAQeqj4cApHHUXOVvIPgLVDsCFoz/hGD+5QQD1GQ==" }, "node_modules/@emotion/react": { "version": "11.13.3", @@ -686,7 +695,6 @@ "version": "1.3.2", "resolved": "https://registry.npmjs.org/@emotion/serialize/-/serialize-1.3.2.tgz", "integrity": "sha512-grVnMvVPK9yUVE6rkKfAJlYZgo0cu3l9iMC77V7DW6E1DUIrU68pSEXRmFZFOFB1QFo57TncmOcvcbMDWsL4yA==", - "peer": true, "dependencies": { "@emotion/hash": "^0.9.2", "@emotion/memoize": "^0.9.0", @@ -698,14 +706,12 @@ "node_modules/@emotion/sheet": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/@emotion/sheet/-/sheet-1.4.0.tgz", - "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==", - "peer": true + "integrity": "sha512-fTBW9/8r2w3dXWYM4HCB1Rdp8NLibOw2+XELH5m5+AkWiL/KqYX6dc0kKYlaYyKjrQ6ds33MCdMPEwgs2z1rqg==" }, "node_modules/@emotion/unitless": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.10.0.tgz", - "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==", - "peer": true + "integrity": "sha512-dFoMUuQA20zvtVTuxZww6OHoJYgrzfKM1t52mVySDJnMSEa08ruEvdYQbhvyu6soU+NeLVd3yKfTfT0NeV6qGg==" }, "node_modules/@emotion/use-insertion-effect-with-fallbacks": { "version": "1.1.0", @@ -719,14 +725,12 @@ "node_modules/@emotion/utils": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/@emotion/utils/-/utils-1.4.1.tgz", - "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==", - "peer": true + "integrity": "sha512-BymCXzCG3r72VKJxaYVwOXATqXIZ85cuvg0YOUDxMGNrKc1DJRZk8MgV5wyXRyEayIMd4FuXJIUgTBXvDNW5cA==" }, "node_modules/@emotion/weak-memoize": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/@emotion/weak-memoize/-/weak-memoize-0.4.0.tgz", - "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==", - "peer": true + "integrity": "sha512-snKqtPW01tN0ui7yu9rGv69aJXr/a/Ywvl11sUjNtEcRc+ng/mQriFL0wLXMef74iHa/EkftbDzU9F8iFbH+zg==" }, "node_modules/@esbuild-plugins/node-globals-polyfill": { "version": "0.2.3", @@ -3872,7 +3876,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz", "integrity": "sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==", - "peer": true, "dependencies": { "@babel/runtime": "^7.12.5", "cosmiconfig": "^7.0.0", @@ -4046,6 +4049,12 @@ "node": ">=8" } }, + "node_modules/classnames": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==", + "license": "MIT" + }, "node_modules/clean-stack": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", @@ -4406,6 +4415,15 @@ "node": ">=0.10" } }, + "node_modules/diff": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", + "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.3.1" + } + }, "node_modules/diff-sequences": { "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", @@ -5557,8 +5575,7 @@ "node_modules/find-root": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz", - "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==", - "peer": true + "integrity": "sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==" }, "node_modules/find-up": { "version": "5.0.0", @@ -7306,8 +7323,7 @@ "node_modules/memoize-one": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz", - "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==", - "peer": true + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" }, "node_modules/merge-stream": { "version": "2.0.0", @@ -8153,6 +8169,26 @@ "react-with-direction": "^1.3.1" } }, + "node_modules/react-diff-viewer-continued": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/react-diff-viewer-continued/-/react-diff-viewer-continued-3.4.0.tgz", + "integrity": "sha512-kMZmUyb3Pv5L9vUtCfIGYsdOHs8mUojblGy1U1Sm0D7FhAOEsH9QhnngEIRo5hXWIPNGupNRJls1TJ6Eqx84eg==", + "license": "MIT", + "dependencies": { + "@emotion/css": "^11.11.2", + "classnames": "^2.3.2", + "diff": "^5.1.0", + "memoize-one": "^6.0.0", + "prop-types": "^15.8.1" + }, + "engines": { + "node": ">= 8" + }, + "peerDependencies": { + "react": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^15.3.0 || ^16.0.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/react-dom": { "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-17.0.2.tgz", @@ -8889,7 +8925,6 @@ "version": "0.5.7", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==", - "peer": true, "engines": { "node": ">=0.10.0" } @@ -9190,8 +9225,7 @@ "node_modules/stylis": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/stylis/-/stylis-4.2.0.tgz", - "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==", - "peer": true + "integrity": "sha512-Orov6g6BB1sDfYgzWfTHDOxamtX1bE/zo104Dh9e6fqJ3PooipYyfJ0pUmrZO2wAvO8YbEyeFrkV91XTsGMSrw==" }, "node_modules/supports-color": { "version": "7.2.0", diff --git a/package.json b/package.json index ff8e2d42f..ecb5dcbac 100644 --- a/package.json +++ b/package.json @@ -97,6 +97,7 @@ "fast-json-patch": "^3.1.1", "jsonpath-plus": "^10.0.0", "react-dates": "^21.8.0", + "react-diff-viewer-continued": "^3.4.0", "react-monaco-editor": "^0.54.0", "sass": "^1.69.7", "tslib": "2.7.0" diff --git a/src/Shared/Components/DiffViewer/DiffViewer.component.tsx b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx new file mode 100644 index 000000000..7c9687de3 --- /dev/null +++ b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx @@ -0,0 +1,18 @@ +import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer-continued' +import { diffViewerStyles } from './constants' +import { DiffViewerProps } from './types' + +const DiffViewer = ({ oldValue, newValue, leftTitle, rightTitle }: DiffViewerProps) => ( + +) + +export default DiffViewer diff --git a/src/Shared/Components/DiffViewer/constants.ts b/src/Shared/Components/DiffViewer/constants.ts new file mode 100644 index 000000000..8691b5857 --- /dev/null +++ b/src/Shared/Components/DiffViewer/constants.ts @@ -0,0 +1,87 @@ +// Default variables and style keys + +import { ReactDiffViewerProps } from 'react-diff-viewer-continued' + +export const diffViewerStyles: ReactDiffViewerProps['styles'] = { + variables: { + light: { + diffViewerBackground: 'var(--N0)', + diffViewerColor: 'var(--N900)', + addedBackground: 'var(--G50)', + addedColor: 'var(--N900)', + removedBackground: 'var(--R50)', + removedColor: 'var(--N900)', + wordAddedBackground: 'var(--G200)', + wordRemovedBackground: 'var(--R200)', + addedGutterBackground: 'var(--G100)', + removedGutterBackground: 'var(--R100)', + gutterBackground: 'var(--N50)', + gutterBackgroundDark: 'var(--N50)', + highlightBackground: 'var(--N100)', + highlightGutterBackground: 'var(--N100)', + codeFoldGutterBackground: 'var(--B100)', + codeFoldBackground: 'var(--B50)', + emptyLineBackground: 'var(--N0)', + gutterColor: 'var(--N500)', + addedGutterColor: 'var(--N700)', + removedGutterColor: 'var(--N700)', + codeFoldContentColor: 'var(--B600)', + diffViewerTitleBackground: 'var(--N100)', + diffViewerTitleColor: 'var(--N700)', + diffViewerTitleBorderColor: 'var(--N200)', + }, + }, + diffContainer: { + fontSize: '13px', + fontWeight: 400, + lineHeight: '20px', + + pre: { + lineHeight: '20px', + fontFamily: 'Inconsolata, monospace', + }, + }, + marker: { + pre: { + display: 'none', + }, + }, + gutter: { + padding: `0 6px`, + minWidth: '36px', + + pre: { + opacity: 1, + }, + }, + wordDiff: { + padding: 0, + }, + wordAdded: { + paddingInline: '2px', + }, + wordRemoved: { + paddingInline: '2px', + }, + codeFold: { + fontSize: '13px', + fontWeight: 400, + lineHeight: '20px', + height: '32px', + + a: { + textDecoration: 'none !important', + }, + }, + titleBlock: { + padding: '8px 12px', + fontSize: '12px', + lineHeight: '20px', + fontWeight: 600, + borderBottom: 'none', + + pre: { + fontFamily: 'Open Sans', + }, + }, +} diff --git a/src/Shared/Components/DiffViewer/index.ts b/src/Shared/Components/DiffViewer/index.ts new file mode 100644 index 000000000..ac4ae4c0b --- /dev/null +++ b/src/Shared/Components/DiffViewer/index.ts @@ -0,0 +1 @@ +export { default as DiffViewer } from './DiffViewer.component' diff --git a/src/Shared/Components/DiffViewer/types.ts b/src/Shared/Components/DiffViewer/types.ts new file mode 100644 index 000000000..996824ade --- /dev/null +++ b/src/Shared/Components/DiffViewer/types.ts @@ -0,0 +1,4 @@ +import { ReactDiffViewerProps } from 'react-diff-viewer-continued' + +export interface DiffViewerProps + extends Pick {} diff --git a/src/Shared/Components/index.ts b/src/Shared/Components/index.ts index 87fccf22f..376f33b9d 100644 --- a/src/Shared/Components/index.ts +++ b/src/Shared/Components/index.ts @@ -57,3 +57,4 @@ export * from './Collapse' export * from './Security' export * from './Button' export * from './InvalidYAMLTippy' +export * from './DiffViewer' From 7ab9b873918aba19fa7e3d342d38fa4fd60c1b3f Mon Sep 17 00:00:00 2001 From: shivani170 Date: Mon, 18 Nov 2024 18:42:23 +0530 Subject: [PATCH 02/13] chore: version bump 1.0.9 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4e29cda9f..f3ede91ec 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.8", + "version": "1.0.9", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.8", + "version": "1.0.9", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index ff8e2d42f..47c57a3fd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.8", + "version": "1.0.9", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From b2e9d8abf3381268eaec12d2bba97310072a22e2 Mon Sep 17 00:00:00 2001 From: Arun Jain Date: Tue, 19 Nov 2024 16:20:43 +0530 Subject: [PATCH 03/13] fix: do not set in local storage for undefined --- package-lock.json | 4 ++-- package.json | 2 +- src/Common/Hooks/useUrlFilters/useUrlFilters.ts | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3ede91ec..cb752893a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.10", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.10", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 47c57a3fd..02a81b5fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.10", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Common/Hooks/useUrlFilters/useUrlFilters.ts b/src/Common/Hooks/useUrlFilters/useUrlFilters.ts index 7fa26fc27..4e314e6e0 100644 --- a/src/Common/Hooks/useUrlFilters/useUrlFilters.ts +++ b/src/Common/Hooks/useUrlFilters/useUrlFilters.ts @@ -161,6 +161,9 @@ const useUrlFilters = ({ } useEffect(() => { + if (!localStorageKey) { + return + } // if we have search string, set secondary params in local storage accordingly if (location.search) { setItemInLocalStorageIfKeyExists(localStorageKey, JSON.stringify(parsedParams)) From f797f474c4ac8f57f1468a00979a353789f2f1b1 Mon Sep 17 00:00:00 2001 From: Amrit Kashyap Borah Date: Wed, 20 Nov 2024 03:03:28 +0530 Subject: [PATCH 04/13] chore: add support for Escape key in KEYBOARD_KEYS_MAP --- src/Common/Hooks/UseRegisterShortcut/types.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Common/Hooks/UseRegisterShortcut/types.ts b/src/Common/Hooks/UseRegisterShortcut/types.ts index 7239058c2..4fd7cc636 100644 --- a/src/Common/Hooks/UseRegisterShortcut/types.ts +++ b/src/Common/Hooks/UseRegisterShortcut/types.ts @@ -21,6 +21,7 @@ export const KEYBOARD_KEYS_MAP = { Shift: '⇧', Meta: IS_PLATFORM_MAC_OS ? '⌘' : 'Win', Alt: IS_PLATFORM_MAC_OS ? '⌥' : 'Alt', + Escape: 'Escape', F: 'F', E: 'E', R: 'R', From 0b0111a0e17eace70ec8fa0fc987b0b967814658 Mon Sep 17 00:00:00 2001 From: Amrit Kashyap Borah Date: Wed, 20 Nov 2024 03:05:54 +0530 Subject: [PATCH 05/13] chore: version bump --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index f3ede91ec..401b8bdf8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-1", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 47c57a3fd..c877e67a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-1", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", From 472f45a1ad921b5af175f7d55f10cf4a5e2b90d8 Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:22:42 +0530 Subject: [PATCH 06/13] feat: add support for null state in diff viewer --- .../DeploymentHistoryDiffView.tsx | 39 ++++++++++++------- src/Shared/Components/CICDHistory/types.tsx | 2 + .../DeploymentConfigDiff.scss | 7 ---- .../DeploymentConfigDiff.utils.tsx | 16 ++++++++ .../DeploymentConfigDiffMain.tsx | 30 ++++++-------- .../DiffViewer/DiffViewer.component.tsx | 11 ++++-- src/Shared/Components/DiffViewer/constants.ts | 11 ++++++ src/Shared/Components/DiffViewer/types.ts | 10 ++++- 8 files changed, 80 insertions(+), 46 deletions(-) diff --git a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx index 2a61026bc..77f436f55 100644 --- a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx +++ b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx @@ -18,6 +18,8 @@ import { useParams } from 'react-router-dom' import { useMemo, useState } from 'react' import Tippy from '@tippyjs/react' import { yamlComparatorBySortOrder } from '@Shared/Helpers' +import { DiffViewer } from '@Shared/Components/DiffViewer' +import { renderDiffViewNoDifferenceState } from '@Shared/Components/DeploymentConfigDiff' import { MODES, Toggle, YAMLStringify } from '../../../../Common' import { DeploymentHistoryParamsType } from './types' import { DeploymentHistorySingleValue, DeploymentTemplateHistoryType } from '../types' @@ -36,6 +38,7 @@ const DeploymentHistoryDiffView = ({ rootClassName, sortingConfig, codeEditorKey, + diffState, }: DeploymentTemplateHistoryType) => { const { historyComponent, historyComponentName } = useParams() const { sortBy, sortOrder } = sortingConfig ?? { sortBy: '', sortOrder: null } @@ -85,20 +88,26 @@ const DeploymentHistoryDiffView = ({ }) }, [convertVariables, currentConfiguration, sortOrder, isUnpublished]) - const renderDeploymentDiffViaCodeEditor = () => ( - - ) + const renderDeploymentDiffViaCodeEditor = () => + previousConfigAvailable ? ( + + ) : ( + + ) const handleShowVariablesClick = () => { setConvertVariables(!convertVariables) @@ -176,7 +185,7 @@ const DeploymentHistoryDiffView = ({ {(currentConfiguration?.codeEditorValue?.value || baseTemplateConfiguration?.codeEditorValue?.value) && ( -
+
{ const parsedDraftData = JSON.parse(data?.deploymentDraftData?.configData[0].draftMetadata.data || null) @@ -827,3 +829,17 @@ export const getDefaultVersionAndPreviousDeploymentOptions = (data: TemplateList previousDeployments: [], }, ) + +export const renderDiffViewNoDifferenceState = ( + diffState: DeploymentConfigDiffState | null, +): DiffViewerProps['codeFoldMessageRenderer'] => + diffState !== DeploymentConfigDiffState.NO_DIFF + ? () => ( + + ) + : null diff --git a/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx b/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx index a512705d2..e0beb887f 100644 --- a/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx +++ b/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx @@ -5,11 +5,11 @@ import { ReactComponent as ICSortArrowDown } from '@Icons/ic-sort-arrow-down.svg import { ReactComponent as ICSort } from '@Icons/ic-arrow-up-down.svg' import { ReactComponent as ICViewVariableToggle } from '@Icons/ic-view-variable-toggle.svg' import { Progressing } from '@Common/Progressing' -import { CodeEditor } from '@Common/CodeEditor' -import { MODES, SortingOrder } from '@Common/Constants' +import { SortingOrder } from '@Common/Constants' import ErrorScreenManager from '@Common/ErrorScreenManager' import Toggle from '@Common/Toggle/Toggle' import { ComponentSizeType } from '@Shared/constants' +import { DiffViewer } from '@Shared/Components/DiffViewer' import { Button, ButtonStyleType, ButtonVariantType } from '../Button' import { SelectPicker } from '../SelectPicker' @@ -21,6 +21,7 @@ import { DeploymentConfigDiffState, DeploymentConfigDiffAccordionProps, } from './DeploymentConfigDiff.types' +import { renderDiffViewNoDifferenceState } from './DeploymentConfigDiff.utils' export const DeploymentConfigDiffMain = ({ isLoading, @@ -190,23 +191,13 @@ export const DeploymentConfigDiffMain = ({ hideDiffState={hideDiffState} > {singleView ? ( - <> -
-
{primaryHeading}
-
{secondaryHeading}
-
- - + ) : (
{primaryHeading && secondaryHeading && ( @@ -222,6 +213,7 @@ export const DeploymentConfigDiffMain = ({ previousConfigAvailable rootClassName={`${primaryHeading && secondaryHeading ? 'dc__no-top-radius dc__no-top-border' : ''}`} sortingConfig={sortingConfig} + diffState={diffState} />
)} diff --git a/src/Shared/Components/DiffViewer/DiffViewer.component.tsx b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx index 7c9687de3..efe1570fb 100644 --- a/src/Shared/Components/DiffViewer/DiffViewer.component.tsx +++ b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx @@ -1,15 +1,18 @@ import ReactDiffViewer, { DiffMethod } from 'react-diff-viewer-continued' import { diffViewerStyles } from './constants' -import { DiffViewerProps } from './types' +import { DiffViewerProps, DiffViewTitleWrapperProps } from './types' -const DiffViewer = ({ oldValue, newValue, leftTitle, rightTitle }: DiffViewerProps) => ( +const DiffViewTitleWrapper = ({ title }: DiffViewTitleWrapperProps) =>
{title}
+ +const DiffViewer = ({ oldValue, newValue, leftTitle, rightTitle, ...props }: DiffViewerProps) => ( : null} + rightTitle={rightTitle ? : null} compareMethod={DiffMethod.WORDS} styles={diffViewerStyles} /> diff --git a/src/Shared/Components/DiffViewer/constants.ts b/src/Shared/Components/DiffViewer/constants.ts index 8691b5857..578e01ab2 100644 --- a/src/Shared/Components/DiffViewer/constants.ts +++ b/src/Shared/Components/DiffViewer/constants.ts @@ -37,8 +37,10 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { lineHeight: '20px', pre: { + fontSize: '13px', lineHeight: '20px', fontFamily: 'Inconsolata, monospace', + wordBreak: 'break-word', }, }, marker: { @@ -49,6 +51,8 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { gutter: { padding: `0 6px`, minWidth: '36px', + // Cursor would be default for all cases in gutter till we don't support highlighting + cursor: 'default', pre: { opacity: 1, @@ -59,9 +63,11 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { }, wordAdded: { paddingInline: '2px', + lineHeight: '16px', }, wordRemoved: { paddingInline: '2px', + lineHeight: '16px', }, codeFold: { fontSize: '13px', @@ -73,6 +79,11 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { textDecoration: 'none !important', }, }, + codeFoldGutter: { + '+ td': { + width: '12px', + }, + }, titleBlock: { padding: '8px 12px', fontSize: '12px', diff --git a/src/Shared/Components/DiffViewer/types.ts b/src/Shared/Components/DiffViewer/types.ts index 996824ade..e27e4cbbf 100644 --- a/src/Shared/Components/DiffViewer/types.ts +++ b/src/Shared/Components/DiffViewer/types.ts @@ -1,4 +1,12 @@ +import { ReactNode } from 'react' import { ReactDiffViewerProps } from 'react-diff-viewer-continued' export interface DiffViewerProps - extends Pick {} + extends Pick { + leftTitle?: ReactDiffViewerProps['leftTitle'] | ReactNode + rightTitle?: ReactDiffViewerProps['rightTitle'] | ReactNode +} + +export interface DiffViewTitleWrapperProps { + title: DiffViewerProps['leftTitle'] +} From 4d4fee3deea84b4159fb3160029df85c4c93a10f Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:07:35 +0530 Subject: [PATCH 07/13] feat: add custom renderer for null state and generic section error state --- src/Assets/Icon/ic-info-outline.svg | 4 +++ .../DeploymentHistoryDiffView.tsx | 3 +- src/Shared/Components/CICDHistory/types.tsx | 2 -- .../DeploymentConfigDiff.utils.tsx | 14 +++++---- .../DeploymentConfigDiffMain.tsx | 6 ++-- .../GenericSectionErrorState.component.tsx | 29 ++++++++++--------- 6 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 src/Assets/Icon/ic-info-outline.svg diff --git a/src/Assets/Icon/ic-info-outline.svg b/src/Assets/Icon/ic-info-outline.svg new file mode 100644 index 000000000..b3912b7dc --- /dev/null +++ b/src/Assets/Icon/ic-info-outline.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx index 77f436f55..cd9c32aa8 100644 --- a/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx +++ b/src/Shared/Components/CICDHistory/DeploymentHistoryConfigDiff/DeploymentHistoryDiffView.tsx @@ -38,7 +38,6 @@ const DeploymentHistoryDiffView = ({ rootClassName, sortingConfig, codeEditorKey, - diffState, }: DeploymentTemplateHistoryType) => { const { historyComponent, historyComponentName } = useParams() const { sortBy, sortOrder } = sortingConfig ?? { sortBy: '', sortOrder: null } @@ -93,7 +92,7 @@ const DeploymentHistoryDiffView = ({ ) : ( - diffState !== DeploymentConfigDiffState.NO_DIFF + lhsValue === rhsValue ? () => ( ) : null diff --git a/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx b/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx index e0beb887f..6904f308e 100644 --- a/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx +++ b/src/Shared/Components/DeploymentConfigDiff/DeploymentConfigDiffMain.tsx @@ -196,7 +196,10 @@ export const DeploymentConfigDiffMain = ({ newValue={secondaryList.codeEditorValue.value} leftTitle={primaryHeading} rightTitle={secondaryHeading} - codeFoldMessageRenderer={renderDiffViewNoDifferenceState(diffState)} + codeFoldMessageRenderer={renderDiffViewNoDifferenceState( + primaryList.codeEditorValue.value, + secondaryList.codeEditorValue.value, + )} /> ) : (
@@ -213,7 +216,6 @@ export const DeploymentConfigDiffMain = ({ previousConfigAvailable rootClassName={`${primaryHeading && secondaryHeading ? 'dc__no-top-radius dc__no-top-border' : ''}`} sortingConfig={sortingConfig} - diffState={diffState} />
)} diff --git a/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx b/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx index 6c0c613f4..747669e70 100644 --- a/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx +++ b/src/Shared/Components/GenericSectionErrorState/GenericSectionErrorState.component.tsx @@ -14,8 +14,10 @@ * limitations under the License. */ +import { ComponentSizeType } from '@Shared/constants' import { ReactComponent as ErrorIcon } from '../../../Assets/Icon/ic-error-exclamation.svg' -import { ReactComponent as InfoIcon } from '../../../Assets/Icon/ic-exclamation.svg' +import { ReactComponent as ICInfoOutline } from '../../../Assets/Icon/ic-info-outline.svg' +import { Button, ButtonVariantType } from '../Button' import { GenericSectionErrorStateProps } from './types' const GenericSectionErrorState = ({ @@ -30,27 +32,28 @@ const GenericSectionErrorState = ({ }: GenericSectionErrorStateProps) => (
{useInfoIcon ? ( - + ) : ( )}

{title}

-
- {subTitle &&

{subTitle}

} - {description &&

{description}

} -
+ {(subTitle || description) && ( +
+ {subTitle &&

{subTitle}

} + {description &&

{description}

} +
+ )}
{reload && ( - + variant={ButtonVariantType.text} + size={ComponentSizeType.small} + dataTestId="generic-section-reload-button" + /> )}
) From d60e762cad646844d7d40ec26b886f678a7b868d Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:12:05 +0530 Subject: [PATCH 08/13] fix: add reset for styling for pre tag --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/DiffViewer/constants.ts | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5852b781a..b16dc0d02 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-2", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 2c0f2524e..78c954de2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9", + "version": "1.0.9-beta-2", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/DiffViewer/constants.ts b/src/Shared/Components/DiffViewer/constants.ts index 578e01ab2..99dda75a5 100644 --- a/src/Shared/Components/DiffViewer/constants.ts +++ b/src/Shared/Components/DiffViewer/constants.ts @@ -41,6 +41,12 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { lineHeight: '20px', fontFamily: 'Inconsolata, monospace', wordBreak: 'break-word', + // Reset for styling from patternfly + padding: 0, + margin: 0, + backgroundColor: 'transparent', + border: 'none', + borderRadius: 0, }, }, marker: { From ac3deb079cd2366236384a4557bca27a2c1ac74c Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 15:43:09 +0530 Subject: [PATCH 09/13] fix: class for code editor diff view --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/CICDHistory/cicdHistory.scss | 8 -------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index b16dc0d02..18880a09c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-2", + "version": "1.0.9-beta-3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-2", + "version": "1.0.9-beta-3", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 78c954de2..c1b595c99 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-2", + "version": "1.0.9-beta-3", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/CICDHistory/cicdHistory.scss b/src/Shared/Components/CICDHistory/cicdHistory.scss index 7df3367f4..ce1bcea7b 100644 --- a/src/Shared/Components/CICDHistory/cicdHistory.scss +++ b/src/Shared/Components/CICDHistory/cicdHistory.scss @@ -171,14 +171,6 @@ color: var(--N900) !important; } -.code-editor-green-diff { - background: #eaf1dd; -} - -.code-editor-red-diff { - background: #ffd4d1; -} - .left-50 { left: 50px; } From 293063aa1e97eb104c8a12f1f540f291e4ffc366 Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:17:31 +0530 Subject: [PATCH 10/13] fix: update text size to 14px --- package-lock.json | 4 ++-- package.json | 2 +- src/Shared/Components/DiffViewer/constants.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 18880a09c..4149fac33 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-3", + "version": "1.0.9-beta-4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-3", + "version": "1.0.9-beta-4", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index c1b595c99..a7dc295ad 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.9-beta-3", + "version": "1.0.9-beta-4", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Shared/Components/DiffViewer/constants.ts b/src/Shared/Components/DiffViewer/constants.ts index 99dda75a5..47aa4218c 100644 --- a/src/Shared/Components/DiffViewer/constants.ts +++ b/src/Shared/Components/DiffViewer/constants.ts @@ -32,12 +32,12 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { }, }, diffContainer: { - fontSize: '13px', + fontSize: '14px', fontWeight: 400, lineHeight: '20px', pre: { - fontSize: '13px', + fontSize: '14px', lineHeight: '20px', fontFamily: 'Inconsolata, monospace', wordBreak: 'break-word', @@ -76,7 +76,7 @@ export const diffViewerStyles: ReactDiffViewerProps['styles'] = { lineHeight: '16px', }, codeFold: { - fontSize: '13px', + fontSize: '14px', fontWeight: 400, lineHeight: '20px', height: '32px', From 5b1f1c266c0c1ab19eb8cf8ae739b522f63c9c39 Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Wed, 20 Nov 2024 16:32:28 +0530 Subject: [PATCH 11/13] doc: add documentation --- .../DiffViewer/DiffViewer.component.tsx | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/Shared/Components/DiffViewer/DiffViewer.component.tsx b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx index efe1570fb..a3c19e2c4 100644 --- a/src/Shared/Components/DiffViewer/DiffViewer.component.tsx +++ b/src/Shared/Components/DiffViewer/DiffViewer.component.tsx @@ -4,6 +4,44 @@ import { DiffViewerProps, DiffViewTitleWrapperProps } from './types' const DiffViewTitleWrapper = ({ title }: DiffViewTitleWrapperProps) =>
{title}
+/** + * Component for showing diff between two string or object. + * + * Note: Pass down the object as stringified for optimized performance. + * + * @example Usage + * + * ```tsx + * + * ``` + * + * @example With left/right title for lhs/rhs + * + * ```tsx + * Title for RHS + * } + * /> + * ``` + * + * @example With custom message for folded code + * Note: the entire section would be clickable + * + * ```tsx + * Custom text} + * /> + * ``` + */ const DiffViewer = ({ oldValue, newValue, leftTitle, rightTitle, ...props }: DiffViewerProps) => ( Date: Wed, 20 Nov 2024 18:16:44 +0530 Subject: [PATCH 12/13] fix: on change being called in custom input without any change --- package-lock.json | 4 ++-- package.json | 2 +- src/Common/CustomInput/CustomInput.tsx | 10 +++++++--- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb752893a..8780bc14b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.0.11", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.0.11", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 02a81b5fa..e38e61d23 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.0.11", "description": "Supporting common component library", "type": "module", "main": "dist/index.js", diff --git a/src/Common/CustomInput/CustomInput.tsx b/src/Common/CustomInput/CustomInput.tsx index 00c71316f..fdc0cbbad 100644 --- a/src/Common/CustomInput/CustomInput.tsx +++ b/src/Common/CustomInput/CustomInput.tsx @@ -69,9 +69,13 @@ export const CustomInput = ({ const handleOnBlur = (event) => { // NOTE: This is to prevent the input from being trimmed when the user do not want to trim the input if (!noTrim) { - event.stopPropagation() - event.target.value = event.target.value?.trim() - onChange(event) + const trimmedValue = event.target.value?.trim() + + if (event.target.value !== trimmedValue) { + event.stopPropagation() + event.target.value = trimmedValue + onChange(event) + } } if (typeof onBlur === 'function') { onBlur(event) From 8515310ed9ece29e1905b26243d9ebfb7cfc8d96 Mon Sep 17 00:00:00 2001 From: Eshank Vaish <48060426+eshankvaish@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:04:01 +0530 Subject: [PATCH 13/13] chore: bump version to 1.1.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index cb752893a..cebfda6b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.1.0", "license": "ISC", "dependencies": { "@types/react-dates": "^21.8.6", diff --git a/package.json b/package.json index 02a81b5fa..106daa281 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@devtron-labs/devtron-fe-common-lib", - "version": "1.0.10", + "version": "1.1.0", "description": "Supporting common component library", "type": "module", "main": "dist/index.js",