Skip to content

Commit 5d6de68

Browse files
committed
chore: bump common-lib version
1 parent ac8a548 commit 5d6de68

File tree

3 files changed

+25
-16
lines changed

3 files changed

+25
-16
lines changed

src/components/ResourceBrowser/ResourceBrowser.service.tsx

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,20 @@ export const getResourceData = async ({
7878
return parseNodeList(response)
7979
}
8080

81-
const response = await getK8sResourceList(
82-
getK8sResourceListPayload(clusterId, selectedNamespace.value.toLowerCase(), selectedResource, filters),
83-
abortControllerRef.current.signal,
84-
)
81+
const isNamespaceList = selectedResource.gvk.Kind.toLowerCase() === Nodes.Namespace.toLowerCase()
8582

86-
if (selectedResource.gvk.Kind.toLowerCase() === Nodes.Namespace.toLowerCase()) {
87-
const { result } = await getNamespaceListMin(clusterId, abortControllerRef)
83+
const [k8sResponse, namespaceListResponse] = await Promise.allSettled([
84+
getK8sResourceList(
85+
getK8sResourceListPayload(clusterId, selectedNamespace.value.toLowerCase(), selectedResource, filters),
86+
abortControllerRef.current.signal,
87+
),
88+
isNamespaceList ? getNamespaceListMin(clusterId, abortControllerRef) : null,
89+
])
90+
91+
const response = k8sResponse.status === 'fulfilled' ? k8sResponse.value : null
92+
93+
if (isNamespaceList && namespaceListResponse?.status === 'fulfilled') {
94+
const { result } = namespaceListResponse.value
8895
const [{ environments }] = result
8996

9097
const namespaceToEnvironmentMap = environments.reduce(

src/components/ResourceBrowser/ResourceList/BaseResourceList.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -554,14 +554,16 @@ const BaseResourceListContent = ({
554554
}}
555555
/>
556556
</Tooltip>
557-
{columnName === 'environment' && !resourceData.environment && (
558-
<Button
559-
text="Add environment"
560-
dataTestId="add-environment"
561-
variant={ButtonVariantType.text}
562-
onClick={getAddEnvironmentClickHandler(resourceData.name as string)}
563-
/>
564-
)}
557+
{selectedResource?.gvk.Kind.toLowerCase() === Nodes.Namespace.toLowerCase() &&
558+
columnName === 'environment' &&
559+
!resourceData.environment && (
560+
<Button
561+
text="Add environment"
562+
dataTestId="add-environment"
563+
variant={ButtonVariantType.text}
564+
onClick={getAddEnvironmentClickHandler(resourceData.name as string)}
565+
/>
566+
)}
565567
{columnName === 'status' && isNodeUnschedulable && (
566568
<>
567569
<span className="dc__bullet mr-4 ml-4 mw-4 bcn-4" />

yarn.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,8 +1128,8 @@
11281128

11291129
"@devtron-labs/[email protected]":
11301130
version "1.13.0-pre-4"
1131-
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.13.0-pre-4.tgz#76827523822dc93046eb7dc7b4a500d5892da09b"
1132-
integrity sha512-MnvUU7TxzDxJoWyOcaDU7eRMSgpd0niFpNTVYlEiPex69lA3gWlCuEN/MDDObeQ75p4Fgkn7kR6lMDCuFpLZsg==
1131+
resolved "https://registry.yarnpkg.com/@devtron-labs/devtron-fe-common-lib/-/devtron-fe-common-lib-1.13.0-pre-4.tgz#333a71f75905a38f4706b698b93089cc08680fa7"
1132+
integrity sha512-DVODh1yAI6KxiANtPW1t6AUyIiKA+PMniMfb/LB2XtBUlEGkAgKWzpbPWdIw0m1Wn+iFwzmUOL2KDQ9I4FYt9g==
11331133
dependencies:
11341134
"@codemirror/lang-json" "6.0.1"
11351135
"@codemirror/lang-yaml" "6.1.2"

0 commit comments

Comments
 (0)