@@ -17,14 +17,7 @@ import {
1717 sortByTitle ,
1818} from '@shared/data' ;
1919import { setCurrentIssues } from '@shared/refStability' ;
20- import {
21- fetchIssue ,
22- fetchIssueList ,
23- updateIssue ,
24- updateUser as serverUpdateUser ,
25- createIssue ,
26- deleteIssue ,
27- } from '@shared/server' ;
20+ import { IssueResource , UserResource } from '@shared/resources' ;
2821import type { Issue } from '@shared/types' ;
2922import React , {
3023 useCallback ,
@@ -45,7 +38,7 @@ function SortedListView({
4538} ) {
4639 const [ issues , setIssues ] = useState < Issue [ ] | null > ( null ) ;
4740 useEffect ( ( ) => {
48- fetchIssueList ( ) . then ( setIssues ) ;
41+ IssueResource . getList ( ) . then ( setIssues ) ;
4942 } , [ refetchKey ] ) ;
5043 const sorted = useMemo ( ( ) => ( issues ? sortByTitle ( issues ) : [ ] ) , [ issues ] ) ;
5144 if ( ! sorted . length ) return null ;
@@ -65,7 +58,7 @@ function DetailView({
6558} ) {
6659 const [ issue , setIssue ] = useState < Issue | null > ( null ) ;
6760 useEffect ( ( ) => {
68- fetchIssue ( { number } ) . then ( setIssue ) ;
61+ IssueResource . get ( { number } ) . then ( setIssue ) ;
6962 } , [ number , refetchKey ] ) ;
7063 if ( ! issue ) return null ;
7164 return (
@@ -84,7 +77,7 @@ function PinnedCard({
8477} ) {
8578 const [ issue , setIssue ] = useState < Issue | null > ( null ) ;
8679 useEffect ( ( ) => {
87- fetchIssue ( { number } ) . then ( setIssue ) ;
80+ IssueResource . get ( { number } ) . then ( setIssue ) ;
8881 } , [ number , refetchKey ] ) ;
8982 if ( ! issue ) return null ;
9083 return < PinnedCardView issue = { issue } /> ;
@@ -117,7 +110,7 @@ function ListView({
117110} ) {
118111 const [ issues , setIssues ] = useState < Issue [ ] | null > ( null ) ;
119112 useEffect ( ( ) => {
120- fetchIssueList ( { count } ) . then ( setIssues ) ;
113+ IssueResource . getList ( { count } ) . then ( setIssues ) ;
121114 } , [ count , refetchKey ] ) ;
122115 if ( ! issues ) return null ;
123116 setCurrentIssues ( issues ) ;
@@ -137,7 +130,7 @@ function StateListView({
137130} ) {
138131 const [ issues , setIssues ] = useState < Issue [ ] | null > ( null ) ;
139132 useEffect ( ( ) => {
140- fetchIssueList ( { state, count } ) . then ( setIssues ) ;
133+ IssueResource . getList ( { state, count } ) . then ( setIssues ) ;
141134 } , [ state , count , refetchKey ] ) ;
142135 if ( ! issues ) return null ;
143136 return (
@@ -198,10 +191,10 @@ function BenchmarkHarness() {
198191 if ( ! issue ) return ;
199192 const v = ++ mutationCounter ;
200193 measureUpdate ( ( ) =>
201- updateIssue ( {
202- number,
203- title : `${ issue . title } (v${ v } )` ,
204- } ) . then ( triggerRefetch ) ,
194+ IssueResource . update (
195+ { number } ,
196+ { title : `${ issue . title } (v${ v } )` } ,
197+ ) . then ( triggerRefetch ) ,
205198 ) ;
206199 } ,
207200 [ measureUpdate , triggerRefetch ] ,
@@ -213,10 +206,9 @@ function BenchmarkHarness() {
213206 if ( ! user ) return ;
214207 const v = ++ mutationCounter ;
215208 measureUpdate ( ( ) =>
216- serverUpdateUser ( {
217- login,
218- name : `${ user . name } (v${ v } )` ,
219- } ) . then ( triggerRefetch ) ,
209+ UserResource . update ( { login } , { name : `${ user . name } (v${ v } )` } ) . then (
210+ triggerRefetch ,
211+ ) ,
220212 ) ;
221213 } ,
222214 [ measureUpdate , triggerRefetch ] ,
@@ -225,13 +217,15 @@ function BenchmarkHarness() {
225217 const unshiftItem = useCallback ( ( ) => {
226218 const user = FIXTURE_USERS [ 0 ] ;
227219 measureUpdate ( ( ) =>
228- createIssue ( { title : 'New Issue' , user } ) . then ( triggerRefetch ) ,
220+ IssueResource . create ( { title : 'New Issue' , user } ) . then ( triggerRefetch ) ,
229221 ) ;
230222 } , [ measureUpdate , triggerRefetch ] ) ;
231223
232224 const deleteEntity = useCallback (
233225 ( number : number ) => {
234- measureUpdate ( ( ) => deleteIssue ( { number } ) . then ( triggerRefetch ) ) ;
226+ measureUpdate ( ( ) =>
227+ IssueResource . delete ( { number } ) . then ( triggerRefetch ) ,
228+ ) ;
235229 } ,
236230 [ measureUpdate , triggerRefetch ] ,
237231 ) ;
@@ -243,7 +237,10 @@ function BenchmarkHarness() {
243237 const targetState = moveStateRef . current ;
244238 moveStateRef . current = targetState === 'closed' ? 'open' : 'closed' ;
245239 measureUpdate (
246- ( ) => updateIssue ( { number, state : targetState } ) . then ( triggerRefetch ) ,
240+ ( ) =>
241+ IssueResource . update ( { number } , { state : targetState } ) . then (
242+ triggerRefetch ,
243+ ) ,
247244 ( ) => moveItemIsReady ( containerRef , number , targetState ) ,
248245 ) ;
249246 } ,
@@ -257,7 +254,10 @@ function BenchmarkHarness() {
257254 const v = ++ mutationCounter ;
258255 const expected = `${ issue . title } (v${ v } )` ;
259256 measureUpdate (
260- ( ) => updateIssue ( { number, title : expected } ) . then ( triggerRefetch ) ,
257+ ( ) =>
258+ IssueResource . update ( { number } , { title : expected } ) . then (
259+ triggerRefetch ,
260+ ) ,
261261 ( ) => {
262262 const container = containerRef . current ! ;
263263 const listTitle = container . querySelector (
0 commit comments