Merge branch 'main' of https://github.com/devtron-labs/dashboard into chore/main-pull

Author: AbhishekA1509

package.json

@@ -4,7 +4,7 @@
     "private": true,
     "homepage": "/dashboard",
     "dependencies": {
-        "@devtron-labs/devtron-fe-common-lib": "1.20.0-pre-0",
+        "@devtron-labs/devtron-fe-common-lib": "1.20.2-pre-0",
         "@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

@@ -39,7 +39,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),
+    )
 
     useEffect(
         () => () => {
@@ -53,7 +55,7 @@ const ResourceBrowser: React.FC = () => {
         [detailClusterList, clusterListMinData],
     )
 
-    const filteredSortedCluserList = useMemo(
+    const filteredSortedClusterList = useMemo(
         () =>
             sortedClusterList.filter(
                 (option) =>
@@ -65,16 +67,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/v2/appDetails/k8Resource/nodeDetail/NodeDetailTabs/Manifest.component.tsx

@@ -689,7 +689,7 @@ const ManifestComponent = ({
         handleStickDynamicTabsToTop?.()
     }
 
-    const hasUnsavedChanges = previousEditorState.current !== getCodeEditorValue()
+    const hasUnsavedChanges = isEditMode && previousEditorState.current !== getCodeEditorValue()
 
     usePrompt({ shouldPrompt: hasUnsavedChanges })
 

yarn.lock

@@ -1722,9 +1722,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@devtron-labs/devtron-fe-common-lib@npm:1.20.0-pre-0":
-  version: 1.20.0-pre-0
-  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.0-pre-0"
+"@devtron-labs/devtron-fe-common-lib@npm:1.20.2-pre-0":
+  version: 1.20.2-pre-0
+  resolution: "@devtron-labs/devtron-fe-common-lib@npm:1.20.2-pre-0"
   dependencies:
     "@codemirror/autocomplete": "npm:6.18.6"
     "@codemirror/lang-json": "npm:6.0.1"
@@ -1774,7 +1774,7 @@ __metadata:
     react-select: 5.8.0
     rxjs: ^7.8.1
     yaml: ^2.4.1
-  checksum: 10c0/6e5bf8c152404212d83b714193a9217f2a895b3074fc865e13a30d10a00877f6283e7a789db0448a821a92011160617740b773fee2189decad51d31166448ae6
+  checksum: 10c0/02c46302a67d16f9df1921a7374ac73bd4d652eda4e6ba39ece34ce2c0e849099d44f1158104858b24f309efbabd0a6059abf3c4600ab6b967f75b591a63d2b2
   languageName: node
   linkType: hard
 
@@ -5721,7 +5721,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "dashboard@workspace:."
   dependencies:
-    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.0-pre-0"
+    "@devtron-labs/devtron-fe-common-lib": "npm:1.20.2-pre-0"
     "@esbuild-plugins/node-globals-polyfill": "npm:0.2.3"
     "@playwright/test": "npm:^1.32.1"
     "@rjsf/core": "npm:^5.13.3"