feat: Polish off UI changes for OCI support (#21685) #22410
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
❌ Preview Environment deleted from BunnyshellAvailable commands (reply to this comment):
|
|
@keithchong can you fix the conflict? |
Signed-off-by: Keith Chong <kykchong@redhat.com>
f3bf703 to
c0b29a0
Compare
Signed-off-by: Keith Chong <kykchong@redhat.com>
|
@blakepettersson , I've updated this PR. |
Signed-off-by: Keith Chong <kykchong@redhat.com>
Signed-off-by: Keith Chong <kykchong@redhat.com>
|
Hi @agaudreault , could we get this in for 3.1? Release 3.1, since the main OCI feature PR was merged there. |
agaudreault
approved these changes
Jun 16, 2025
| message += ' (' + revision.substring(0, 14) + ')'; | ||
| } else { | ||
| message += ' (' + revision.substring(0, 7) + ')'; | ||
| } |
There was a problem hiding this comment.
The whole block can be simplified as (untested pseudo-code):
let revAbbrvLen = 7;
// Show "sha256: " plus the first 7 actual characters of the digest.
if (source.repoURL.startsWith('oci://') && revision.startsWith('sha256:')) {
revAbbrvLen = 14;
}
message += ' (' + revision.substring(0, 7) + ')';| @@ -12,7 +12,7 @@ export const Revision = ({repoUrl, revision, path, isForPath, children}: {repoUr | |||
| if (url !== null && hasPath) { | |||
| url += '/' + path; | |||
| } | |||
| const content = children || (isSHA(revision) ? revision.substr(0, 7) : revision); | |||
| const content = children || (isSHA(revision) ? (revision.startsWith('sha256:') ? revision.substr(0, 14) : revision.substr(0, 7)) : revision); | |||
There was a problem hiding this comment.
Similarly, as above:
const content = children || (isSHA(revision) ? (revision.substr(0, revision.startsWith('sha256:') ? 14 : 7 ) : revision);
enneitex
pushed a commit
to enneitex/argo-cd
that referenced
this pull request
Aug 24, 2025
…j#22410) Signed-off-by: Keith Chong <kykchong@redhat.com> Signed-off-by: enneitex <etienne.divet@gmail.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE UNTIL OCI Beta PR is merged (There are merge conflicts)
Fixes part of #21685
Checklist: