From a3937c135413c045f1f1a0fec6b34f3616b26301 Mon Sep 17 00:00:00 2001
From: Kiran <155609672+kirandevtn@users.noreply.github.com>
Date: Thu, 3 Oct 2024 18:05:58 +0530
Subject: [PATCH 1/6] Create tag-patch-incre.yml

---
 .github/workflows/tag-patch-incre.yml | 52 +++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .github/workflows/tag-patch-incre.yml

diff --git a/.github/workflows/tag-patch-incre.yml b/.github/workflows/tag-patch-incre.yml
new file mode 100644
index 000000000..6a8133328
--- /dev/null
+++ b/.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

From f56a1aa9b99280fcdd7b985b67be1b45dd2c54e7 Mon Sep 17 00:00:00 2001
From: Kiran <155609672+kirandevtn@users.noreply.github.com>
Date: Tue, 8 Oct 2024 12:08:21 +0530
Subject: [PATCH 2/6] Update tag-patch-incre.yml


From 4696331682700269e79fceb847619328096f0f56 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Tue, 15 Oct 2024 11:00:35 +0530
Subject: [PATCH 3/6] fix: chart type label

---
 src/Common/ChartVersionAndTypeSelector.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Common/ChartVersionAndTypeSelector.tsx b/src/Common/ChartVersionAndTypeSelector.tsx
index ac40e8c24..15c7efe83 100644
--- a/src/Common/ChartVersionAndTypeSelector.tsx
+++ b/src/Common/ChartVersionAndTypeSelector.tsx
@@ -70,7 +70,6 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
     return (
         <div className="flex">
             <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'

From 309e327a8b1d878f652c0b7bc28ff9a62d77e801 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Tue, 15 Oct 2024 11:02:56 +0530
Subject: [PATCH 4/6] 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 5fabfab8a..615f17371 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.0",
+    "version": "0.5.0-patch-1",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "0.5.0",
+            "version": "0.5.0-patch-1",
             "license": "ISC",
             "dependencies": {
                 "@types/react-dates": "^21.8.6",
diff --git a/package.json b/package.json
index 39d63d669..49ed6390c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "0.5.0",
+    "version": "0.5.0-patch-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

From 4ca00df1794af493240fff57143e8d3b70ac2253 Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Tue, 15 Oct 2024 11:10:35 +0530
Subject: [PATCH 5/6] chore: code formatting

---
 src/Common/ChartVersionAndTypeSelector.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Common/ChartVersionAndTypeSelector.tsx b/src/Common/ChartVersionAndTypeSelector.tsx
index 15c7efe83..272aa8db3 100644
--- a/src/Common/ChartVersionAndTypeSelector.tsx
+++ b/src/Common/ChartVersionAndTypeSelector.tsx
@@ -71,8 +71,8 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
         <div className="flex">
             <div className="chart-type-options flex" data-testid="chart-type-options">
                 <SelectPicker
-                    inputId='chart-type-select'
-                    label='Chart Type'
+                    inputId="chart-type-select"
+                    label="Chart Type"
                     value={selectedChartType ?? chartTypeOptions[0]}
                     options={chartTypeOptions}
                     onChange={handleChartTypeChange}
@@ -80,9 +80,9 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
                 />
             </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}

From 9741e876ac42724fa92d6ef17c2eb842cd2c0f3c Mon Sep 17 00:00:00 2001
From: shivani170 <shivani@devtron.ai>
Date: Tue, 15 Oct 2024 11:26:14 +0530
Subject: [PATCH 6/6] hotfix: fix

---
 src/Common/ChartVersionAndTypeSelector.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Common/ChartVersionAndTypeSelector.tsx b/src/Common/ChartVersionAndTypeSelector.tsx
index 272aa8db3..7272120ba 100644
--- a/src/Common/ChartVersionAndTypeSelector.tsx
+++ b/src/Common/ChartVersionAndTypeSelector.tsx
@@ -70,9 +70,9 @@ const ChartVersionAndTypeSelector = ({ setSelectedChartRefId }: ChartVersionAndT
     return (
         <div className="flex">
             <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"
                     value={selectedChartType ?? chartTypeOptions[0]}
                     options={chartTypeOptions}
                     onChange={handleChartTypeChange}