projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
18123: Add optional disabled prop to active checkbox.
[arvados-workbench2.git]
/
src
/
services
/
favorite-service
/
favorite-service.ts
diff --git
a/src/services/favorite-service/favorite-service.ts
b/src/services/favorite-service/favorite-service.ts
index 92b0713dbcc6ee2ce8b0eb0939d4cb928710676b..8b66455babf9db6ca6ecf88d01cd9eb6e170b8de 100644
(file)
--- a/
src/services/favorite-service/favorite-service.ts
+++ b/
src/services/favorite-service/favorite-service.ts
@@
-4,9
+4,9
@@
import { LinkService } from "../link-service/link-service";
import { GroupsService, GroupContentsResource } from "../groups-service/groups-service";
import { LinkService } from "../link-service/link-service";
import { GroupsService, GroupContentsResource } from "../groups-service/groups-service";
-import { LinkClass } from "
~/
models/link";
-import { FilterBuilder, joinFilters } from "
~/
services/api/filter-builder";
-import { ListResults } from
"~/services/common-service/common-resource-service"
;
+import { LinkClass } from "models/link";
+import { FilterBuilder, joinFilters } from "services/api/filter-builder";
+import { ListResults } from
'services/common-service/common-service'
;
export interface FavoriteListArguments {
limit?: number;
export interface FavoriteListArguments {
limit?: number;
@@
-20,7
+20,7
@@
export class FavoriteService {
constructor(
private linkService: LinkService,
private groupsService: GroupsService,
constructor(
private linkService: LinkService,
private groupsService: GroupsService,
- ) {}
+ ) {
}
create(data: { userUuid: string; resource: { uuid: string; name: string } }) {
return this.linkService.create({
create(data: { userUuid: string; resource: { uuid: string; name: string } }) {
return this.linkService.create({
@@
-36,31
+36,31
@@
export class FavoriteService {
return this.linkService
.list({
filters: new FilterBuilder()
return this.linkService
.list({
filters: new FilterBuilder()
- .addEqual('
tailU
uid', data.userUuid)
- .addEqual('head
U
uid', data.resourceUuid)
- .addEqual('link
C
lass', LinkClass.STAR)
+ .addEqual('
owner_u
uid', data.userUuid)
+ .addEqual('head
_u
uid', data.resourceUuid)
+ .addEqual('link
_c
lass', LinkClass.STAR)
.getFilters()
})
.then(results => Promise.all(
results.items.map(item => this.linkService.delete(item.uuid))));
}
.getFilters()
})
.then(results => Promise.all(
results.items.map(item => this.linkService.delete(item.uuid))));
}
- list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}): Promise<ListResults<GroupContentsResource>> {
+ list(userUuid: string, { filters, limit, offset, linkOrder, contentOrder }: FavoriteListArguments = {}
, showOnlyOwned: boolean = true
): Promise<ListResults<GroupContentsResource>> {
const listFilters = new FilterBuilder()
const listFilters = new FilterBuilder()
- .addEqual('
tailU
uid', userUuid)
- .addEqual('link
C
lass', LinkClass.STAR)
+ .addEqual('
owner_u
uid', userUuid)
+ .addEqual('link
_c
lass', LinkClass.STAR)
.getFilters();
return this.linkService
.list({
.getFilters();
return this.linkService
.list({
- filters: joinFilters(filters, listFilters),
+ filters: joinFilters(filters
|| ''
, listFilters),
limit,
offset,
order: linkOrder
})
.then(results => {
const uuids = results.items.map(item => item.headUuid);
limit,
offset,
order: linkOrder
})
.then(results => {
const uuids = results.items.map(item => item.headUuid);
- return this.groupsService.contents(
userUuid
, {
+ return this.groupsService.contents(
showOnlyOwned ? userUuid : ''
, {
limit,
offset,
order: contentOrder,
limit,
offset,
order: contentOrder,
@@
-74,9
+74,9
@@
export class FavoriteService {
return this.linkService
.list({
filters: new FilterBuilder()
return this.linkService
.list({
filters: new FilterBuilder()
- .addIn("head
U
uid", resourceUuids)
- .addEqual("
tailU
uid", userUuid)
- .addEqual("link
C
lass", LinkClass.STAR)
+ .addIn("head
_u
uid", resourceUuids)
+ .addEqual("
owner_u
uid", userUuid)
+ .addEqual("link
_c
lass", LinkClass.STAR)
.getFilters()
})
.then(({ items }) => resourceUuids.reduce((results, uuid) => {
.getFilters()
})
.then(({ items }) => resourceUuids.reduce((results, uuid) => {