Merge branch 'main' of github.com:devtron-labs/dashboard into feat/airgapped-release

Author: eshankvaish

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

@@ -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 "[email protected]"
+          git config --global user.name "systemsdt"
+          git tag $new_tag
+          git push origin $new_tag

src/components/app/list-new/GenericAppList.tsx

@@ -141,6 +141,7 @@ const GenericAppList = ({
     }, [appsList])
 
     const handleArgoAppListing = () => {
+        if (!clusterIdsCsv) return
         setDataStateType(AppListViewType.LOADING)
         getArgoInstalledExternalApps(clusterIdsCsv)
             .then((appsListResponse) => {
@@ -173,11 +174,7 @@ const GenericAppList = ({
 
     // reset data
     function init() {
-        if (isSSE && !payloadParsedFromUrl?.namespaces?.length) {
-            setDataStateType(AppListViewType.LIST)
-        } else {
-            setDataStateType(AppListViewType.LOADING)
-        }
+        setDataStateType(AppListViewType.LIST)
         setClusterIdsCsv(_getClusterIdsFromRequestUrl() ?? null)
         setAppsList([])
         setFilteredAppsList([])