GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 05:21:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

FIX

Browse Source
This commit is contained in:
Norbert de Langen 2020-06-17 11:16:48 +02:00
parent f874e686d1
commit 9a7f598a4d
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/api/src/modules/refs.ts
View File

@ -15,9 +15,11 @@ export interface SubState {
type Versions = Record<string, string>; type Versions = Record<string, string>;
export type SetRefData = Omit<ComposedRef, 'stories'> & { export type SetRefData = Partial<
Omit<ComposedRef, 'stories'> & {
stories?: StoriesRaw; stories?: StoriesRaw;
}; }
>;
export interface SubAPI { export interface SubAPI {
findRef: (source: string) => ComposedRef; findRef: (source: string) => ComposedRef;
@ -48,12 +50,12 @@ export type RefUrl = string;
// eslint-disable-next-line no-useless-escape // eslint-disable-next-line no-useless-escape
const findFilename = /(\/((?:[^\/]+?)\.[^\/]+?)|\/)$/; const findFilename = /(\/((?:[^\/]+?)\.[^\/]+?)|\/)$/;
const allSettled = (promises: Promise<any>[]) => const allSettled = (promises: Promise<Response>[]): Promise<(Response | false)[]> =>
Promise.all( Promise.all(
promises.map((promise, i) => promises.map((promise) =>
promise.then( promise.then(
(r) => (r.ok ? r : false), (r) => (r.ok ? r : (false as const)),
() => false () => false as const
) )
) )
); );
@ -123,7 +125,7 @@ export const init: ModuleFn = ({ store, provider, fullAPI }) => {
checkRef: async (ref) => { checkRef: async (ref) => {
const { id, url } = ref; const { id, url } = ref;
const loadedData: { error?: Error; stories?: StoriesRaw } = {}; const loadedData: { error?: Error; stories?: StoriesRaw; loginUrl?: string } = {};
const [included, omitted, iframe] = await allSettled([ const [included, omitted, iframe] = await allSettled([
fetch(`${url}/stories.json`, { fetch(`${url}/stories.json`, {
@ -144,7 +146,7 @@ export const init: ModuleFn = ({ store, provider, fullAPI }) => {
}), }),
]); ]);
const handle = async (request: Promise<Response> | false) => { const handle = async (request: Response | false): Promise<SetRefData> => {
if (request) { if (request) {
return Promise.resolve(request) return Promise.resolve(request)
.then((response) => (response.ok ? response.json() : {})) .then((response) => (response.ok ? response.json() : {}))
@ -168,10 +170,11 @@ export const init: ModuleFn = ({ store, provider, fullAPI }) => {
`, `,
} as Error; } as Error;
} else if (omitted || included) { } else if (omitted || included) {
const credentials = !omitted ? 'include' : 'omit'; const credentials = included ? 'include' : 'omit';
const [stories, metadata] = await Promise.all([ const [stories, storiesWithAuth, metadata] = await Promise.all([
handle(omitted || included), handle(omitted),
handle(included),
handle( handle(
fetch(`${url}/metadata.json`, { fetch(`${url}/metadata.json`, {
headers: { headers: {
@ -180,10 +183,14 @@ export const init: ModuleFn = ({ store, provider, fullAPI }) => {
credentials, credentials,
cache: 'no-cache', cache: 'no-cache',
}) })
), ).then((r: SetRefData) => (r?.error?.message === 'Failed to fetch' ? {} : r)),
]); ]);
Object.assign(loadedData, { ...stories, ...metadata }); Object.assign(loadedData, { ...stories, ...storiesWithAuth, ...metadata });
if (storiesWithAuth && !storiesWithAuth.loginUrl) {
delete loadedData.loginUrl;
}
} }
api.setRef(id, { api.setRef(id, {

2
lib/api/src/version.ts
View File

@ -1 +1 @@
export const version = '6.0.0-beta.29'; export const version = '6.0.0-beta.30';

2
lib/ui/src/components/sidebar/Refs.tsx
View File

@ -77,7 +77,7 @@ export const Ref: FunctionComponent<RefType & RefProps> = (ref) => {
const isLoading = isLoadingMain || isLoadingInjected || ref.type === 'unknown'; const isLoading = isLoadingMain || isLoadingInjected || ref.type === 'unknown';
const isError = !!error; const isError = !!error;
const isEmpty = !isLoading && length === 0; const isEmpty = !isLoading && length === 0;
const isAuthRequired = !!loginUrl; const isAuthRequired = !!loginUrl && length === 0;
const state = getStateType(isLoading, isAuthRequired, isError, isEmpty); const state = getStateType(isLoading, isAuthRequired, isError, isEmpty);