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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba2973
fix(labels): fix broken label file parsing in archive upload modal (#…
tthvo Aug 13, 2024
5280b2c
merge conflict
andrewazores Aug 13, 2024
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
8 changes: 4 additions & 4 deletions src/app/RecordingMetadata/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ export const parseLabelsFromFile = (file: File): Observable<KeyValue[]> => {
.then((obj) => {
const labels: KeyValue[] = [];
const labelObj = obj['labels'];
if (labelObj) {
Object.keys(labelObj).forEach((key) => {
if (labelObj && Array.isArray(labelObj)) {
Object.values(labelObj).forEach((keyValue) => {
labels.push({
key: key,
value: labelObj[key],
key: keyValue.key,
value: keyValue.value,
});
});
return labels;
Expand Down
15 changes: 6 additions & 9 deletions src/test/RecordingMetadata/RecordingLabelFields.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,18 @@ import * as tlr from '@testing-library/react';
import { cleanup, screen } from '@testing-library/react';
import { render, renderSnapshot } from '../utils';

const mockUploadedRecordingLabels = {
someUploaded: 'someUploadedValue',
const mockUploadedRecordingLabels: KeyValue = {
key: 'someUploaded',
value: 'someUploadedValue',
};
const mockMetadataFileName = 'mock.metadata.json';
const mockMetadataFile = new File(
[JSON.stringify({ labels: { ...mockUploadedRecordingLabels } })],
[JSON.stringify({ labels: [{ ...mockUploadedRecordingLabels }] })],
mockMetadataFileName,
{ type: 'json' },
);
mockMetadataFile.text = jest.fn(
() => new Promise((resolve, _) => resolve(JSON.stringify({ labels: { ...mockUploadedRecordingLabels } }))),
() => new Promise((resolve, _) => resolve(JSON.stringify({ labels: [{ ...mockUploadedRecordingLabels }] }))),
);

describe('<RecordingLabelFields />', () => {
Expand Down Expand Up @@ -387,10 +388,6 @@ describe('<RecordingLabelFields />', () => {
expect(labelUploadInput.files?.item(0)).toStrictEqual(mockMetadataFile);

expect(mockProps.setLabels).toHaveBeenCalledTimes(1);
expect(mockProps.setLabels).toHaveBeenCalledWith([
mockLabel1,
mockLabel2,
{ key: 'someUploaded', value: 'someUploadedValue' },
]);
expect(mockProps.setLabels).toHaveBeenCalledWith([mockLabel1, mockLabel2, mockUploadedRecordingLabels]);
});
});
16 changes: 6 additions & 10 deletions src/test/Recordings/ArchivedRecordingsTable.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ const mockUploadsTarget = {
labels: [],
annotations: { cryostat: [], platform: [] },
};
const mockRecordingLabels = [
const mockRecordingLabels: KeyValue[] = [
{
key: 'someLabel',
value: 'someValue',
},
];
const mockUploadedRecordingLabels = [
const mockUploadedRecordingLabels: KeyValue[] = [
{
key: 'someUploaded',
value: 'someUpdatedValue',
Expand All @@ -71,14 +71,10 @@ export const convertLabels = (kv: KeyValue[]): object => {
return out;
};
const mockMetadataFileName = 'mock.metadata.json';
const mockMetadataFile = new File(
[JSON.stringify({ labels: convertLabels(mockUploadedRecordingLabels) })],
mockMetadataFileName,
{ type: 'json' },
);
mockMetadataFile.text = jest.fn(() =>
Promise.resolve(JSON.stringify({ labels: convertLabels(mockUploadedRecordingLabels) })),
);
const mockMetadataFile = new File([JSON.stringify({ labels: mockUploadedRecordingLabels })], mockMetadataFileName, {
type: 'json',
});
mockMetadataFile.text = jest.fn(() => Promise.resolve(JSON.stringify({ labels: mockUploadedRecordingLabels })));

const mockRecording: ArchivedRecording = {
name: 'someRecording',
Expand Down
Loading