Commitd2c1562

authored

chore: cleanup some query handling (#15130)

1 parentaaa1223 commitd2c1562Copy full SHA for d2c1562

File tree

+22

-23

lines changed

+22

-23

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,15 +104,17 @@ function withQuery(Story, { parameters }) {`
`104`	`104`
`105`	`105`	`if(parameters.queries){`
`106`	`106`	`for(constqueryofparameters.queries){`
`107`		`-if(query.datainstanceofError){`
`108`		`-//This is copied fromsetQueryData() butsetsthe error.`
	`107`	`+if(query.isError){`
	`108`	+//Based on `setQueryData`, butmodified to setthe result as an error.
`109`	`109`	`constcache=queryClient.getQueryCache();`
`110`	`110`	`constparsedOptions=parseQueryArgs(query.key);`
`111`	`111`	`constdefaultedOptions=queryClient.defaultQueryOptions(parsedOptions);`
	`112`	`+// Adds an uninitialized response to the cache, which we can now mutate.`
`112`	`113`	`constcachedQuery=cache.build(queryClient,defaultedOptions);`
`113`		`-//Setmanual data so react-query will not try to refetch.`
	`114`	+//Setting `manual` prevents retries.
`114`	`115`	`cachedQuery.setData(undefined,{manual:true});`
`115`		`-cachedQuery.setState({error:query.data});`
	`116`	+// Set the `error` value and the appropriate status.
	`117`	`+cachedQuery.setState({error:query.data,status:"error"});`
`116`	`118`	`}else{`
`117`	`119`	`queryClient.setQueryData(query.key,query.data);`
`118`	`120`	`}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ declare module "@storybook/react" {`
`19`	`19`	`experiments?:Experiments;`
`20`	`20`	`showOrganizations?:boolean;`
`21`	`21`	`organizations?:Organization[];`
`22`		`-queries?:{key:QueryKey;data:unknown}[];`
	`22`	`+queries?:{key:QueryKey;data:unknown;isError?:boolean}[];`
`23`	`23`	`webSocket?:WebSocketEvent[];`
`24`	`24`	`user?:User;`
`25`	`25`	`permissions?:Partial<Permissions>;`

Lines changed: 10 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,27 +65,21 @@ export const systemNotificationTemplates = () => {`
`65`	`65`	`exportfunctionselectTemplatesByGroup(`
`66`	`66`	`data:NotificationTemplate[],`
`67`	`67`	`):Record<string,NotificationTemplate[]>{`
`68`		`-constgrouped=data.reduce(`
`69`		`-(acc,tpl)=>{`
`70`		`-if(!acc[tpl.group]){`
`71`		`-acc[tpl.group]=[];`
`72`		`-}`
`73`		`-acc[tpl.group].push(tpl);`
`74`		`-returnacc;`
`75`		`-},`
`76`		`-{}asRecord<string,NotificationTemplate[]>,`
`77`		`-);`
`78`		`-`
`79`		`-// Sort templates within each group`
`80`		`-for(constgroupingrouped){`
`81`		`-grouped[group].sort((a,b)=>a.name.localeCompare(b.name));`
	`68`	`+constgrouped:Record<string,NotificationTemplate[]>={};`
	`69`	`+for(consttemplateofdata){`
	`70`	`+if(!grouped[template.group]){`
	`71`	`+grouped[template.group]=[];`
	`72`	`+}`
	`73`	`+grouped[template.group].push(template);`
`82`	`74`	`}`
`83`	`75`
`84`		`-// Sort groups by name`
	`76`	`+// Sort groups by name, and sort templates within each group`
`85`	`77`	`constsortedGroups=Object.keys(grouped).sort((a,b)=>a.localeCompare(b));`
`86`	`78`	`constsortedGrouped:Record<string,NotificationTemplate[]>={};`
`87`	`79`	`for(constgroupofsortedGroups){`
`88`		`-sortedGrouped[group]=grouped[group];`
	`80`	`+sortedGrouped[group]=grouped[group].sort((a,b)=>`
	`81`	`+a.name.localeCompare(b.name),`
	`82`	`+);`
`89`	`83`	`}`
`90`	`84`
`91`	`85`	`returnsortedGrouped;`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,10 @@ export const LoadingGroup: Story = {`
`53`	`53`
`54`	`54`	`exportconstGroupError:Story={`
`55`	`55`	`parameters:{`
`56`		`-queries:[groupQuery(newError("test group error")),permissionsQuery({})],`
	`56`	`+queries:[`
	`57`	`+{ ...groupQuery(newError("test group error")),isError:true},`
	`58`	`+permissionsQuery({}),`
	`59`	`+],`
`57`	`60`	`},`
`58`	`61`	`};`
`59`	`62`
`@@ -90,7 +93,7 @@ export const MembersError: Story = {`
`90`	`93`	`queries:[`
`91`	`94`	`groupQuery(MockGroup),`
`92`	`95`	`permissionsQuery({canUpdateGroup:true}),`
`93`		`-membersQuery(newError("test members error")),`
	`96`	`+{ ...membersQuery(newError("test members error")),isError:true},`
`94`	`97`	`],`
`95`	`98`	`},`
`96`	`99`	`play:async({ canvasElement})=>{`

Comments

(0)