Skip to content

Commit 86e9a2e

Browse files
authored
Merge pull request #1513 from devtron-labs/feat/catalog-framework
feat: add the catalog framework under global configuration
2 parents d3f51c4 + b2c3e06 commit 86e9a2e

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

src/components/globalConfigurations/GlobalConfiguration.tsx

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ const UserGroup = lazy(() => import('../userGroups/UserGroup'))
3737
const SSOLogin = lazy(() => import('../login/SSOLogin'))
3838
const CustomChartList = lazy(() => import('../CustomChart/CustomChartList'))
3939
const ScopedVariables = lazy(() => import('../scopedVariables/ScopedVariables'))
40+
const CodeEditor = lazy(() => import('../CodeEditor/CodeEditor'))
4041
const TagListContainer = importComponentFromFELibrary('TagListContainer')
4142
const PluginsPolicy = importComponentFromFELibrary('PluginsPolicy')
4243
const FilterConditions = importComponentFromFELibrary('FilterConditions')
44+
const CatalogFramework = importComponentFromFELibrary('CatalogFramework')
4345

4446
export default function GlobalConfiguration(props) {
4547
const location = useLocation()
@@ -389,7 +391,15 @@ function NavItem({ serverMode }) {
389391
<div className="flexbox flex-justify">External Links</div>
390392
</NavLink>
391393

392-
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
394+
{CatalogFramework && <NavLink
395+
to={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
396+
key={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
397+
activeClassName="active-route"
398+
>
399+
<div className="flexbox flex-justify">Catalog Framework</div>
400+
</NavLink>}
401+
402+
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
393403
<NavLink
394404
to={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
395405
key={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
@@ -574,6 +584,11 @@ function Body({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
574584
<ScopedVariables isSuperAdmin={isSuperAdmin} />
575585
</Route>
576586
)}
587+
{CatalogFramework && (
588+
<Route key={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK} path={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}>
589+
<CatalogFramework isSuperAdmin={isSuperAdmin} CodeEditor={CodeEditor} />
590+
</Route>
591+
)}
577592
{PluginsPolicy && (
578593
<Route path={URLS.GLOBAL_CONFIG_PLUGINS}>
579594
<PluginsPolicy />

src/config/routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ export const URLS = {
6868
GLOBAL_CONFIG_PROJECT: '/global-config/projects',
6969
GLOBAL_CONFIG_LOGIN: '/global-config/login-service',
7070
GLOBAL_CONFIG_EXTERNAL_LINKS: '/global-config/external-links',
71+
GLOBAL_CONFIG_CATALOG_FRAMEWORK: '/global-config/catalog-framework',
7172
GLOBAL_CONFIG_SCOPED_VARIABLES: '/global-config/scoped-variables',
7273
GLOBAL_CONFIG_TAGS: '/global-config/tags',
7374
GLOBAL_CONFIG_PLUGINS: '/global-config/plugins',

src/css/base.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2204,10 +2204,18 @@ button.anchor {
22042204
max-width: 500px;
22052205
}
22062206

2207+
.dc__mxw-600 {
2208+
max-width: 600px;
2209+
}
2210+
22072211
.dc__mxw-800 {
22082212
max-width: 800px;
22092213
}
22102214

2215+
.dc__mxw-960 {
2216+
max-width: 960px;
2217+
}
2218+
22112219
.dc__mxw-1000 {
22122220
max-width: 1000px;
22132221
}

0 commit comments

Comments
 (0)