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:mirador_crash #3927

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

fix:mirador_crash #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3f2a803
fix:mirador_crash
Jul 30, 2024
f5d8cf2
add tests for empty fetched manifest
Aug 5, 2024
23c6285
chore: resolve mr conflicts
Dec 19, 2024
b3c5812
test: add new test createManifestoInstance with Collection
Dec 19, 2024
22c713b
test: use collection fixture
Dec 19, 2024
13c7a4a
chore: sort import
Dec 19, 2024
c095751
Merge branch 'master' into bug_viewer_crash
Jan 16, 2025
5595b44
Merge branch 'main' into bug_viewer_crash
lutzhelm Jan 28, 2025
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
13 changes: 12 additions & 1 deletion __tests__/src/components/ManifestListItem.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from '@tests/utils/test-utils';
import userEvent from '@testing-library/user-event';

import { getManifestoInstance } from '../../../src/state/selectors';
import { ManifestListItem } from '../../../src/components/ManifestListItem';

/** */
Expand Down Expand Up @@ -46,6 +46,17 @@ describe('ManifestListItem', () => {
expect(screen.getByText('The resource cannot be added:')).toBeInTheDocument();
expect(screen.getByText('http://example.com')).toBeInTheDocument();
});

it('renders an error message when fetched manifest is empty', () => {
const state = { manifests: { x: { json: {} } } };
const manifesto = getManifestoInstance(state, { manifestId: 'x' });

createWrapper({ error: !manifesto });

expect(screen.getByText('The resource cannot be added:')).toBeInTheDocument();
expect(screen.getByText('http://example.com')).toBeInTheDocument();
});

it('updates and adds window when button clicked', async () => {
const user = userEvent.setup();
const addWindow = vi.fn();
Expand Down
3 changes: 3 additions & 0 deletions __tests__/src/selectors/manifests.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { Utils } from 'manifesto.js';

import collection from '../../fixtures/version-2/collection.json';
import manifestFixture001 from '../../fixtures/version-2/001.json';
import manifestFixture002 from '../../fixtures/version-2/002.json';
import manifestFixture019 from '../../fixtures/version-2/019.json';
Expand All @@ -7,6 +9,7 @@ import manifestFixturev3001 from '../../fixtures/version-3/001.json';
import manifestFixtureWithAProvider from '../../fixtures/version-3/with_a_provider.json';
import manifestFixtureFg165hz3589 from '../../fixtures/version-2/fg165hz3589.json';
import manifestFixtureRelated from '../../fixtures/version-2/related.json';

import {
getManifestoInstance,
getManifestLocale,
Expand Down
2 changes: 1 addition & 1 deletion src/containers/ManifestListItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const mapStateToProps = (state, { manifestId, provider }) => {
: getCanvases(state, { manifestId }).length;
return {
active: getWindowManifests(state).includes(manifestId),
error: manifest.error,
error: manifest.error || !manifesto,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should have noticed this earlier: This change results in a list of errors in the catalog list for every manifest that is configured in the catalog settings but not in windows. While you can "Try again" successfully, this should be fixed. It's probably sufficient to change this line to

    error: manifest.error || (!manifesto && !!manifest.json),

Manifests that have not been used in windows before don't have a manifesto instance up until this point, and at the moment the component is initially rendered, isFetching is not yet true, so the same check that is used for ready should be used here additionally.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm also thinking about how to test this automatically, no efficient idea yet, but I think it's not necessary for the scope of that PR.

isCollection,
isFetching: manifest.isFetching,
isMultipart: isCollection
Expand Down
11 changes: 7 additions & 4 deletions src/state/selectors/manifests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@
if (!json) return undefined;
// Use structuredClone to create a deep copy and prevent Manifesto from mutating the json
const manifestoObject = Utils.parseManifest(structuredClone(json), locale ? { locale } : undefined);
// Local patching of Manifesto so that when its a Collection, it behaves similarly
if (typeof manifestoObject.getSequences != 'function') {
manifestoObject.getSequences = () => [];
if (manifestoObject) {
// Local patching of Manifesto so that when its a Collection, it behaves similarly
if (typeof manifestoObject.getSequences != 'function') {
manifestoObject.getSequences = () => [];
}

Check warning on line 18 in src/state/selectors/manifests.js

View check run for this annotation

Codecov / codecov/patch

src/state/selectors/manifests.js#L17-L18 

Added lines #L17 - L18 were not covered by tests
return manifestoObject;
}
return manifestoObject;
return undefined;
}

/** */
Expand Down