Feature #13703
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
})
.then(CommonResourceService.mapResponseKeys);
}
})
.then(CommonResourceService.mapResponseKeys);
}
+}
+
+export enum GroupContentsResourcePrefix {
+ Collection = "collections",
+ Project = "groups",
+ Workflow = "workflows",
+ Process = "container_requests"
}
\ No newline at end of file
}
\ No newline at end of file
import { ProcessResource } from "../../models/process";
import { CollectionResource } from "../../models/collection";
import OrderBuilder from "../../common/api/order-builder";
import { ProcessResource } from "../../models/process";
import { CollectionResource } from "../../models/collection";
import OrderBuilder from "../../common/api/order-builder";
-import { GroupContentsResource } from "../../services/groups-service/groups-service";
+import { GroupContentsResource, GroupContentsResourcePrefix } from "../../services/groups-service/groups-service";
export const projectPanelMiddleware: Middleware = store => next => {
next(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
export const projectPanelMiddleware: Middleware = store => next => {
next(actions.SET_COLUMNS({ id: PROJECT_PANEL_ID, columns }));
filters: FilterBuilder
.create()
.concat(FilterBuilder
filters: FilterBuilder
.create()
.concat(FilterBuilder
- .create<CollectionResource>("collections")
+ .create<CollectionResource>(GroupContentsResourcePrefix.Collection)
.addIsA("uuid", typeFilters.map(f => f.type)))
.concat(FilterBuilder
.addIsA("uuid", typeFilters.map(f => f.type)))
.concat(FilterBuilder
- .create<ProcessResource>("containerRequests")
+ .create<ProcessResource>(GroupContentsResourcePrefix.Process)
.addIn("state", statusFilters.map(f => f.type)))
.concat(getSearchFilter(dataExplorer.searchValue))
})
.addIn("state", statusFilters.map(f => f.type)))
.concat(getSearchFilter(dataExplorer.searchValue))
})
const getOrder = (attribute: "name" | "createdAt", direction: "asc" | "desc") =>
[
const getOrder = (attribute: "name" | "createdAt", direction: "asc" | "desc") =>
[
- OrderBuilder.create<GroupContentsResource>("collections"),
- OrderBuilder.create<GroupContentsResource>("container_requests"),
- OrderBuilder.create<GroupContentsResource>("groups")
+ OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection),
+ OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process),
+ OrderBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project)
].reduce((acc, b) =>
acc.concat(direction === "asc"
? b.addAsc(attribute)
].reduce((acc, b) =>
acc.concat(direction === "asc"
? b.addAsc(attribute)
const getSearchFilter = (searchValue: string) =>
searchValue
? [
const getSearchFilter = (searchValue: string) =>
searchValue
? [
- FilterBuilder.create<GroupContentsResource>("collections"),
- FilterBuilder.create<GroupContentsResource>("container_requests"),
- FilterBuilder.create<GroupContentsResource>("groups")]
+ FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Collection),
+ FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Process),
+ FilterBuilder.create<GroupContentsResource>(GroupContentsResourcePrefix.Project)]
.reduce((acc, b) =>
acc.concat(b.addILike("name", searchValue)), FilterBuilder.create())
: FilterBuilder.create();
.reduce((acc, b) =>
acc.concat(b.addILike("name", searchValue)), FilterBuilder.create())
: FilterBuilder.create();