Skip to content

Commit f7e1e6d

Browse files
authored
change favorites change endpoints (geosolutions-it#12005)
1 parent 41dd38f commit f7e1e6d

4 files changed

Lines changed: 14 additions & 16 deletions

File tree

web/client/api/GeoStoreDAO.js

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -652,23 +652,21 @@ const Api = {
652652
return axios.delete(url, Api.addBaseUrl(parseOptions(options))).then((response) => response.data);
653653
},
654654
/**
655-
* add a resource to user favorites
656-
* @param {string} userId user identifier
655+
* add a resource to user favorites (current logged user)
657656
* @param {string} resourceId resource identifier
658657
* @param {object} options additional axios options
659658
*/
660-
addFavoriteResource: (userId, resourceId, options) => {
661-
const url = `/users/user/${userId}/favorite/${resourceId}`;
659+
addFavoriteResource: (resourceId, options) => {
660+
const url = `/users/user/favorite/${resourceId}`;
662661
return axios.post(url, undefined, Api.addBaseUrl(parseOptions(options))).then((response) => response.data);
663662
},
664663
/**
665-
* remove a resource from user favorites
666-
* @param {string} userId user identifier
664+
* remove a resource from user favorites (current logged user)
667665
* @param {string} resourceId resource identifier
668666
* @param {object} options additional axios options
669667
*/
670-
removeFavoriteResource: (userId, resourceId, options) => {
671-
const url = `/users/user/${userId}/favorite/${resourceId}`;
668+
removeFavoriteResource: (resourceId, options) => {
669+
const url = `/users/user/favorite/${resourceId}`;
672670
return axios.delete(url, Api.addBaseUrl(parseOptions(options))).then((response) => response.data);
673671
},
674672
getIPRanges: function(options = {}) {

web/client/api/__tests__/GeoStoreDAO-test.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -508,25 +508,25 @@ describe('Test correctness of the GeoStore APIs', () => {
508508
it('addFavoriteResource', (done) => {
509509
mockAxios.onPost().reply((data) => {
510510
try {
511-
expect(data.url).toEqual('/users/user/10/favorite/15');
511+
expect(data.url).toEqual('/users/user/favorite/15');
512512
done();
513513
} catch (e) {
514514
done(e);
515515
}
516516
return [200];
517517
});
518-
API.addFavoriteResource("10", "15");
518+
API.addFavoriteResource("15");
519519
});
520520
it('removeFavoriteResource', (done) => {
521521
mockAxios.onDelete().reply((data) => {
522522
try {
523-
expect(data.url).toEqual('/users/user/10/favorite/15');
523+
expect(data.url).toEqual('/users/user/favorite/15');
524524
done();
525525
} catch (e) {
526526
done(e);
527527
}
528528
return [200];
529529
});
530-
API.removeFavoriteResource("10", "15");
530+
API.removeFavoriteResource("15");
531531
});
532532
});

web/client/plugins/ResourcesCatalog/containers/Favorites.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function Favorites({
5050
const promise = isFavorite
5151
? GeoStoreDAO.removeFavoriteResource
5252
: GeoStoreDAO.addFavoriteResource;
53-
promise(user?.id, resource?.id)
53+
promise(resource?.id)
5454
.then(() => isMounted(() => {
5555
setIsFavorite(!isFavorite);
5656
updateResource({ isFavorite: !isFavorite, id: resource?.id });

web/client/plugins/ResourcesCatalog/containers/__tests__/Favorites-test.jsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('Favorites container', () => {
3737
it('should trigger addFavoriteResource', (done) => {
3838
mockAxios.onPost().reply((data) => {
3939
try {
40-
expect(data.url).toEqual('/users/user/10/favorite/15');
40+
expect(data.url).toEqual('/users/user/favorite/15');
4141
} catch (e) {
4242
done(e);
4343
}
@@ -67,7 +67,7 @@ describe('Favorites container', () => {
6767
it('should trigger removeFavoriteResource', (done) => {
6868
mockAxios.onDelete().reply((data) => {
6969
try {
70-
expect(data.url).toEqual('/users/user/10/favorite/15');
70+
expect(data.url).toEqual('/users/user/favorite/15');
7171
} catch (e) {
7272
done(e);
7373
}
@@ -97,7 +97,7 @@ describe('Favorites container', () => {
9797
it('should trigger onSearch if the query has the favorite f filter', (done) => {
9898
mockAxios.onPost().reply((data) => {
9999
try {
100-
expect(data.url).toEqual('/users/user/10/favorite/15');
100+
expect(data.url).toEqual('/users/user/favorite/15');
101101
} catch (e) {
102102
done(e);
103103
}

0 commit comments

Comments
 (0)