Merge pull request #2928 from devtron-labs/chore/kubecon-develop-pull

chore: kubecon develop pull

Author: AbhishekA1509

package.json

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

src/Pages/GlobalConfigurations/Authorization/SSOLoginServices/constants.ts

@@ -48,7 +48,7 @@ export const ssoDocumentationMap: Record<SSOProvider, string> = {
  *
  * Note: Remove once ON for all providers
  */
-export const autoAssignPermissionsFlowActiveProviders = [SSOProvider.microsoft, SSOProvider.ldap]
+export const autoAssignPermissionsFlowActiveProviders = [SSOProvider.microsoft, SSOProvider.ldap, SSOProvider.oidc]
 
 export const ssoProviderToDisplayNameMap: Record<SSOProvider, string> = {
     [SSOProvider.google]: 'Google',

src/components/ClusterNodes/ClusterList/ClusterListView.tsx

@@ -92,7 +92,8 @@ const ClusterListView = (props: ClusterViewType) => {
                 }
                 acc[cluster.name] = cluster
                 return acc
-            }, {} as ClusterDetail) ?? {},
+            }, {} as BulkSelectionIdentifiersType<ClusterDetail>) ??
+            ({} as BulkSelectionIdentifiersType<ClusterDetail>),
         [filteredList],
     )
 
@@ -149,7 +150,7 @@ const ClusterListView = (props: ClusterViewType) => {
                 )}
             </div>
 
-            <ClusterSelectionBody {...props} filteredList={filteredList} />
+            <ClusterSelectionBody {...props} filteredList={filteredList} identifierMap={allOnThisPageIdentifiers} />
         </BulkSelectionProvider>
     )
 }

src/components/ClusterNodes/ClusterList/ClusterSelectionBody.tsx

@@ -52,6 +52,8 @@ const ClusterSelectionBody: React.FC<ClusterSelectionBodyTypes> = ({
     filteredList,
     refreshData,
     parentRef,
+    isClusterDetailListLoading,
+    identifierMap,
 }) => {
     const [showKubeConfigModal, setShowKubeConfigModal] = useState(false)
     const [selectedClusterName, setSelectedClusterName] = useState('')
@@ -136,6 +138,8 @@ const ClusterSelectionBody: React.FC<ClusterSelectionBodyTypes> = ({
                         clusterName={selectedClusterName || identifierCount === 0}
                         handleModalClose={onChangeCloseKubeConfigModal}
                         isSingleClusterButton={!!selectedClusterName}
+                        isClusterDetailListLoading={isClusterDetailListLoading}
+                        identifierMap={identifierMap}
                     />
                 )}
             </div>

src/components/ClusterNodes/ClusterList/types.ts

@@ -16,14 +16,15 @@
 
 import { MutableRefObject } from 'react'
 
-import { ClusterDetail } from '@devtron-labs/devtron-fe-common-lib'
+import { BulkSelectionIdentifiersType, ClusterDetail } from '@devtron-labs/devtron-fe-common-lib'
 
 export interface ClusterViewType {
     clusterOptions: ClusterDetail[]
     clusterListLoader: boolean
     initialLoading: boolean
     refreshData: () => void
     parentRef: MutableRefObject<HTMLDivElement>
+    isClusterDetailListLoading: boolean
 }
 
 export interface ClusterListTypes {
@@ -39,4 +40,5 @@ export interface ClusterListRowTypes extends Omit<ClusterListTypes, 'filteredLis
 
 export interface ClusterSelectionBodyTypes extends ClusterViewType {
     filteredList: ClusterDetail[]
+    identifierMap: BulkSelectionIdentifiersType<ClusterDetail>
 }

src/components/ResourceBrowser/ResourceBrowser.tsx

@@ -44,7 +44,9 @@ const ResourceBrowser: React.FC = () => {
     const [detailClusterListLoading, detailClusterList, , reloadDetailClusterList] = useAsync(() =>
         getClusterListing(false, abortControllerRef),
     )
-    const [initialLoading, clusterListMinData, error] = useAsync(() => getClusterListing(true, abortControllerRef))
+    const [initialLoading, clusterListMinData, error, reloadMinClusterListing] = useAsync(() =>
+        getClusterListing(true, abortControllerRef),
+    )
 
     const { pathname } = useLocation()
     const { breadcrumbs } = useBreadcrumb(
@@ -71,7 +73,7 @@ const ResourceBrowser: React.FC = () => {
         [detailClusterList, clusterListMinData],
     )
 
-    const filteredSortedCluserList = useMemo(
+    const filteredSortedClusterList = useMemo(
         () =>
             sortedClusterList.filter(
                 (option) =>
@@ -83,16 +85,17 @@ const ResourceBrowser: React.FC = () => {
 
     const renderContent = () => {
         if (error) {
-            return <ErrorScreenManager code={error.code} />
+            return <ErrorScreenManager code={error.code} reload={reloadMinClusterListing} />
         }
 
         return (
             <ClusterListView
                 parentRef={parentRef}
-                clusterOptions={filteredSortedCluserList}
+                clusterOptions={filteredSortedClusterList}
                 clusterListLoader={detailClusterListLoading}
                 initialLoading={initialLoading}
                 refreshData={reloadDetailClusterList}
+                isClusterDetailListLoading={detailClusterListLoading}
             />
         )
     }

src/components/ResourceBrowser/ResourceList/utils.tsx

@@ -524,7 +524,7 @@ export const getNodeSearchKeysOptionsList = (rows: NodeListSearchFilterType['row
         nodeGroups: Map<string, NodeSearchListOptionType>
     }>(
         (acc, curr) => {
-            ;(curr.data.labels as { key: string; value: string }[]).forEach(({ key, value }) => {
+            ;((curr.data.labels ?? []) as { key: string; value: string }[]).forEach(({ key, value }) => {
                 if (!acc.labels.has(`${key}/${value}`)) {
                     acc.labels.set(`${key}/${value}`, {
                         label: `${key}=${value}`,

src/components/app/details/appDetails/SourceInfo.tsx

@@ -158,7 +158,7 @@ export const SourceInfo = ({
             loadingCards.push(<LoadingCard key={i} />)
         }
 
-        return <div className="flex left mb-16">{loadingCards}</div>
+        return <div className="flex left mb-16 ml-20">{loadingCards}</div>
     }
 
     const onClickSliderVerticalButton = () => {