Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(labels): fix broken label file parsing in archive upload modal (backport #1323) #1327

Merged
merged 2 commits into from
Aug 13, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 13, 2024

Welcome to Cryostat! 👋

Before contributing, make sure you have:

  • Read the contributing guidelines
  • Linked a relevant issue which this PR resolves
  • Linked any other relevant issues, PR's, or documentation, if any
  • Resolved all conflicts, if any
  • Rebased your branch PR on top of the latest upstream main branch
  • Attached at least one of the following labels to the PR: [chore, ci, docs, feat, fix, test]
  • Signed all commits using a GPG signature

To recreate commits with GPG signature git fetch upstream && git rebase --force --gpg-sign upstream/main


Fixes #1322

Description of the change:

Fixed the incorrect label parsing utility. The labels should be rendered correctly now.

Motivation for the change:

See #1322

image


This is an automatic backport of pull request #1323 done by [Mergify](https://mergify.com).

…1323)

Signed-off-by: Thuan Vo <thuan.votann@gmail.com>
(cherry picked from commit 73a7e9e)

# Conflicts:
#	src/app/RecordingMetadata/utils.ts
@mergify mergify bot added the conflicts label Aug 13, 2024
@mergify mergify bot assigned tthvo Aug 13, 2024
Copy link
Author

mergify bot commented Aug 13, 2024

Cherry-pick of 73a7e9e has failed:

On branch mergify/bp/cryostat-v3.0/pr-1323
Your branch is up to date with 'origin/cryostat-v3.0'.

You are currently cherry-picking commit 73a7e9e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/test/RecordingMetadata/RecordingLabelFields.test.tsx
	modified:   src/test/Recordings/ArchivedRecordingsTable.test.tsx

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/app/RecordingMetadata/utils.ts

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

1 similar comment
Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

Copy link

Hi @mergify[bot]! Add at least one of the required labels to this PR

Required labels are : chore,ci,cleanup,docs,feat,fix,perf,refactor,style,test

@andrewazores andrewazores merged commit f0f679b into cryostat-v3.0 Aug 13, 2024
23 of 24 checks passed
@mergify mergify bot deleted the mergify/bp/cryostat-v3.0/pr-1323 branch August 13, 2024 20:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants