Merge branch 'master' into FOLIO-3627-sw

folio-org · Oct 9, 2023 · edd7057 · edd7057
2 parents ce73fdc + f02c954
commit edd7057
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * Include `yarn.lock`. Refs STCOR-679.
 * *BREAKING* bump `react-intl` to `v6.4.4`. Refs STCOR-744.
 * Bump `stylelint` to `v15` and `stylelint-config-standard` to `v34`. Refs STCOR-745.
+* Read ky timeout from stripes-config value. Refs STCOR-594.
 * *BREAKING* use cookies and RTR instead of directly handling the JWT. Refs STCOR-671, FOLIO-3627.
 
 ## [9.0.0](https://github.com/folio-org/stripes-core/tree/v9.0.0) (2023-01-30)

diff --git a/src/useOkapiKy.js b/src/useOkapiKy.js
@@ -2,7 +2,8 @@ import ky from 'ky';
 import { useStripes } from './StripesContext';
 
 export default () => {
-  const { locale = 'en', tenant, url } = useStripes().okapi;
+  const { locale = 'en', tenant, timeout = 30000, url } = useStripes().okapi;
+
   return ky.create({
     credentials: 'include',
     hooks: {
@@ -16,6 +17,6 @@ export default () => {
     mode: 'cors',
     prefix: url,
     retry: 0,
-    timeout: 30000,
+    timeout,
   });
 };