Skip to content

Composition: Fix refs not loading when there's multiple #26356

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

Merged
ndelangen merged 7 commits into from
Mar 8, 2024
Merged

Composition: Fix refs not loading when there's multiple #26356

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3fa8c5
load refs in sequence, await writing to state
ndelangen Mar 6, 2024
b045da1
rename & fix test
ndelangen Mar 6, 2024
414193b
improve understandability of the test
ndelangen Mar 6, 2024
9a1c77c
make `changeRefVersion` async as well, and correct the types
ndelangen Mar 7, 2024
2f5cfe7
Update code/lib/manager-api/src/modules/refs.ts
ndelangen Mar 8, 2024
15fa09b
make stylistic code change
ndelangen Mar 8, 2024
4e723fe
Merge branch 'next' into norbert/fix-composition-loading-problem
ndelangen Mar 8, 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
15 changes: 8 additions & 7 deletions code/lib/manager-api/src/modules/refs.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ export const init: ModuleFn<SubAPI, SubState> = (
return refs;
},

setRef: (id, { storyIndex, setStoriesData, ...rest }, ready = false) => {
setRef: async (id, { storyIndex, setStoriesData, ...rest }, ready = false) => {
if (singleStory) {
return;
}
Expand Down Expand Up @@ -307,10 +307,10 @@ export const init: ModuleFn<SubAPI, SubState> = (
index = addRefIds(index, ref);
}

api.updateRef(id, { ...ref, ...rest, index, internal_index });
await api.updateRef(id, { ...ref, ...rest, index, internal_index });
},

updateRef: (id, data) => {
updateRef: async (id, data) => {
const { [id]: ref, ...updated } = api.getRefs();

updated[id] = { ...ref, ...data };
Expand All @@ -320,7 +320,7 @@ export const init: ModuleFn<SubAPI, SubState> = (
return obj;
}, {});

store.setState({
await store.setState({
refs: ordered,
});
},
Expand All @@ -331,9 +331,10 @@ export const init: ModuleFn<SubAPI, SubState> = (
const initialState: SubState['refs'] = refs;

if (runCheck) {
Object.entries(refs).forEach(([id, ref]) => {
api.checkRef({ ...ref!, stories: {} } as API_SetRefData);
});
Object.entries(refs).reduce(async (acc, [id, ref]) => {
await acc;
await api.checkRef({ ...ref!, stories: {} } as API_SetRefData);
}, Promise.resolve());
Comment thread
ndelangen marked this conversation as resolved.
Outdated
}

return {
Expand Down
6 changes: 6 additions & 0 deletions code/lib/manager-api/src/tests/refs.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,9 @@ describe('Refs API', () => {
// given
initRefs({ provider, store } as any);

// the `runCheck` is async, so we need to wait for it to finish
await Promise.resolve();
Comment thread
ndelangen marked this conversation as resolved.
Outdated

expect(fetchMock.mock.calls).toMatchInlineSnapshot(`
[
[
Expand Down Expand Up @@ -207,6 +210,9 @@ describe('Refs API', () => {
};
initRefs({ provider, store } as any);

// the `runCheck` is async, so we need to wait for it to finish
await Promise.resolve();

expect(fetchMock.mock.calls).toMatchInlineSnapshot(`
[
[
Expand Down