15672: Fixes filter usage on collections and favorite store middlewares.
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Mon, 16 Dec 2019 21:42:43 +0000 (18:42 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Mon, 16 Dec 2019 21:42:43 +0000 (18:42 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

src/store/advanced-tab/advanced-tab.tsx
src/store/collections-content-address-panel/collections-content-address-middleware-service.ts
src/store/favorite-panel/favorite-panel-middleware-service.ts
src/store/public-favorites-panel/public-favorites-middleware-service.ts

index be82547b813c9e9161a5ff834aa4c5cfceb8f438..f11e54ff3331c837ac385ac26bde8c927951ff1d 100644 (file)
@@ -225,7 +225,7 @@ export const openAdvancedTabDialog = (uuid: string) =>
                 const data = getResource<UserResource>(uuid)(resources);
                 const metadata = await services.linkService.list({
                     filters: new FilterBuilder()
-                        .addEqual('headUuid', uuid)
+                        .addEqual('head_uuid', uuid)
                         .getFilters()
                 });
                 const advanceDataUser = advancedTabData({
@@ -300,7 +300,7 @@ const getDataForAdvancedTab = (uuid: string) =>
         const data = getResource<any>(uuid)(resources);
         const metadata = await services.linkService.list({
             filters: new FilterBuilder()
-                .addEqual('headUuid', uuid)
+                .addEqual('head_uuid', uuid)
                 .getFilters()
         });
         const user = metadata.itemsAvailable && await services.userService.get(metadata.items[0].tailUuid || '');
index 57d09bf4be1c90f552a1f9c592b84ba5e5bdf8c9..dc0f2c52c3cb10ef1db17f9d6885fec5683477b8 100644 (file)
@@ -56,7 +56,7 @@ export class CollectionsWithSameContentAddressMiddlewareService extends DataExpl
                     limit: dataExplorer.rowsPerPage,
                     offset: dataExplorer.page * dataExplorer.rowsPerPage,
                     filters: new FilterBuilder()
-                        .addEqual('portableDataHash', contentAddress)
+                        .addEqual('portable_data_hash', contentAddress)
                         .addILike("name", dataExplorer.searchValue)
                         .getFilters()
                 });
index b242366d648c6e3af9a6a57d2831d5752f8be0a2..f45a62f87c41e777471ab2aaf8adadac0de640bd 100644 (file)
@@ -59,9 +59,9 @@ export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareServic
                 api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
                 const responseLinks = await this.services.linkService.list({
                     filters: new FilterBuilder()
-                        .addEqual("linkClass", 'star')
-                        .addEqual('tailUuid', getUserUuid(api.getState()))
-                        .addEqual('tailKind', ResourceKind.USER)
+                        .addEqual("link_class", 'star')
+                        .addEqual('tail_uuid', getUserUuid(api.getState()))
+                        .addEqual('tail_kind', ResourceKind.USER)
                         .getFilters()
                 }).then(results => results);
                 const uuids = responseLinks.items.map(it => it.headUuid);
index a15fe97542713b9bdec1c80729641d9db05f5e4b..072cf4e430c49f8b47432321ce1cf36815707209 100644 (file)
@@ -59,10 +59,10 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ
                     limit: dataExplorer.rowsPerPage,
                     offset: dataExplorer.page * dataExplorer.rowsPerPage,
                     filters: new FilterBuilder()
-                        .addEqual('linkClass', LinkClass.STAR)
+                        .addEqual('link_class', LinkClass.STAR)
                         .addILike("name", dataExplorer.searchValue)
-                        .addEqual('ownerUuid', uuid)
-                        .addIsA("headUuid", typeFilters)
+                        .addEqual('owner_uuid', uuid)
+                        .addIsA("head_uuid", typeFilters)
                         .getFilters()
                 });
                 const uuids = responseLinks.items.map(it => it.headUuid);