Merge branch 'feat/create-app' of github.com:devtron-labs/devtron-fe-common-lib into feat/graph-visualizer

Author: RohitRaj011

src/Shared/Components/ModalSidebarPanel/ModalSidebarPanel.component.tsx

@@ -26,10 +26,12 @@ const ModalSidebarPanel = ({
 }: ModalSidebarPanelProps) => (
     <div className={`flexbox-col w-250 dc__gap-24 dc__modal-gradient ${rootClassName}`}>
         <div className="flexbox-col dc__gap-12">
-            <div className="flexbox-col dc__gap-4">
-                {icon && icon}
-                <h3 className="fs-18 fw-6 cn-9 lh-1-5 m-0">{heading}</h3>
-            </div>
+            {(icon || heading) && (
+                <div className="flexbox-col dc__gap-4">
+                    {icon && icon}
+                    {heading && <h3 className="fs-18 fw-6 cn-9 lh-1-5 m-0">{heading}</h3>}
+                </div>
+            )}
             {children && <div className="fs-13 fw-4 lh-1-5 cn-7">{children}</div>}
         </div>
         <div className="flexbox-col dc__gap-4">

src/Shared/Components/ModalSidebarPanel/types.ts

@@ -18,7 +18,7 @@ import { ReactNode } from 'react'
 
 export interface ModalSidebarPanelProps {
     rootClassName?: string
-    heading: string
+    heading: string | null
     icon?: JSX.Element
     children?: ReactNode
     documentationLink: string

src/Shared/Hooks/useGetResourceKindsOptions/useGetResourceKindsOptions.tsx

@@ -50,7 +50,8 @@ const useGetResourceKindsOptions = ({
                 resourcesToFetchMap[ResourceKindType.cluster] ? getClusterOptions() : null,
                 resourcesToFetchMap[ResourceKindType.environment] ? getEnvironmentOptionsGroupedByClusters() : null,
             ]),
-        [resourcesToFetchMap],
+        // Using string to prevent re-renders since it is a array of string
+        [`${resourcesToFetchMap}`],
         resourcesToFetch.length > 0,
     )
 

src/index.ts

@@ -105,6 +105,12 @@ export interface customEnv {
      * @default false
      */
     FEATURE_EXPERIMENTAL_THEMING_ENABLE?: boolean
+    /**
+     * If true, the application templates feature is enabled
+     *
+     * @default false
+     */
+    FEATURE_APPLICATION_TEMPLATES_ENABLE?: boolean
 }
 declare global {
     interface Window {