From 51b3fb45458a86b74c86dc3b04d9e398379260ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Mar 2022 22:14:59 +0000 Subject: [PATCH 1/3] Bump swr from 1.0.1 to 1.2.2 Bumps [swr](https://github.com/vercel/swr) from 1.0.1 to 1.2.2. - [Release notes](https://github.com/vercel/swr/releases) - [Commits](https://github.com/vercel/swr/compare/1.0.1...1.2.2) --- updated-dependencies: - dependency-name: swr dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- yarn.lock | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/yarn.lock b/yarn.lock index 008d819c3..246749a54 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8070,11 +8070,6 @@ deprecation@^2.0.0, deprecation@^2.3.1: resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919" integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ== -dequal@2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d" - integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug== - destroy@~1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" @@ -16253,11 +16248,9 @@ swap-case@^2.0.2: tslib "^2.0.3" swr@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/swr/-/swr-1.0.1.tgz#15f62846b87ee000e52fa07812bb65eb62d79483" - integrity sha512-EPQAxSjoD4IaM49rpRHK0q+/NzcwoT8c0/Ylu/u3/6mFj/CWnQVjNJ0MV2Iuw/U+EJSd2TX5czdAwKPYZIG0YA== - dependencies: - dequal "2.0.2" + version "1.2.2" + resolved "https://registry.yarnpkg.com/swr/-/swr-1.2.2.tgz#6cae09928d30593a7980d80f85823e57468fac5d" + integrity sha512-ky0BskS/V47GpW8d6RU7CPsr6J8cr7mQD6+do5eky3bM0IyJaoi3vO8UhvrzJaObuTlGhPl2szodeB2dUd76Xw== symbol-observable@^1.0.4, symbol-observable@^1.1.0: version "1.2.0" From 1557136e81563d75a33aaedb953ccd9d843b2d02 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 1 Mar 2022 14:26:42 -0800 Subject: [PATCH 2/3] Use the outer query value in gqlFetcher call The inner query value never changes, so no need to worry with type casting this here, it will always be a string. --- packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx index 1d5dbc0f8..de7c563e3 100644 --- a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx @@ -144,7 +144,7 @@ export function useGetLibraryItemsQuery({ : previousResult.articles.pageInfo.endCursor, ] }, - (query, _l, _s, _sq, cursor: string) => { + (_query, _l, _s, _sq, cursor: string) => { return gqlFetcher(query, { ...variables, after: cursor }, true) } ) From cd90d3a4026e62348b5db7cf9d0f8ca79bc03461 Mon Sep 17 00:00:00 2001 From: Jackson Harper Date: Tue, 1 Mar 2022 14:40:36 -0800 Subject: [PATCH 3/3] Add typing on the error filter query --- .../web/lib/networking/queries/useGetLibraryItemsQuery.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx index de7c563e3..9c0a00f71 100644 --- a/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx +++ b/packages/web/lib/networking/queries/useGetLibraryItemsQuery.tsx @@ -156,8 +156,8 @@ export function useGetLibraryItemsQuery({ // it will be nested in the data pages, if there is one error, // we invalidate the data and return the error. We also zero out // the response in the case of an error. - if (!error && data) { - const errors = data?.filter((d) => d.articles.errorCodes?.length > 0) + if (!error && responsePages) { + const errors = responsePages.filter((d) => d.articles.errorCodes && d.articles.errorCodes.length > 0) if (errors?.length > 0) { responseError = errors responsePages = undefined