Merge branch 'develop' into feat/api-token-removed

Author: shivani170

.env

@@ -73,5 +73,6 @@ FEATURE_ASK_DEVTRON_EXPERT=false
 FEATURE_MANAGE_TRAFFIC_ENABLE=false
 FEATURE_REDFISH_NODE_ENABLE=false
 FEATURE_INFRA_PROVISION_INFO_BLOCK_HIDE=false
+FEATURE_GROUPED_APP_LIST_FILTERS_ENABLE=false
 FEATURE_FLUX_DEPLOYMENTS_ENABLE=false
 FEATURE_LINK_EXTERNAL_FLUX_ENABLE=false

.eslintignore

@@ -152,17 +152,12 @@ src/components/charts/discoverChartDetail/About.tsx
 src/components/charts/discoverChartDetail/ChartDeploymentList.tsx
 src/components/charts/discoverChartDetail/DiscoverChartDetails.tsx
 src/components/charts/list/ChartGroup.tsx
-src/components/charts/list/ChartListPopUp.tsx
 src/components/charts/list/ChartListPopUpRow.tsx
-src/components/charts/list/Deployed.tsx
 src/components/charts/list/DeployedChartFilters.tsx
 src/components/charts/list/DiscoverCharts.tsx
 src/components/charts/modal/ChartGroupBasicDeploy.tsx
 src/components/charts/modal/CreateChartGroup.tsx
 src/components/charts/useChartGroup.ts
-src/components/charts/util/ChartGroupCard.tsx
-src/components/charts/util/ChartSelect.tsx
-src/components/charts/util/ChartValueSelect.tsx
 src/components/checkList/AllChartsCheck.tsx
 src/components/checkList/AllCheckModal.tsx
 src/components/checkList/AppCheckList.tsx

package.json

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

src/components/ResourceBrowser/ResourceList/ResourceList.component.tsx

@@ -17,15 +17,14 @@
 import React, { MouseEventHandler, useEffect, useState } from 'react'
 import { ClearIndicatorProps, components, ValueContainerProps } from 'react-select'
 
-import { Button, ButtonVariantType, ComponentSizeType, Tooltip } from '@devtron-labs/devtron-fe-common-lib'
+import { Button, ButtonVariantType, ComponentSizeType } from '@devtron-labs/devtron-fe-common-lib'
 
 import { ReactComponent as ClearIcon } from '@Icons/ic-error.svg'
 import { ReactComponent as SearchIcon } from '@Icons/ic-search.svg'
 import { ReactComponent as Warning } from '@Icons/ic-warning.svg'
 
 import { handleUTCTime } from '../../common'
 import { ShortcutKeyBadge } from '../../common/formFields/Widgets/Widgets'
-import { SidebarChildButtonPropsType } from '../Types'
 
 export const KindSearchValueContainer = (props: ValueContainerProps) => {
     const { selectProps, children } = props
@@ -96,38 +95,3 @@ export const renderRefreshBar =
     (show: boolean, lastSyncTime: string, callback: () => void): (() => JSX.Element) =>
     () =>
         !show ? null : <WarningStrip lastSyncTime={lastSyncTime} callback={callback} />
-
-export const SidebarChildButton: React.FC<SidebarChildButtonPropsType> = ({
-    parentRef,
-    group,
-    version,
-    text,
-    kind,
-    namespaced,
-    isSelected,
-    onClick,
-}) => (
-    <button
-        type="button"
-        className="dc__unset-button-styles"
-        key={text}
-        ref={parentRef}
-        data-group={group}
-        data-version={version}
-        data-kind={kind}
-        data-namespaced={namespaced}
-        data-selected={isSelected}
-        onClick={onClick}
-        aria-label={`Select ${text}`}
-    >
-        <Tooltip content={text} placement="right">
-            <div
-                className={`fs-13 pointer dc__ellipsis-right dc__align-left dc__border-radius-4-imp fw-4 pt-6 lh-20 pr-8 pb-6 pl-8 ${
-                    isSelected ? 'bcb-1 cb-5' : 'cn-9 dc__hover-n50'
-                }`}
-            >
-                {text}
-            </div>
-        </Tooltip>
-    </button>
-)