Skip to content

feat: duplicate resource list #3058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shivani170 merged 2 commits into from
Feb 13, 2026
Merged

feat: duplicate resource list #3058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7f62f2
fix: resource browser list duplicate fix
shivani170 Feb 6, 2026
198d2c5
chore: cluster list row code cleanup
shivani170 Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/ClusterNodes/ClusterList/ClusterList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ const ClusterList = ({
</div>
{filteredList.map((clusterData) => (
<ClusterListRow
key={clusterData.id ?? clusterData.installationId}
key={`${clusterData.name}-${clusterData.id ?? clusterData.installationId}`}
clusterData={clusterData}
clusterListLoader={clusterListLoader}
showKubeConfigModal={showKubeConfigModal}
Expand Down
58 changes: 32 additions & 26 deletions src/components/ClusterNodes/ClusterList/ClusterListRow.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* limitations under the License.
*/

import { useMemo } from 'react'
import { generatePath, Link } from 'react-router-dom'

import {
Expand Down Expand Up @@ -51,35 +52,29 @@ const ClusterListRow = ({
onChangeShowKubeConfigModal,
setSelectedClusterName,
}: ClusterListRowTypes) => {
const { selectedIdentifiers: bulkSelectionState, getSelectedIdentifiersCount } =
const { selectedIdentifiers, getSelectedIdentifiersCount } =
useBulkSelection<BulkSelectionIdentifiersType<ClusterDetail>>()
const errorCount = clusterData.nodeErrors ? Object.keys(clusterData.nodeErrors).length : 0
const identifierCount = getSelectedIdentifiersCount()
const isIdentifierSelected = Boolean(selectedIdentifiers[clusterData.name])

const hideDataOnLoad = (value) => {
if (clusterListLoader) {
return null
}
return value
}

const renderClusterStatus = ({ errorInNodeListing, status }: ClusterDetail) => {
if (!status) {
return null
}

return <ClusterStatus status={status} errorInNodeListing={errorInNodeListing} />
}

const isIdentifierSelected = !!bulkSelectionState[clusterData.name]
const errorCount = useMemo(
() => (clusterData.nodeErrors ? Object.keys(clusterData.nodeErrors).length : 0),
[clusterData.nodeErrors],
)

const isClusterInCreationPhase = !!clusterData.installationId && !clusterData.id
const isClusterInCreationPhase = Boolean(clusterData.installationId && !clusterData.id)

const clusterLinkURL = getClusterChangeRedirectionUrl(
isClusterInCreationPhase,
String(isClusterInCreationPhase ? clusterData.installationId : clusterData.id),
const clusterLinkURL = useMemo(
() =>
getClusterChangeRedirectionUrl(
isClusterInCreationPhase,
String(isClusterInCreationPhase ? clusterData.installationId : clusterData.id),
),
[isClusterInCreationPhase, clusterData.installationId, clusterData.id],
)

const hideDataOnLoad = (value) => (clusterListLoader ? null : value)

const wrapWithLinkForClusterName = (children) => (
<Link className="dc__ellipsis-right dc__no-decor" to={clusterLinkURL}>
{children}
Expand All @@ -88,9 +83,8 @@ const ClusterListRow = ({

return (
<div
key={`cluster-${clusterData.id}`}
className={`cluster-list-row fw-4 cn-9 fs-13 dc__border-bottom-n1 py-12 px-20 hover-class dc__visible-hover dc__visible-hover--parent
${clusterListLoader ? 'show-shimmer-loading dc__align-items-center' : ''}`}
${clusterListLoader ? 'show-shimmer-loading dc__align-items-center' : ''}`}
>
{KubeConfigRowCheckbox && <KubeConfigRowCheckbox clusterData={clusterData} />}
{!isIdentifierSelected && identifierCount === 0 && (
Expand Down Expand Up @@ -125,9 +119,11 @@ const ClusterListRow = ({
}}
/>
)}

{CompareClusterButton && clusterData.status !== ClusterStatusType.CONNECTION_FAILED && (
<CompareClusterButton sourceClusterId={clusterData.id} isIconButton />
)}

{KubeConfigButton && (
<KubeConfigButton
onChangeShowKubeConfigModal={onChangeShowKubeConfigModal}
Expand All @@ -139,8 +135,18 @@ const ClusterListRow = ({
</div>
)}
</div>
<div className="child-shimmer-loading">{hideDataOnLoad(renderClusterStatus(clusterData))}</div>
{}

<div className="child-shimmer-loading">
{hideDataOnLoad(
clusterData.status && (
<ClusterStatus
status={clusterData.status}
errorInNodeListing={clusterData.errorInNodeListing}
/>
),
)}
</div>

<div className="child-shimmer-loading">
{hideDataOnLoad(clusterData.isProd ? CLUSTER_PROD_TYPE.PRODUCTION : CLUSTER_PROD_TYPE.NON_PRODUCTION)}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/ClusterNodes/ClusterList/ClusterListView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ const ClusterListView = (props: ClusterViewType) => {

return (!searchKey || option.name.toLowerCase().includes(loweredSearchKey)) && filterCondition
})
}, [searchKey, clusterOptions, `${clusterFilter}`, sortBy, sortOrder])
}, [searchKey, clusterOptions, clusterFilter, sortBy, sortOrder])

const handleFilterKeyPress = (value: string) => {
handleSearch(value)
Expand Down
Loading