Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/calc-cleanup

Author: arunjaindev

.eslintignore

@@ -30,7 +30,6 @@ src/Common/Drawer/Drawer.tsx
 src/Common/Grid/Grid.tsx
 src/Common/Helper.tsx
 src/Common/Hooks/UseClickOutside/UseClickOutside.tsx
-src/Common/Hooks/UseSuperAdmin/UseSuperAdmin.tsx
 src/Common/Hooks/UseWindowSize/UseWindowSize.tsx
 src/Common/ImageTags.tsx
 src/Common/InfoColorBar/InfoColourbar.tsx

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.8.4",
+    "version": "1.8.8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -107,7 +107,8 @@
         "@replit/codemirror-indentation-markers": "6.5.3",
         "@replit/codemirror-vscode-keymap": "6.0.2",
         "@types/react-dates": "^21.8.6",
-        "@uiw/codemirror-theme-github": "^4.23.7",
+        "@uiw/codemirror-extensions-hyper-link": "4.23.10",
+        "@uiw/codemirror-theme-github": "4.23.7",
         "@uiw/react-codemirror": "4.23.7",
         "ansi_up": "^5.2.1",
         "codemirror-json-schema": "0.8.0",

package.json

@@ -22,7 +22,7 @@ const TooltipContent = ({ tooltipContent }: TooltipContentProps) => {
     if (tooltipContent) {
         return (
             <div className="dc__white-space-pre-wrap">
-                <p className="m-0 cn-0 fs-12 fw-6 lh-18">Click to add</p>
+                <p className="m-0 fs-12 fw-6 lh-18">Click to add</p>
 
                 {tooltipContent}
             </div>

src/Assets/IconV2/ic-crown.svg

@@ -75,7 +75,7 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
     }
 
     return (
-        <div className="flex">
+        <div className="flex left">
             <div className="chart-type-options flex" data-testid="chart-type-options">
                 <span className="cn-7 mr-4">Chart Type</span>
                 <SelectPicker

src/Assets/IconV2/ic-user-key.svg

@@ -391,16 +391,19 @@ const Header: React.FC<CodeEditorHeaderInterface> & CodeEditorHeaderComposition
     children,
     className,
     hideDefaultSplitHeader,
-    diffViewWidth,
 }) => {
-    const { defaultValue } = useCodeEditorContext()
+    const { defaultValue, state } = useCodeEditorContext()
     return (
-        <div
-            className={className || 'code-editor__header flex right'}
-            style={{ ...(diffViewWidth ? { width: 'calc(100% - 30px)' } : {}) }}
-        >
-            {children}
-            {!hideDefaultSplitHeader && defaultValue && <SplitPane />}
+        <div className="flexbox w-100 dc__border-bottom ">
+            <div
+                data-code-editor-header
+                className={`code-editor__header flex-grow-1 bg__secondary ${className || 'px-16 pt-6 pb-5'} ${state.diffMode ? 'dc__grid-half vertical-divider' : ''}`}
+
+            >
+                {children}
+                {!hideDefaultSplitHeader && defaultValue && <SplitPane />}
+            </div>
+            {state.diffMode ? <div className="bg__secondary px-15 dc__align-self-stretch" /> : null}
         </div>
     )
 }

src/Common/AddCDButton/AddCDButton.tsx

@@ -15,11 +15,6 @@
  */
 
  .code-editor__header {
-  height: 40px;
-  background: var(--N100);
-  padding: 0 16px;
-  border-bottom: 1px solid var(--N200);
-
   .radio-group {
       height: 24px;
       overflow: hidden;

src/Common/ChartVersionAndTypeSelector.tsx

@@ -82,7 +82,6 @@ export interface CodeEditorHeaderInterface {
     children?: any
     className?: string
     hideDefaultSplitHeader?: boolean
-    diffViewWidth?: boolean
 }
 export interface CodeEditorComposition {
     Header?: React.FC<any>
@@ -102,7 +101,7 @@ export interface CodeEditorHeaderComposition {
     Clipboard?: React.FC<any>
 }
 
-export type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setDefaultCode' | 'setHeight'
+type ActionTypes = 'changeLanguage' | 'setDiff' | 'setTheme' | 'setCode' | 'setDefaultCode' | 'setHeight'
 
 export interface Action {
     type: ActionTypes