Merge branch 'fix/unhandled-fetch-errors' into 'master'

NikolayS · NikolayS · commit db42c6340a97 · 2022-02-12T20:40:16.000Z
fix: fetch failed on connection refused calls

See merge request postgres-ai/database-lab!459
diff --git a/ui/packages/ce/package.json b/ui/packages/ce/package.json
@@ -52,5 +52,5 @@
     "stylelint-config-standard-scss": "^2.0.1",
     "stylelint-prettier": "^2.0.0"
   },
-  "proxy": "https://sss.aws.postgres.ai"
+  "proxy": "https://nik-tf-test.aws.postgres.ai:446/api"
 }
diff --git a/ui/packages/shared/helpers/request.ts b/ui/packages/shared/helpers/request.ts
@@ -19,25 +19,29 @@ const serializeParams = (params: RequestParams | null) => {
   return searchParams.toString()
 }
 
-const createUrl = (
-  path: string,
-  params: RequestParams | null,
-) => {
+const createUrl = (path: string, params: RequestParams | null) => {
   const serializedParams = serializeParams(params)
   const queryString = serializedParams ? `?${serializedParams}` : ''
   return `${path}${queryString}`
 }
 
-export const request = (path: string, options?: RequestOptions) => {
+export const request = async (path: string, options?: RequestOptions) => {
   const { params = null, ...requestInit } = options ?? {}
 
   const url = createUrl(path, params)
 
-  return window.fetch(url, {
-    ...requestInit,
-    headers: {
-      'Content-Type': 'application/json',
-      ...requestInit?.headers,
-    },
-  })
+  try {
+    return await window.fetch(url, {
+      ...requestInit,
+      headers: {
+        'Content-Type': 'application/json',
+        ...requestInit?.headers,
+      },
+    })
+  } catch (e) {
+    return new Response(null, {
+      status: 500,
+      statusText: `Unknown error`,
+    })
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,5 @@`
`52`	`52`	`"stylelint-config-standard-scss": "^2.0.1",`
`53`	`53`	`"stylelint-prettier": "^2.0.0"`
`54`	`54`	`},`
`55`		`- "proxy": "https://sss.aws.postgres.ai"`
	`55`	`+ "proxy": "https://nik-tf-test.aws.postgres.ai:446/api"`
`56`	`56`	`}`