feat: build infra v3

.env

@@ -31,7 +31,7 @@ HIDE_EXCLUDE_INCLUDE_GIT_COMMITS=true
 ENABLE_BUILD_CONTEXT=false
 CLAIR_TOOL_VERSION=
 ENABLE_RESTART_WORKLOAD=false
-ENABLE_SCOPED_VARIABLES=false
+ENABLE_SCOPED_VARIABLES=true
 DEFAULT_CI_TRIGGER_TYPE_MANUAL=false
 ANNOUNCEMENT_BANNER_MSG=
 LOGIN_PAGE_IMAGE=

.eslintignore

@@ -245,13 +245,6 @@ src/components/common/DatePickers/DayPickerRangeController.tsx
 src/components/common/DeprecatedUpdateWarn.tsx
 src/components/common/Description/GenericDescription.tsx
 src/components/common/DynamicTabs/__tests__/DynamicTabs.test.tsx
-src/components/common/FloatingVariablesSuggestions/FloatingVariablesSuggestions.tsx
-src/components/common/FloatingVariablesSuggestions/SuggestionItem.tsx
-src/components/common/FloatingVariablesSuggestions/Suggestions.tsx
-src/components/common/FloatingVariablesSuggestions/__tests__/FloatingVariablesSuggestions.test.tsx
-src/components/common/FloatingVariablesSuggestions/__tests__/Suggestions.test.tsx
-src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsInfo.test.tsx
-src/components/common/FloatingVariablesSuggestions/__tests__/SuggestionsItem.test.tsx
 src/components/common/HiddenInput/HiddenInput.tsx
 src/components/common/List/List.tsx
 src/components/common/MultiSelect/MultiSelect.tsx

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.5.3",
+        "@devtron-labs/devtron-fe-common-lib": "1.5.3-beta-3",
         "@esbuild-plugins/node-globals-polyfill": "0.2.3",
         "@rjsf/core": "^5.13.3",
         "@rjsf/utils": "^5.13.3",
@@ -30,7 +30,6 @@
         "react-csv": "^2.2.2",
         "react-dates": "^21.8.0",
         "react-dom": "^17.0.2",
-        "react-draggable": "^4.4.5",
         "react-ga4": "^1.4.1",
         "react-gtm-module": "^2.0.11",
         "react-mde": "^11.5.0",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/AppComposeRouter.tsx

@@ -16,20 +16,19 @@
 
 import React, { lazy, Suspense } from 'react'
 import { useRouteMatch, useHistory, Route, Switch, Redirect, useLocation, generatePath } from 'react-router-dom'
-
 import {
     Progressing,
     EnvResourceType,
     BASE_CONFIGURATION_ENV_ID,
     ApprovalConfigDataKindType,
     getIsApprovalPolicyConfigured,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as Next } from '@Icons/ic-arrow-forward.svg'
 import { URLS } from '@Config/index'
 import { ErrorBoundary, useAppContext } from '@Components/common'
 import ExternalLinks from '@Components/externalLinks/ExternalLinks'
-import { CMSecretComponentType } from '@Pages/Shared/ConfigMapSecret/types'
 import { ConfigMapSecretWrapper } from '@Pages/Shared/ConfigMapSecret/ConfigMapSecret.wrapper'
 
 import { NextButtonProps, STAGE_NAME } from '../AppConfig.types'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigDryRun.tsx

