feat: add support for editing ca

talog schema in catalogs

Author: arunjaindev

src/Pages-Devtron-2.0/ApplicationManagement/Configurations/ConfigurationsRouter.tsx

@@ -14,7 +14,6 @@ import {
 } from '@devtron-labs/devtron-fe-common-lib'
 
 import ChartRepo from '@Components/chartRepo/ChartRepo'
-import { importComponentFromFELibrary } from '@Components/common'
 import { APPLICATION_MANAGEMENT_CONFIGURATIONS } from '@Components/Navigation'
 import { AddNotification } from '@Components/notifications/AddNotification'
 import { URLS } from '@Config/routes'
@@ -31,8 +30,6 @@ const BuildInfra = lazy(() =>
     import('@Pages/GlobalConfigurations/BuildInfra').then((module) => ({ default: module.BuildInfra })),
 )
 
-const CatalogFramework = importComponentFromFELibrary('CatalogFramework')
-
 export const Configurations = () => {
     const { pathname } = useLocation()
     const { featureGitOpsFlags: isFeatureGitOpsEnabled, serverMode, isSuperAdmin } = useMainContext()
@@ -115,14 +112,6 @@ export const Configurations = () => {
                         >
                             {(props) => <Notifications {...props} isSuperAdmin={isSuperAdmin} />}
                         </Route>
-                        {CatalogFramework && (
-                            <Route
-                                key={COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK}
-                                path={COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK}
-                            >
-                                <CatalogFramework isSuperAdmin={isSuperAdmin} />
-                            </Route>
-                        )}
                         {...serverMode !== SERVER_MODE.EA_ONLY &&
                             window._env_.ENABLE_SCOPED_VARIABLES && [
                                 <Route

src/components/ClusterNodes/ClusterOverview.tsx

@@ -481,7 +481,13 @@ function ClusterOverview({ selectedCluster, addTab }: ClusterOverviewProps) {
                     )}
                     {renderClusterError()}
                     {ClusterAddOns && <ClusterAddOns clusterId={clusterId} getAvailableCharts={getAvailableCharts} />}
-                    {Catalog && <Catalog resourceId={clusterId} resourceType={ResourceKindType.cluster} />}
+                    {Catalog && (
+                        <Catalog
+                            resourceId={clusterId}
+                            resourceType={ResourceKindType.cluster}
+                            catalogSchemaResourceId={clusterDetails.catalogSchemaResourceId}
+                        />
+                    )}
                     <GenericDescription
                         isClusterTerminal
                         clusterId={clusterId}

src/components/ClusterNodes/clusterNodes.service.tsx

@@ -145,6 +145,7 @@ export const getClusterOverviewDetails = async ({
         _moment = moment(result.clusterCreatedOn, 'YYYY-MM-DDTHH:mm:ssZ')
         clusterDetails.addedOn = _moment.format(Moment12HourFormat)
         clusterDetails.serverURL = result.serverUrl
+        clusterDetails.catalogSchemaResourceId = result.catalogSchemaResourceId
 
         const data: DescriptionDataType = CLUSTER_DESCRIPTION_DUMMY_DATA
 

src/components/ClusterNodes/types.ts

@@ -53,6 +53,7 @@ export interface ClusterDescriptionType {
     clusterCreatedBy: string
     clusterCreatedOn: string
     clusterNote?: ClusterNoteType
+    catalogSchemaResourceId?: number
 }
 
 export interface ClusterNoteType {
@@ -261,7 +262,7 @@ export interface DescriptionDataType {
     descriptionUpdatedOn: string
 }
 
-export interface ClusterDetailsType {
+export interface ClusterDetailsType extends Pick<ClusterDescriptionType, 'catalogSchemaResourceId'> {
     clusterName: string
     shortDescription: string
     serverURL: string

src/components/Navigation/constants.ts

@@ -51,13 +51,6 @@ export const APPLICATION_MANAGEMENT_CONFIGURATIONS: NavigationItemType['subItems
         href: URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_NOTIFICATIONS,
         keywords: ['config'],
     },
-    {
-        title: 'Catalog Frameworks',
-        dataTestId: 'click-on-configurations-catalog-frameworks',
-        id: 'application-management-configurations-catalog-frameworks',
-        href: COMMON_URLS.APPLICATION_MANAGEMENT_CONFIGURATIONS_CATALOG_FRAMEWORK,
-        keywords: ['config'],
-    },
     {
         title: 'Scoped Variables',
         dataTestId: 'click-on-configurations-scoped-variables',

src/components/app/Overview/Overview.tsx

@@ -212,7 +212,16 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
     }
 
     const renderSideInfoColumn = () => {
-        const { appName, description, gitMaterials = [], createdOn, createdBy, projectName, chartUsed, templateConfig } = appMetaInfo
+        const {
+            appName,
+            description,
+            gitMaterials = [],
+            createdOn,
+            createdBy,
+            projectName,
+            chartUsed,
+            templateConfig,
+        } = appMetaInfo
 
         const handleSaveDescription = async (value: string) => {
             const payload: EditAppRequest = {
@@ -452,7 +461,13 @@ export default function AppOverview({ appMetaInfo, getAppMetaInfoRes, filteredEn
     function renderAppDescription() {
         return (
             <div>
-                {Catalog && <Catalog resourceId={appId} resourceType={getResourceKindFromAppType(appType)} />}
+                {Catalog && (
+                    <Catalog
+                        resourceId={appId}
+                        resourceType={getResourceKindFromAppType(appType)}
+                        catalogSchemaResourceId={appMetaInfo.catalogSchemaResourceId}
+                    />
+                )}
                 {DeploymentWindowOverview && (
                     <DeploymentWindowOverview appId={Number(appId)} filteredEnvIds={filteredEnvIds} />
                 )}

src/components/app/types.ts

@@ -107,8 +107,6 @@ interface GitMaterial {
 }
 
 export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppFormStateType, 'templateConfig'>> {
-    appId: number
-    appName: string
     createdBy: string
     description: string
     createdOn: string
@@ -121,6 +119,7 @@ export interface AppMetaInfo extends BaseAppMetaData, Partial<Pick<CreateAppForm
     chartUsed?: ChartUsed
     note?: Note
     gitMaterials?: GitMaterial[]
+    catalogSchemaResourceId?: number
 }
 
 export interface ArtifactsCiJob {

vite.config.mts

@@ -31,7 +31,7 @@ import tsconfigPaths from 'vite-tsconfig-paths'
 import { compression, defineAlgorithm } from 'vite-plugin-compression2'
 
 const WRONG_CODE = `import { bpfrpt_proptype_WindowScroller } from "../WindowScroller.js";`
-const TARGET_URL = 'https://preview.devtron.ai/'
+const TARGET_URL = 'https://dev-staging.devtron.info/'
 
 function reactVirtualized(): PluginOption {
     return {