Merge branch 'develop' of https://github.com/devtron-labs/devtron-fe-common-lib into feat/app-status-filters

Author: arunjaindev

.github/workflows/tag-patch-incre.yml

@@ -0,0 +1,52 @@
+name: Increment tag for patch or minor
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - closed  # Trigger only when a PR is closed (merged or not)
+
+jobs:
+  tag:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Create new tag
+        env:
+          TOKEN: ${{ secrets.TAG_CREATION_TOKEN_PUBLIC }}
+        run: |
+          echo $TOKEN | gh auth login --with-token
+          latest_tag=$(git tag | sort -V | tail -n 1)
+          echo "Latest tag: $latest_tag"
+
+          # Extract major and minor versions
+          version=$(echo $latest_tag | cut -d. -f1-2)
+          # Extract patch version
+          patch=$(echo $latest_tag | cut -d. -f3)
+          # Extract minor version
+          minor=$(echo $latest_tag | cut -d. -f2)
+          major=$(echo $latest_tag | cut -d. -f1)
+
+          # Check if the incoming branch starts with 'release-candidate-'
+          incoming_branch="${{ github.head_ref }}"
+          if [[ "$incoming_branch" == release-candidate-* ]]; then
+            # Increment minor version and reset patch
+            new_minor=$((minor+1))
+            new_tag="$major.$new_minor.0"
+            echo "New tag will be (minor increment): $new_tag"
+          else
+            # Increment patch version
+            new_tag="$version.$((patch+1))"
+            echo "New tag will be (patch increment): $new_tag"
+          fi
+
+          git config --global user.email "devops@devtron.ai"
+          git config --global user.name "systemsdt"
+          git tag $new_tag
+          git push origin $new_tag

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.0-beta-9",
+    "version": "0.5.8",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
@@ -83,7 +83,6 @@
         "react-dom": "^17.0.2",
         "react-draggable": "^4.4.5",
         "react-ga4": "^1.4.1",
-        "react-keybind": "^0.9.4",
         "react-mde": "^11.5.0",
         "react-router-dom": "^5.3.0",
         "react-select": "5.8.0",

package.json

@@ -15,10 +15,17 @@
  */
 
 import { useEffect, useState } from 'react'
+import { SelectPicker, SelectPickerVariantType } from '@Shared/Components'
 import { fetchChartTemplateVersions } from './Common.service'
-import { ChartVersionAndTypeSelectorProps, DeploymentChartVersionType } from './Types'
+import { ChartVersionAndTypeSelectorProps } from './Types'
 import { getFilteredChartVersions, showError } from './Helper'
-import { SelectPicker, SelectPickerVariantType } from '@Shared/Components'
+
+interface DeploymentChartVersionType {
+    chartRefId: number
+    chartVersion: string
+    chartType: string
+    type: number
+}
 
 // @TODO: Generalize this component to be used in CodeEditor as Chart selector toolbar
 // when the Code Editor is moved to the fe-common-lib
@@ -72,18 +79,17 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
             <div className="chart-type-options flex" data-testid="chart-type-options">
                 <span className="cn-7 mr-4">Chart Type</span>
                 <SelectPicker
-                    inputId='chart-type-select'
-                    label='Chart Type'
+                    inputId="chart-type-select"
                     value={selectedChartType ?? chartTypeOptions[0]}
                     options={chartTypeOptions}
                     onChange={handleChartTypeChange}
                     variant={SelectPickerVariantType.BORDER_LESS}
                 />
             </div>
             <div className="chart-version-options flex" data-testid="chart-version-options">
-            <span className="cn-7 mr-4">Chart Version</span>
+                <span className="cn-7 mr-4">Chart Version</span>
                 <SelectPicker
-                    inputId='chart-version-select'
+                    inputId="chart-version-select"
                     value={selectedChartVersion ?? chartVersionOptions[0]}
                     options={chartVersionOptions}
                     onChange={handleChartVersionChange}

src/Assets/Icon/ic-diff-file-added.svg

@@ -21,9 +21,9 @@ import ReactGA from 'react-ga4'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
 import { configureMonacoYaml } from 'monaco-yaml'
 
+import { ReactComponent as ICWarningY5 } from '@Icons/ic-warning-y5.svg'
 import { ReactComponent as Info } from '../../Assets/Icon/ic-info-filled.svg'
 import { ReactComponent as ErrorIcon } from '../../Assets/Icon/ic-error-exclamation.svg'
-import { ReactComponent as WarningIcon } from '../../Assets/Icon/ic-warning.svg'
 import './codeEditor.scss'
 import 'monaco-editor'
 
@@ -348,7 +348,7 @@ const CodeEditor: React.FC<CodeEditorInterface> & CodeEditorComposition = React.
                     <CodeEditorPlaceholder customLoader={customLoader} />
                 ) : (
                     <>
-                        {shebang && <div className="shebang">{shebang}</div>}
+                        {shebang && <div className="code-editor__shebang">{shebang}</div>}
                         {state.diffMode ? (
                             <MonacoDiffEditor
                                 original={
@@ -452,7 +452,7 @@ const ValidationError = () => {
 
 const Warning: React.FC<InformationBarProps> = (props) => (
     <div className={`code-editor__warning ${props.className || ''}`}>
-        <WarningIcon className="code-editor__information-info-icon" />
+        <ICWarningY5 className="code-editor__information-info-icon" />
         {props.text}
         {props.children}
     </div>
@@ -476,7 +476,7 @@ const Information: React.FC<InformationBarProps> = (props) => (
 
 const Clipboard = () => {
     const { state } = useCodeEditorContext()
-    return <ClipboardButton content={state.code} rootClassName="bcn-1" iconSize={20} />
+    return <ClipboardButton content={state.code} iconSize={16} />
 }
 
 const SplitPane = ({}) => {

src/Assets/Icon/ic-diff-file-removed.svg

@@ -105,18 +105,6 @@
     min-height: 300px;
 }
 
-.code-editor__warning {
-    font-size: 12px;
-    font-weight: 400;
-    line-height: 1.33;
-    letter-spacing: normal;
-    color: var(--Y700);
-    height: auto;
-    padding: 8px 16px;
-    border-bottom: 1px solid #d6dbdf;
-    background-color: var(--Y100);
-}
-
 .code-editor__information {
     font-size: 12px;
     font-weight: 400;
@@ -171,3 +159,9 @@
         z-index: 9;
     }
 }
+
+.code-editor__shebang {
+    padding: 0 52px;
+    color: #151515;
+    opacity: 0.6;
+}