Merge pull request #1614 from devtron-labs/remove-redundant-component

chore: remove radioGroup and ConditionalWrap from dashboard

Author: vivek-devtron

package.json

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

src/components/CIPipelineN/TaskDetailComponent.tsx

@@ -1,11 +1,15 @@
 import React, { useState, useContext } from 'react'
-import { CustomInput, PluginType, ScriptType } from '@devtron-labs/devtron-fe-common-lib'
 import YAML from 'yaml'
 import { ConfigurationType, BuildStageVariable } from '../../config'
-import { RadioGroup } from '../common'
 import { ConditionContainerType, PluginVariableType } from '../ciPipeline/types'
 import { VariableContainer } from './VariableContainer'
 import { ConditionContainer } from './ConditionContainer'
+import {
+    CustomInput,
+    PluginType,
+    ScriptType,
+    StyledRadioGroup as RadioGroup,
+} from '@devtron-labs/devtron-fe-common-lib'
 import { YAMLScriptComponent } from './YAMLScriptComponent'
 import CustomInputOutputVariables from './CustomInputOutputVariables'
 import { TaskTypeDetailComponent } from './TaskTypeDetailComponent'

src/components/CodeEditor/CodeEditor.tsx

@@ -1,12 +1,18 @@
 import React, { useEffect, useCallback, useReducer, useRef } from 'react'
 import MonacoEditor, { MonacoDiffEditor } from 'react-monaco-editor'
-import { MODES, Progressing, copyToClipboard, useWindowSize } from '@devtron-labs/devtron-fe-common-lib'
+import {
+    MODES,
+    Progressing,
+    copyToClipboard,
+    useWindowSize,
+    StyledRadioGroup as RadioGroup,
+} from '@devtron-labs/devtron-fe-common-lib'
 import YAML from 'yaml'
 import ReactGA from 'react-ga4'
 import * as monaco from 'monaco-editor/esm/vs/editor/editor.api'
 import { configureMonacoYaml } from 'monaco-yaml'
 
-import { useJsonYaml, Select, RadioGroup } from '../common'
+import { useJsonYaml, Select } from '../common'
 import { ReactComponent as ClipboardIcon } from '../../assets/icons/ic-copy.svg'
 import { ReactComponent as Info } from '../../assets/icons/ic-info-filled.svg'
 import { ReactComponent as ErrorIcon } from '../../assets/icons/ic-error-exclamation.svg'

src/components/ConfigMapSecret/ConfigMapSecretDataEditorContainer.tsx

@@ -1,7 +1,7 @@
 // @ts-nocheck
 import React from 'react'
 import YAML from 'yaml'
-import { Info, RadioGroup } from '../common'
+import { Info } from '../common'
 import { KeyValueInput, useKeyValueYaml } from './ConfigMapSecret.components'
 import CodeEditor from '../CodeEditor/CodeEditor'
 import { PATTERNS } from '../../config'
@@ -18,6 +18,7 @@ import {
     VIEW_MODE,
 } from './Secret/secret.utils'
 import { KeyValueFileInput } from '../util/KeyValueFileInput'
+import { StyledRadioGroup as RadioGroup } from '@devtron-labs/devtron-fe-common-lib'
 import { CM_SECRET_STATE } from './Constants'
 import { ReactComponent as ShowIcon } from '../../assets/icons/ic-visibility-on.svg'
 import { ReactComponent as HideIcon } from '../../assets/icons/ic-visibility-off.svg'

src/components/ResourceBrowser/ResourceList/ResourceFilterOptions.tsx

@@ -7,8 +7,12 @@ import { ResourceFilterOptionsProps } from '../Types'
 import { ReactComponent as Search } from '../../../assets/icons/ic-search.svg'
 import { ReactComponent as Clear } from '../../../assets/icons/ic-error.svg'
 import { ResourceValueContainerWithIcon, tippyWrapper } from './ResourceList.component'
-import { ALL_NAMESPACE_OPTION, FILTER_SELECT_COMMON_STYLES, NAMESPACE_NOT_APPLICABLE_OPTION } from '../Constants'
-import { ConditionalWrap } from '../../common'
+import {
+    ALL_NAMESPACE_OPTION,
+    FILTER_SELECT_COMMON_STYLES,
+    NAMESPACE_NOT_APPLICABLE_OPTION
+} from '../Constants'
+import { ConditionalWrap } from '@devtron-labs/devtron-fe-common-lib'
 import { OptionType } from '../../app/types'
 import { ShortcutKeyBadge } from '../../common/formFields/Widgets/Widgets'
 

src/components/app/Overview/Overview.tsx

@@ -2,6 +2,8 @@ import React, { useEffect, useMemo, useState } from 'react'
 import moment from 'moment'
 import { Link, useHistory, useLocation, useParams } from 'react-router-dom'
 import { toast } from 'react-toastify'