@@ -10,13 +10,13 @@ import {
     getIsRequestAborted,
     MODES,
     useAsync,
+    ToggleResolveScopedVariables,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { importComponentFromFELibrary } from '@Components/common'
 import { ReactComponent as ICFilePlay } from '@Icons/ic-file-play.svg'
 // FIXME: Placeholder icon since no sense of git merge icon as of now
 import { ReactComponent as ICFileCode } from '@Icons/ic-file-code.svg'
 import SelectMergeStrategy from './SelectMergeStrategy'
-import ToggleResolveScopedVariables from './ToggleResolveScopedVariables'
 import NoPublishedVersionEmptyState from './NoPublishedVersionEmptyState'
 import { ConfigDryRunProps } from './types'
 

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/ConfigToolbar.tsx

@@ -9,14 +9,14 @@ import {
     BaseURLParams,
     ComponentSizeType,
     InvalidYAMLTippyWrapper,
+    ToggleResolveScopedVariables,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { useParams } from 'react-router-dom'
 import { importComponentFromFELibrary } from '@Components/common'
 import { ReactComponent as ICMore } from '@Icons/ic-more-option.svg'
 import { ReactComponent as ICBookOpen } from '@Icons/ic-book-open.svg'
 import { ReactComponent as ICInfoOutlineGrey } from '@Icons/ic-info-outline-grey.svg'
 import BaseConfigurationNavigation from './BaseConfigurationNavigation'
-import ToggleResolveScopedVariables from './ToggleResolveScopedVariables'
 import { PopupMenuItem } from './utils'
 import { ConfigToolbarProps } from './types'
 import SelectMergeStrategy from './SelectMergeStrategy'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DeploymentTemplate.tsx

@@ -43,10 +43,11 @@ import {
     getIsRequestAborted,
     DraftAction,
     checkIfPathIsMatching,
+    FloatingVariablesSuggestions,
 } from '@devtron-labs/devtron-fe-common-lib'
 import { Prompt, useLocation, useParams } from 'react-router-dom'
 import YAML from 'yaml'
-import { FloatingVariablesSuggestions, importComponentFromFELibrary } from '@Components/common'
+import { importComponentFromFELibrary } from '@Components/common'
 import { getModuleInfo } from '@Components/v2/devtronStackManager/DevtronStackManager.service'
 import { URLS } from '@Config/routes'
 import { ReactComponent as ICClose } from '@Icons/ic-close.svg'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/NoOverrideEmptyState.tsx

@@ -4,10 +4,10 @@ import {
     ComponentSizeType,
     GenericEmptyState,
     ImageType,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
 import cmCsEmptyState from '@Images/cm-cs-empty-state.png'
 import { ReactComponent as ICAdd } from '@Icons/ic-add.svg'
-import { CMSecretComponentType } from '@Pages/Shared/ConfigMapSecret/types'
 import { NoOverrideEmptyStateProps } from './types'
 
 import './NoOverrideEmptyState.scss'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/index.ts

@@ -6,7 +6,6 @@ export { default as ConfigHeader } from './ConfigHeader'
 export { default as NoPublishedVersionEmptyState } from './NoPublishedVersionEmptyState'
 export { default as CompareConfigView } from './CompareConfigView'
 export * from './DeploymentConfigCompare'
-export { default as ToggleResolveScopedVariables } from './ToggleResolveScopedVariables'
 export { default as SelectMergeStrategy } from './SelectMergeStrategy'
 
 export type { ConfigToolbarProps, CompareConfigViewProps } from './types'

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/types.ts

@@ -10,8 +10,8 @@ import {
     ProtectConfigTabsType,
     SelectPickerOptionType,
     ServerErrors,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
-import { CMSecretComponentType } from '@Pages/Shared/ConfigMapSecret/types'
 import { FunctionComponent, MutableRefObject, ReactNode } from 'react'
 import { DeploymentTemplateStateType } from './DeploymentTemplate/types'
 
@@ -219,16 +219,6 @@ export type ConfigDryRunProps = {
 } & ConfigDryRunManifestProps &
     ConfigErrorHandlingProps
 
-export interface ToggleResolveScopedVariablesProps {
-    resolveScopedVariables: boolean
-    handleToggleScopedVariablesView: () => void
-    isDisabled?: boolean
-    /**
-     * @default true
-     */
-    showTooltip?: boolean
-}
-
 export enum DeploymentTemplateComponentType {
     DEPLOYMENT_TEMPLATE = '3',
 }

src/Pages/GlobalConfigurations/BuildInfra/BuildInfra.tsx

@@ -19,6 +19,7 @@ import { ErrorScreenNotAuthorized } from '@devtron-labs/devtron-fe-common-lib'
 import { importComponentFromFELibrary } from '../../../components/common'
 import { BuildInfraProps } from './types'
 import ProfileForm from './ProfileForm'
+import BuildInfraUtilityProvider from './BuildInfraUtiltityProvider'
 
 const BuildInfraRouter = importComponentFromFELibrary('BuildInfraRouter', null, 'function')
 
@@ -28,7 +29,11 @@ export const BuildInfra: FunctionComponent<BuildInfraProps> = ({ isSuperAdmin })
     }
 
     if (BuildInfraRouter) {
-        return <BuildInfraRouter />
+        return (
+            <BuildInfraUtilityProvider>
+                <BuildInfraRouter />
+            </BuildInfraUtilityProvider>
+        )
     }
 
     return <ProfileForm />

src/Pages/GlobalConfigurations/BuildInfra/BuildInfraCMCSForm.tsx

@@ -0,0 +1,22 @@
+import { BuildInfraCMCSFormProps } from '@devtron-labs/devtron-fe-common-lib'
+import { ConfigMapSecretForm } from '@Pages/Shared/ConfigMapSecret/ConfigMapSecretForm'
+
+const BuildInfraCMCSForm = ({ parsedData, useFormProps, componentType }: BuildInfraCMCSFormProps) => (
+    <ConfigMapSecretForm
+        isCreateView={!parsedData.canOverride && parsedData.isOverridden}
+        configMapSecretData={parsedData.initialResponse}
+        inheritedConfigMapSecretData={parsedData.initialResponse}
+        cmSecretStateLabel={null}
+        isJob
+        appChartRef={null}
+        isApprovalPolicyConfigured={false}
+        areScopeVariablesResolving={false}
+        disableDataTypeChange={false}
+        componentType={componentType}
+        useFormProps={useFormProps}
+        isExternalSubmit
+        noContainerPadding
+    />
+)
+
+export default BuildInfraCMCSForm

src/Pages/GlobalConfigurations/BuildInfra/BuildInfraUtiltityProvider.tsx

@@ -0,0 +1,17 @@
+import { useMemo } from 'react'
+import { BuildInfraUtilityContext, BuildInfraUtilityContextType } from '@devtron-labs/devtron-fe-common-lib'
+import BuildInfraCMCSForm from './BuildInfraCMCSForm'
+import { BuildInfraUtilityProviderProps } from './types'
+
+const BuildInfraUtilityProvider = ({ children }: BuildInfraUtilityProviderProps) => {
+    const value: BuildInfraUtilityContextType = useMemo(
+        () => ({
+            BuildInfraCMCSForm,
+        }),
+        [],
+    )
+
+    return <BuildInfraUtilityContext.Provider value={value}>{children}</BuildInfraUtilityContext.Provider>
+}
+
+export default BuildInfraUtilityProvider

src/Pages/GlobalConfigurations/BuildInfra/types.tsx

@@ -14,6 +14,12 @@
  * limitations under the License.
  */
 
+import { ReactNode } from 'react'
+
 export interface BuildInfraProps {
     isSuperAdmin: boolean
 }
+
+export interface BuildInfraUtilityProviderProps {
+    children: ReactNode
+}

src/Pages/Releases/Detail/Configurations/Configurations.tsx

@@ -9,11 +9,12 @@ import {
     getIsApprovalPolicyConfigured,
     Progressing,
     useAsync,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { URLS } from '@Config/routes'
 import { importComponentFromFELibrary } from '@Components/common'
-import { ConfigMapSecretWrapper, CMSecretComponentType } from '@Pages/Shared/ConfigMapSecret'
+import { ConfigMapSecretWrapper } from '@Pages/Shared/ConfigMapSecret'
 import { DeploymentConfigCompare, DeploymentTemplate } from '@Pages/Applications'
 import { getEnvConfig } from '@Pages/Applications/DevtronApps/service'
 import { EnvConfigurationsNav } from '@Pages/Applications/DevtronApps/Details/AppConfigurations/Navigation/EnvConfigurationsNav'

src/Pages/Shared/ConfigMapSecret/ConfigMapSecret.service.ts

@@ -19,7 +19,6 @@ import {
     get,
     post,
     trash,
-    ResponseType,
     getResolvedDeploymentTemplate,
     ValuesAndManifestFlagDTO,
     GetResolvedDeploymentTemplateProps,
@@ -29,14 +28,14 @@ import {
     getIsRequestAborted,
     DraftMetadataDTO,
     showError,
-    ConfigMapSecretDataDTO,
+    JobCMSecretDataDTO,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { Routes } from '@Config/constants'
 
 import { importComponentFromFELibrary } from '@Components/common'
 import {
-    CMSecretComponentType,
     GetConfigMapSecretConfigDataProps,
     GetConfigMapSecretConfigDataReturnType,
     UpdateConfigMapSecretProps,
@@ -106,14 +105,14 @@ export const overRideSecret = ({ appId, envId, payload, signal }: OverrideConfig
         { signal },
     )
 
-export const getCMSecret = ({
+export const getJobCMSecret = ({
     componentType,
     id,
     appId,
     envId,
     name,
     signal,
-}: GetCMSecretProps): Promise<ResponseType<Omit<ConfigMapSecretDataDTO['data'], 'isDeletable'>>> => {
+}: GetCMSecretProps): Promise<JobCMSecretDataDTO> => {
     let url = ''
     if (envId !== null && envId !== undefined) {
         url = `${
@@ -140,7 +139,7 @@ export const getConfigMapSecretConfigData = async <IsJob extends boolean = false
 }: GetConfigMapSecretConfigDataProps<IsJob>) => {
     try {
         const { result } = await (isJob
-            ? getCMSecret({
+            ? getJobCMSecret({
                   componentType,
                   id: resourceId,
                   appId,

src/Pages/Shared/ConfigMapSecret/ConfigMapSecret.wrapper.tsx

@@ -8,13 +8,14 @@ import {
     Progressing,
     showError,
     useAsync,
+    CMSecretComponentType,
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import { getAppChartRefForAppAndEnv } from '@Services/service'
 import { ComponentStates } from '@Pages/Shared/EnvironmentOverride/EnvironmentOverrides.types'
 
 import { CM_SECRET_COMPONENT_NAME } from './constants'
-import { CMSecretComponentType, CMSecretWrapperProps } from './types'
+import { CMSecretWrapperProps } from './types'
 
 import { ConfigMapSecretContainer } from './ConfigMapSecretContainer'