Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Genesys PGR
Genesys Website
Commits
1e93102c
Commit
1e93102c
authored
Oct 09, 2018
by
Matija Obreza
Browse files
Fix: ensure Axios response interceptor is used
- Pagination from querystring updated
parent
140dc847
Changes
9
Hide whitespace changes
Inline
Side-by-side
src/accessions/ui/BrowsePage.tsx
View file @
1e93102c
...
...
@@ -29,7 +29,7 @@ class BrowsePage extends BrowsePageTemplate<Accession> {
const
qs
=
parse
(
search
||
''
);
const
page
=
{
direction
:
qs
.
d
,
properties
:
null
};
if
(
qs
.
s
)
{
page
.
properties
=
[
...
qs
.
s
];
page
.
properties
=
[
qs
.
s
];
}
return
applyFilters
(
filterCode
||
''
,
page
);
},
...
...
src/accessions/ui/OverviewPage.tsx
View file @
1e93102c
...
...
@@ -48,7 +48,7 @@ class BrowsePage extends React.Component<IOverviewPageProps, any> {
const
qs
=
parse
(
search
||
''
);
const
page
=
{
direction
:
qs
.
d
,
properties
:
null
};
if
(
qs
.
s
)
{
page
.
properties
=
[
...
qs
.
s
];
page
.
properties
=
[
qs
.
s
];
}
return
applyOverviewFilters
(
filterCode
||
''
,
page
);
},
...
...
src/institutes/ui/BrowsePage.tsx
View file @
1e93102c
...
...
@@ -27,7 +27,7 @@ class BrowsePage extends BrowsePageTemplate<FaoInstitute> {
const
qs
=
parse
(
search
||
''
);
const
page
=
{
direction
:
qs
.
d
,
properties
:
null
};
if
(
qs
.
s
)
{
page
.
properties
=
[
...
qs
.
s
];
page
.
properties
=
[
qs
.
s
];
}
return
applyFilters
(
filterCode
||
''
,
page
);
},
...
...
src/service/genesys/SubsetService.ts
View file @
1e93102c
...
...
@@ -132,7 +132,7 @@ class SubsetService {
s
:
page
.
properties
||
undefined
,
},
{});
const
apiUrl
=
URL_LIST
+
(
qs
?
`?
${
qs
}
`
:
''
);
//
console.log(`Fetching from ${apiUrl}`);
console
.
log
(
`Fetching from
${
apiUrl
}
`
,
page
);
const
content
=
{
data
:
typeof
filter
===
'
string
'
?
null
:
{
...
filter
}
};
return
axiosBackend
.
request
({
...
...
src/subsets/actions/public.ts
View file @
1e93102c
...
...
@@ -47,7 +47,7 @@ export const updateRoute = (paged: FilteredPage<Subset>) => (dispatch) => {
};
export
const
applyFilters
=
(
filters
:
string
|
SubsetFilter
,
page
:
IPageRequest
=
{
page
:
0
})
=>
(
dispatch
)
=>
{
console
.
log
(
'
Applying new filter
'
,
filters
);
console
.
log
(
'
Applying new filter
'
,
filters
,
page
);
return
SubsetService
.
list
(
filters
,
page
)
.
then
((
paged
)
=>
{
dispatch
(
receiveSubsets
(
paged
));
...
...
src/subsets/ui/BrowsePage.tsx
View file @
1e93102c
...
...
@@ -28,7 +28,7 @@ class BrowsePage extends BrowsePageTemplate<Subset> {
const
qs
=
parse
(
search
||
''
);
const
page
=
{
direction
:
qs
.
d
,
properties
:
null
};
if
(
qs
.
s
)
{
page
.
properties
=
[
...
qs
.
s
];
page
.
properties
=
[
qs
.
s
];
}
return
applyFilters
(
filterCode
||
''
,
page
);
},
...
...
src/subsets/ui/dashboard/DashboardPage.tsx
View file @
1e93102c
...
...
@@ -45,7 +45,7 @@ class DashboardPage extends React.Component<IDashboardPageProps> {
const
qs
=
parse
(
search
||
''
);
const
page
=
{
direction
:
qs
.
d
,
properties
:
null
};
if
(
qs
.
s
)
{
page
.
properties
=
[
...
qs
.
s
];
page
.
properties
=
[
qs
.
s
];
}
return
applyFilters
(
filterCode
||
''
,
page
);
},
...
...
src/utilities/axiosConfig.ts
deleted
100644 → 0
View file @
140dc847
import
axios
from
'
axios
'
;
import
ApiError
from
'
model/ApiError
'
;
axios
.
interceptors
.
response
.
use
((
response
)
=>
{
return
response
;
},
(
error
)
=>
{
return
Promise
.
reject
(
ApiError
.
axiosError
(
error
));
});
src/utilities/requestUtils.ts
View file @
1e93102c
import
axios
from
'
axios
'
;
import
ApiError
from
'
model/ApiError
'
;
axios
.
interceptors
.
response
.
use
((
response
)
=>
{
return
response
;
},
(
error
)
=>
{
return
Promise
.
reject
(
ApiError
.
axiosError
(
error
));
});
/**
* Default Axios configuration for accessing the backend API
*/
...
...
@@ -17,8 +25,9 @@ axiosBackend.interceptors.request.use((config) => {
console
.
log
(
'
Backend API request to
'
,
config
.
url
);
return
config
;
},
(
error
)
=>
{
console
.
log
(
'
Backend error!!
'
);
// Do something with request error
return
Promise
.
reject
(
error
);
return
Promise
.
reject
(
ApiError
.
axiosError
(
error
)
)
;
});
/**
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment