Merge pull request #497 from devtron-labs/chore/rc-26-ht-25-sync

chore: sync main with hotfix 25

Author: eshankvaish

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.4.0",
+    "version": "1.4.0-patch-1",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",

package.json

@@ -16,7 +16,7 @@
 
 import { MutableRefObject } from 'react'
 import moment from 'moment'
-import { sanitizeApprovalConfigData, sanitizeUserApprovalList } from '@Shared/Helpers'
+import { sanitizeApprovalConfigData, sanitizeUserApprovalList, stringComparatorBySortOrder } from '@Shared/Helpers'
 import { PolicyBlockInfo, RuntimeParamsAPIResponseType, RuntimePluginVariables } from '@Shared/types'
 import { get, post } from './Api'
 import { GitProviderType, ROUTES } from './Constants'
@@ -42,7 +42,7 @@ import {
     GlobalVariableOptionType,
 } from './Types'
 import { ApiResourceType } from '../Pages'
-import { RefVariableType } from './CIPipeline.Types'
+import { RefVariableType, VariableTypeFormat } from './CIPipeline.Types'
 
 export const getTeamListMin = (): Promise<TeamList> => {
     // ignore active field
@@ -203,7 +203,7 @@ const cdMaterialListModal = ({
             deploymentWindowArtifactMetadata: material.deploymentWindowArtifactMetadata ?? null,
             configuredInReleases: material.configuredInReleases ?? [],
             appWorkflowId: material.appWorkflowId ?? null,
-            deploymentBlockedState: sanitizeDeploymentBlockedState(material.deploymentBlockedState)
+            deploymentBlockedState: sanitizeDeploymentBlockedState(material.deploymentBlockedState),
         }
     })
     return materials
@@ -244,8 +244,37 @@ const processCDMaterialsApprovalInfo = (enableApproval: boolean, cdMaterialsResu
     }
 }
 
-export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): RuntimePluginVariables[] =>
-    (response?.runtimePluginVariables ?? []).map((variable) => ({ ...variable, defaultValue: variable.value }))
+export const parseRuntimeParams = (response: RuntimeParamsAPIResponseType): RuntimePluginVariables[] => {
+    const envVariables = Object.entries(response?.envVariables || {}).map<RuntimePluginVariables>(
+        ([key, value]) => ({
+            name: key,
+            value,
+            defaultValue: '',
+            format: VariableTypeFormat.STRING,
+            isRequired: false,
+            valueType: RefVariableType.NEW,
+            variableStepScope: RefVariableType.GLOBAL,
+            stepName: null,
+            stepType: null,
+            // TODO: (Rohit/Eshank) Replace this with getUniqueId (nanoId method)
+            stepVariableId: Math.floor(new Date().valueOf() * Math.random()),
+            valueConstraint: null,
+            description: null,
+            fileReferenceId: null,
+            fileMountDir: null,
+        }),
+    )
+
+    const runtimeParams = (response?.runtimePluginVariables ?? []).map<RuntimePluginVariables>((variable) => ({
+        ...variable,
+        defaultValue: variable.value,
+    }))
+
+    runtimeParams.push(...envVariables)
+    runtimeParams.sort((a, b) => stringComparatorBySortOrder(a.name, b.name))
+
+    return runtimeParams
+}
 
 const processCDMaterialsMetaInfo = (cdMaterialsResult): CDMaterialsMetaInfo => {
     if (!cdMaterialsResult) {

src/Common/Common.service.ts

@@ -92,6 +92,7 @@ export interface customEnv {
     FEATURE_PROMO_EMBEDDED_BUTTON_TEXT?: string
     FEATURE_PROMO_EMBEDDED_MODAL_TITLE?: string
     FEATURE_PROMO_EMBEDDED_IFRAME_URL?: string
+    FEATURE_SWAP_TRAFFIC_ENABLE?: boolean
     FEATURE_BULK_RESTART_WORKLOADS_FROM_RB: string
     FEATURE_RB_SYNC_CLUSTER_ENABLE?: boolean
     FEATURE_DEFAULT_MERGE_STRATEGY?: OverrideMergeStrategyType