X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/72ee613468c6dee53b98ed1469ce9781a942dbe9..0f433d72c1af64a6359478da2edb8c9f589d579b:/src/store/public-favorites-panel/public-favorites-middleware-service.ts diff --git a/src/store/public-favorites-panel/public-favorites-middleware-service.ts b/src/store/public-favorites-panel/public-favorites-middleware-service.ts index a15fe975..dd21a380 100644 --- a/src/store/public-favorites-panel/public-favorites-middleware-service.ts +++ b/src/store/public-favorites-panel/public-favorites-middleware-service.ts @@ -2,25 +2,25 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ServiceRepository } from '~/services/services'; +import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService, getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service'; -import { RootState } from '~/store/store'; -import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { getDataExplorer } from '~/store/data-explorer/data-explorer-reducer'; -import { resourcesActions } from '~/store/resources/resources-actions'; -import { FilterBuilder } from '~/services/api/filter-builder'; -import { SortDirection } from '~/components/data-table/data-column'; -import { OrderDirection, OrderBuilder } from '~/services/api/order-builder'; -import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; -import { FavoritePanelColumnNames } from '~/views/favorite-panel/favorite-panel'; -import { publicFavoritePanelActions } from '~/store/public-favorites-panel/public-favorites-action'; -import { DataColumns } from '~/components/data-table/data-table'; +import { DataExplorerMiddlewareService, getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service'; +import { RootState } from 'store/store'; +import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions'; +import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer'; +import { resourcesActions } from 'store/resources/resources-actions'; +import { FilterBuilder } from 'services/api/filter-builder'; +import { SortDirection } from 'components/data-table/data-column'; +import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; +import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; +import { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel'; +import { publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action'; +import { DataColumns } from 'components/data-table/data-table'; import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters'; -import { LinkResource, LinkClass } from '~/models/link'; -import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; -import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions'; -import { updatePublicFavorites } from '~/store/public-favorites/public-favorites-actions'; +import { LinkResource, LinkClass } from 'models/link'; +import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service'; +import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions'; +import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions'; export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -54,15 +54,14 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ try { api.dispatch(progressIndicatorActions.START_WORKING(this.getId())); const uuidPrefix = api.getState().auth.config.uuidPrefix; - const uuid = `${uuidPrefix}-j7d0g-fffffffffffffff`; + const publicProjectUuid = `${uuidPrefix}-j7d0g-publicfavorites`; const responseLinks = await this.services.linkService.list({ limit: dataExplorer.rowsPerPage, offset: dataExplorer.page * dataExplorer.rowsPerPage, filters: new FilterBuilder() - .addEqual('linkClass', LinkClass.STAR) - .addILike("name", dataExplorer.searchValue) - .addEqual('ownerUuid', uuid) - .addIsA("headUuid", typeFilters) + .addEqual('link_class', LinkClass.STAR) + .addEqual('owner_uuid', publicProjectUuid) + .addIsA("head_uuid", typeFilters) .getFilters() }); const uuids = responseLinks.items.map(it => it.headUuid); @@ -88,11 +87,11 @@ export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareServ .getFilters() }); const response = groupItems; - collectionItems.items.map((it: any) => { + collectionItems.items.forEach((it: any) => { response.itemsAvailable++; response.items.push(it); }); - processItems.items.map((it: any) => { + processItems.items.forEach((it: any) => { response.itemsAvailable++; response.items.push(it); });