Skip to content

Commit 3cb534b

Browse files
authored
Merge pull request #1597 from devtron-labs/pull-image-digest
feat: Global Config Pull image digest integration
2 parents 2006e9a + d3b8154 commit 3cb534b

File tree

2 files changed

+28
-8
lines changed

2 files changed

+28
-8
lines changed

src/components/globalConfigurations/GlobalConfiguration.tsx

Lines changed: 27 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ const PluginsPolicy = importComponentFromFELibrary('PluginsPolicy')
4343
const FilterConditions = importComponentFromFELibrary('FilterConditions')
4444
const LockConfiguration = importComponentFromFELibrary('LockConfiguration')
4545
const CatalogFramework = importComponentFromFELibrary('CatalogFramework')
46+
const PullImageDigest = importComponentFromFELibrary('PullImageDigest')
4647

4748
export default function GlobalConfiguration(props) {
4849
const location = useLocation()
@@ -430,15 +431,17 @@ function NavItem({ serverMode }) {
430431
<div className="flexbox flex-justify">External Links</div>
431432
</NavLink>
432433

433-
{CatalogFramework && <NavLink
434-
to={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
435-
key={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
436-
activeClassName="active-route"
437-
>
438-
<div className="flexbox flex-justify">Catalog Framework</div>
439-
</NavLink>}
434+
{CatalogFramework && (
435+
<NavLink
436+
to={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
437+
key={URLS.GLOBAL_CONFIG_CATALOG_FRAMEWORK}
438+
activeClassName="active-route"
439+
>
440+
<div className="flexbox flex-justify">Catalog Framework</div>
441+
</NavLink>
442+
)}
440443

441-
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
444+
{serverMode !== SERVER_MODE.EA_ONLY && window._env_.ENABLE_SCOPED_VARIABLES && (
442445
<NavLink
443446
to={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
444447
key={URLS.GLOBAL_CONFIG_SCOPED_VARIABLES}
@@ -457,6 +460,17 @@ function NavItem({ serverMode }) {
457460
<div className="flexbox flex-justify">Plugins</div>
458461
</NavLink>
459462
)}
463+
464+
{PullImageDigest && (
465+
<NavLink
466+
to={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}
467+
key={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}
468+
activeClassName="active-route"
469+
>
470+
<div className="flexbox flex-justify">Pull Image Digest</div>
471+
</NavLink>
472+
)}
473+
460474
{TagListContainer && (
461475
<NavLink
462476
to={URLS.GLOBAL_CONFIG_TAGS}
@@ -617,6 +631,11 @@ function Body({ getHostURLConfig, checkList, serverMode, handleChecklistUpdate,
617631
<PluginsPolicy />
618632
</Route>
619633
)}
634+
{PullImageDigest && (
635+
<Route path={URLS.GLOBAL_CONFIG_PULL_IMAGE_DIGEST}>
636+
<PullImageDigest />
637+
</Route>
638+
)}
620639
{TagListContainer && (
621640
<Route path={URLS.GLOBAL_CONFIG_TAGS}>
622641
<TagListContainer />

src/config/routes.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ export const URLS = {
7070
GLOBAL_CONFIG_EXTERNAL_LINKS: '/global-config/external-links',
7171
GLOBAL_CONFIG_CATALOG_FRAMEWORK: '/global-config/catalog-framework',
7272
GLOBAL_CONFIG_SCOPED_VARIABLES: '/global-config/scoped-variables',
73+
GLOBAL_CONFIG_PULL_IMAGE_DIGEST: '/global-config/pull-image-digest',
7374
GLOBAL_CONFIG_TAGS: '/global-config/tags',
7475
GLOBAL_CONFIG_PLUGINS: '/global-config/plugins',
7576
GLOBAL_CONFIG_FILTER_CONDITION: '/global-config/filter-condition',

0 commit comments

Comments
 (0)