+import { ModuleNameMap, Moment12HourFormat, URLS } from '../../../config'
+import { getJobCIPipeline, getTeamList } from '../../../services/service'
 import {
     showError,
     Progressing,
@@ -10,11 +12,10 @@ import {
     useAsync,
     getRandomColor,
     noop,
+    StyledRadioGroup as RadioGroup,
 } from '@devtron-labs/devtron-fe-common-lib'
 import ReactGA from 'react-ga4'
-import { ModuleNameMap, Moment12HourFormat, URLS } from '../../../config'
-import { getJobCIPipeline, getTeamList } from '../../../services/service'
-import { EditableTextArea, RadioGroup, handleUTCTime, importComponentFromFELibrary } from '../../common'
+import { EditableTextArea, handleUTCTime, importComponentFromFELibrary } from '../../common'
 import { AppOverviewProps, EditAppRequest, JobPipeline } from '../types'
 import { ReactComponent as EditIcon } from '../../../assets/icons/ic-pencil.svg'
 import { ReactComponent as TagIcon } from '../../../assets/icons/ic-tag.svg'

src/components/app/details/appConfig/AppConfig.tsx

@@ -1,15 +1,5 @@
 import React, { useState, useEffect, lazy } from 'react'
 import { useParams, useLocation, useRouteMatch, useHistory, NavLink, Link } from 'react-router-dom'
-
-import {
-    showError,
-    Progressing,
-    ErrorScreenManager,
-    DeleteDialog,
-    ConfirmationDialog,
-    TippyCustomized,
-    TippyTheme,
-} from '@devtron-labs/devtron-fe-common-lib'
 import { toast } from 'react-toastify'
 import {
     URLS,
@@ -19,7 +9,17 @@ import {
     ViewType,
     isCDPipelineCreated,
 } from '../../../../config'
-import { ConditionalWrap, importComponentFromFELibrary } from '../../../common'
+import { importComponentFromFELibrary } from '../../../common'
+import {
+    showError,
+    Progressing,
+    ErrorScreenManager,
+    DeleteDialog,
+    ConfirmationDialog,
+    TippyCustomized,
+    TippyTheme,
+    ConditionalWrap,
+} from '@devtron-labs/devtron-fe-common-lib'
 import { getAppConfigStatus, getAppOtherEnvironmentMin, getWorkflowList } from '../../../../services/service'
 import { deleteApp } from './appConfig.service'
 import { ReactComponent as Lock } from '../../../../assets/icons/ic-locked.svg'

src/components/app/details/cicdHistory/Sidebar.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect, useRef } from 'react'
+import { createGitCommitUrl } from '../../../common'
 import { useRouteMatch, useParams, useHistory, generatePath, useLocation } from 'react-router'
 import ReactSelect, { components } from 'react-select'
 import moment from 'moment'
 import TippyHeadless from '@tippyjs/react/headless'
 import { NavLink } from 'react-router-dom'
 import ReactGA from 'react-ga4'
-import { ConditionalWrap, createGitCommitUrl } from '../../../common'
 import { DropdownIndicator, getCustomOptionSelectionStyle } from '../../../v2/common/ReactSelect.utils'
 import { Moment12HourFormat, SourceTypeMap } from '../../../../config'
 import { CiPipelineSourceConfig } from '../../../ciPipeline/CiPipelineSourceConfig'
@@ -24,6 +24,7 @@ import { ReactComponent as ICArrowBackward } from '../../../../assets/icons/ic-a
 import DetectBottom from '../../../common/DetectBottom'
 import { FILTER_STYLE, HISTORY_LABEL } from './Constants'
 import { triggerStatus } from './History.components'
+import { ConditionalWrap } from '@devtron-labs/devtron-fe-common-lib'
 
 const Sidebar = React.memo(
     ({

src/components/app/details/triggerView/triggerViewConfigDiff/TriggerViewConfigDiff.tsx

@@ -1,7 +1,6 @@
 import React, { Fragment, useEffect, useState } from 'react'
 import YAML from 'yaml'
 import Tippy from '@tippyjs/react'
-import { Toggle, useSearchString } from '@devtron-labs/devtron-fe-common-lib'
 import { DeploymentHistorySingleValue } from '../../cdDetails/cd.type'
 import CodeEditor from '../../../../CodeEditor/CodeEditor'
 import { MODES } from '../../../../../config'
@@ -10,13 +9,14 @@ import { DEPLOYMENT_CONFIGURATION_NAV_MAP, getDeployConfigOptions } from '../Tri
 import ReactSelect, { components } from 'react-select'
 import { DropdownIndicator, Option } from '../../../../v2/common/ReactSelect.utils'
 import { getCommonConfigSelectStyles } from '../config'
-import { ConditionalWrap } from '../../../../common'
 import { TriggerViewConfigDiffProps } from '../types'
 import { ReactComponent as ManifestIcon } from '../../../../../assets/icons/ic-file-code.svg'
 import { ReactComponent as DownArrowFull } from '../../../../../assets/icons/ic-down-arrow-full.svg'
 import { ReactComponent as ViewVariablesIcon } from '../../../../../assets/icons/ic-view-variable-toggle.svg'
+import { Toggle, ConditionalWrap,useSearchString } from '@devtron-labs/devtron-fe-common-lib'
 import { useHistory } from 'react-router-dom'
 
+
 export default function TriggerViewConfigDiff({
     currentConfiguration,
     baseTemplateConfiguration,

src/components/cdPipeline/CDPipeline.tsx

@@ -20,6 +20,7 @@ import {
     DeploymentAppTypes,
     PipelineType,
     CustomInput,
+    ConditionalWrap,
 } from '@devtron-labs/devtron-fe-common-lib'
 import yamlJsParser from 'yaml'
 import ReactSelect from 'react-select'
@@ -67,12 +68,7 @@ import {
 } from '../v2/common/ReactSelect.utils'
 import './cdPipeline.scss'
 import dropdown from '../../assets/icons/ic-chevron-down.svg'
-import {
-    ConditionalWrap,
-    createClusterEnvGroup,
-    getDeploymentAppType,
-    importComponentFromFELibrary,
-} from '../common/helpers/Helpers'
+import { createClusterEnvGroup, getDeploymentAppType, importComponentFromFELibrary } from '../common/helpers/Helpers'
 import {
     DEPLOY_IMAGE_EXTERNALSOURCE,
     EDIT_DEPLOYMENT_PIPELINE,