From bb83d4eb8fffcb01d3945c6ef16ff83b1f2d2e55 Mon Sep 17 00:00:00 2001 From: silverwind Date: Mon, 11 Sep 2023 19:10:50 +0200 Subject: [PATCH 01/13] Use fetch helpers instead of fetch --- .eslintrc.yaml | 5 ++- web_src/js/components/DashboardRepoList.vue | 5 ++- web_src/js/components/DiffCommitSelector.vue | 3 +- .../js/components/RepoBranchTagSelector.vue | 4 +- web_src/js/features/common-global.js | 3 +- web_src/js/features/common-issue-list.js | 5 ++- web_src/js/features/comp/ImagePaste.js | 9 +---- web_src/js/features/comp/ReactionSelector.js | 14 ++----- web_src/js/features/copycontent.js | 3 +- web_src/js/features/install.js | 3 +- web_src/js/features/pull-view-file.js | 9 ++--- web_src/js/features/repo-diff-commit.js | 3 +- web_src/js/features/repo-issue-list.js | 14 ++----- web_src/js/features/repo-migrate.js | 9 ++--- web_src/js/features/user-auth-webauthn.js | 38 +++++++------------ web_src/js/modules/fetch.js | 3 +- 16 files changed, 52 insertions(+), 78 deletions(-) diff --git a/.eslintrc.yaml b/.eslintrc.yaml index 846823abc7744..c9ea481af4bff 100644 --- a/.eslintrc.yaml +++ b/.eslintrc.yaml @@ -46,6 +46,9 @@ overrides: - files: ["*.config.*"] rules: import/no-unused-modules: [0] + - files: ["web_src/js/modules/fetch.js", "web_src/js/standalone/**/*"] + rules: + no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression] rules: "@eslint-community/eslint-comments/disable-enable-pair": [2] @@ -420,7 +423,7 @@ rules: no-restricted-exports: [0] no-restricted-globals: [2, addEventListener, blur, close, closed, confirm, defaultStatus, defaultstatus, error, event, external, find, focus, frameElement, frames, history, innerHeight, innerWidth, isFinite, isNaN, length, location, locationbar, menubar, moveBy, moveTo, name, onblur, onerror, onfocus, onload, onresize, onunload, open, opener, opera, outerHeight, outerWidth, pageXOffset, pageYOffset, parent, print, removeEventListener, resizeBy, resizeTo, screen, screenLeft, screenTop, screenX, screenY, scroll, scrollbars, scrollBy, scrollTo, scrollX, scrollY, self, status, statusbar, stop, toolbar, top, __dirname, __filename] no-restricted-imports: [0] - no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression] + no-restricted-syntax: [2, WithStatement, ForInStatement, LabeledStatement, SequenceExpression, {selector: "CallExpression[callee.name='fetch']", message: "use modules/fetch.js instead"}] no-return-assign: [0] no-script-url: [2] no-self-assign: [2, {props: true}] diff --git a/web_src/js/components/DashboardRepoList.vue b/web_src/js/components/DashboardRepoList.vue index 5b8075f07a067..5ff51168cbd9f 100644 --- a/web_src/js/components/DashboardRepoList.vue +++ b/web_src/js/components/DashboardRepoList.vue @@ -2,6 +2,7 @@ import {createApp, nextTick} from 'vue'; import $ from 'jquery'; import {SvgIcon} from '../svg.js'; +import {GET} from '../modules/fetch.js'; const {appSubUrl, assetUrlPrefix, pageData} = window.config; @@ -233,11 +234,11 @@ const sfc = { try { if (!this.reposTotalCount) { const totalCountSearchURL = `${this.subUrl}/repo/search?count_only=1&uid=${this.uid}&team_id=${this.teamId}&q=&page=1&mode=`; - response = await fetch(totalCountSearchURL); + response = await GET(totalCountSearchURL); this.reposTotalCount = response.headers.get('X-Total-Count'); } - response = await fetch(searchedURL); + response = await GET(searchedURL); json = await response.json(); } catch { if (searchedURL === this.searchURL) { diff --git a/web_src/js/components/DiffCommitSelector.vue b/web_src/js/components/DiffCommitSelector.vue index 48dc9d72ff4af..3f7100d201db4 100644 --- a/web_src/js/components/DiffCommitSelector.vue +++ b/web_src/js/components/DiffCommitSelector.vue @@ -1,5 +1,6 @@