Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { DEFAULT_DATE_TIME_FORMAT } from '@ar/constants'
import type { VersionDetailsPathParams } from '@ar/routes/types'
import { getReadableDateTime } from '@ar/common/dateUtils'
import PageContent from '@ar/components/PageContent/PageContent'
import { useAppStore, useDecodedParams, useGetSpaceRef } from '@ar/hooks'
import { useAppStore, useDecodedParams, useGetSpaceRef, useParentHooks } from '@ar/hooks'

import useGetOCIVersionParams from '../hooks/useGetOCIVersionParams'
import { VersionOverviewCard } from '../components/OverviewCards/types'
Expand All @@ -41,6 +41,8 @@ export default function DockerVersionOverviewContent(): JSX.Element {
const pathParams = useDecodedParams<VersionDetailsPathParams>()
const spaceRef = useGetSpaceRef()
const { parent } = useAppStore()
const { useQueryParams } = useParentHooks()
const { tag } = useQueryParams<{ tag?: string }>()

const { versionIdentifier, versionType, digest } = useGetOCIVersionParams()

Expand Down Expand Up @@ -79,6 +81,7 @@ export default function DockerVersionOverviewContent(): JSX.Element {
VersionOverviewCard.SUPPLY_CHAIN
]}
digest={digest}
tag={tag}
version={versionIdentifier}
versionType={versionType}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,14 @@ interface RedirectToTabOptions {

interface VersionOverviewCardsProps {
digest?: string
tag?: string
version: string
versionType: OCIVersionType
cards?: Array<VersionOverviewCard>
}

export default function VersionOverviewCards(props: VersionOverviewCardsProps) {
const { digest = '', cards = [], version, versionType } = props
const { digest = '', tag, cards = [], version, versionType } = props
const { getString } = useStrings()
const routes = useRoutes()
const { scope, isCurrentSessionPublic } = useAppStore()
Expand Down Expand Up @@ -90,9 +91,16 @@ export default function VersionOverviewCards(props: VersionOverviewCardsProps) {
versionTab: tab,
...options
})
if (digest) {
url = `${url}?digest=${digest}`

// Build query params to preserve both tag and digest
const params = []
if (tag) params.push(`tag=${tag}`)
if (digest) params.push(`digest=${digest}`)

if (params.length > 0) {
url = `${url}?${params.join('&')}`
}

history.push(url)
}

Expand Down