Merge pull request #2077 from devtron-labs/chore/rename-virtual-resources

chore: rename virtual resources

Author: arunjaindev

.github/semantic.yml

@@ -0,0 +1,13 @@
+titleOnly: true
+
+types:
+  - fix
+  - feat
+  - feature
+  - fixes
+  - chore
+  - perf
+  - docs
+  - doc
+  - release
+  - misc

.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

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "0.3.13",
+        "@devtron-labs/devtron-fe-common-lib": "0.3.14",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",

src/components/ResourceBrowser/ResourceBrowser.tsx

@@ -64,7 +64,11 @@ const ResourceBrowser: React.FC = () => {
                     detailClusterList?.result || clusterListMinData?.result || [],
                     'name',
                 ) as ClusterDetail[]
-            ).filter((option) => !window._env_.HIDE_DEFAULT_CLUSTER || option.id !== DEFAULT_CLUSTER_ID),
+            ).filter(
+                (option) =>
+                    !(window._env_.HIDE_DEFAULT_CLUSTER && option.id === DEFAULT_CLUSTER_ID) &&
+                    !option.isVirtualCluster,
+            ),
         [detailClusterList, clusterListMinData],
     )
 

src/components/app/details/appDetails/AppDetails.tsx

@@ -886,7 +886,7 @@ export const EnvSelector = ({
 
     const groupList =
         sortedEnvironments?.reduce((acc, env) => {
-            const key = env.isVirtualEnvironment ? 'Virtual environments' : ''
+            const key = env.isVirtualEnvironment ? 'Isolated environments' : ''
             const found = acc.find((item) => item.label === key)
 
             if (found) {
@@ -912,7 +912,7 @@ export const EnvSelector = ({
         }, []) || []
 
     // Pushing the virtual environment group to the end of the list
-    if (groupList[0]?.label === 'Virtual environments' && groupList.length === 2) {
+    if (groupList[0]?.label === 'Isolated environments' && groupList.length === 2) {
         groupList.reverse()
     }
 

src/components/app/details/triggerView/cdMaterial.tsx

@@ -1966,7 +1966,7 @@ const CDMaterial = ({
                             <>
                                 {getDeployButtonIcon()}
                                 {buttonLabel}
-                                {isVirtualEnvironment && ' to virtual env'}
+                                {isVirtualEnvironment && ' to isolated env'}
                                 {deploymentWindowMetadata.userActionState === ACTION_STATE.BLOCKED && (
                                     <InfoOutline className="icon-dim-16 ml-5" />
                                 )}

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

@@ -8,12 +8,13 @@ import {
     Tooltip,
     useSuperAdmin,
 } from '@devtron-labs/devtron-fe-common-lib'
+import ReactGA from 'react-ga4'
 import { FILE_NAMES } from '@Components/common/ExportToCsv/constants'
 import ExportToCsv from '@Components/common/ExportToCsv/ExportToCsv'
 import { APP_STATUS_FILTER_OPTIONS, SELECT_CLUSTER_TIPPY, TEMPLATE_TYPE_FILTER_OPTIONS } from './Constants'
 import { AppListFiltersProps, AppListUrlFilters, AppStatuses } from './AppListType'
 import { getDevtronAppListDataToExport } from './AppListService'
-import { useFilterOptions } from './list.utils'
+import { getAppTabNameFromAppType, useFilterOptions } from './list.utils'
 
 const AppListFilters = ({
     filterConfig,
@@ -88,6 +89,7 @@ const AppListFilters = ({
         isSuperAdmin && appType === AppListConstants.AppType.DEVTRON_APPS && serverMode !== SERVER_MODE.EA_ONLY
 
     const handleUpdateFilters = (filterKey: AppListUrlFilters) => (selectedOptions: SelectPickerOptionType[]) => {
+        ReactGA.event({ category: getAppTabNameFromAppType(appType), action: filterKey })
         updateSearchParams({ [filterKey]: selectedOptions.map((option) => String(option.value)) })
     }
 

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

@@ -155,6 +155,7 @@ const GenericAppList = ({
     }, [])
 
     const handleArgoAppListing = () => {
+        if (!clusterIdsCsv) return
         setDataStateType(AppListViewType.LOADING)
         getArgoInstalledExternalApps(clusterIdsCsv)
             .then((appsListResponse) => {

src/components/app/list-new/list.utils.ts

@@ -43,6 +43,19 @@ export const getChangeAppTabURL = (appTabType) => {
     }
 }
 
+export const getAppTabNameFromAppType = (appType: string) => {
+    switch (appType) {
+        case AppListConstants.AppType.HELM_APPS:
+            return AppListConstants.AppTabs.HELM_APPS
+        case AppListConstants.AppType.ARGO_APPS:
+            return AppListConstants.AppTabs.ARGO_APPS
+        case AppListConstants.AppType.FLUX_APPS:
+            return AppListConstants.AppTabs.FLUX_APPS
+        default:
+            return AppListConstants.AppTabs.DEVTRON_APPS
+    }
+}
+
 export const renderIcon = (appType: string): string => {
     if (appType === AppListConstants.AppType.FLUX_APPS) {
         return FluxCDAppIcon

src/components/cluster/Cluster.tsx

@@ -644,7 +644,7 @@ const Cluster = ({
         toggleEditMode((t) => !t)
     }
 
-    const subTitle: string = isVirtualCluster ? 'Virtual cluster' : server_url
+    const subTitle: string = isVirtualCluster ? 'Isolated cluster' : server_url
 
     return (
         <>