[ARVADOS-WORKBENCH2] updated: 1.1.4-192-gceba702
Git user
git at public.curoverse.com
Wed Jul 4 09:53:36 EDT 2018
Summary of changes:
src/common/api/filter-builder.ts | 30 ++++++++++++++--------
src/components/data-table/data-column.ts | 4 +--
src/components/data-table/data-table.tsx | 2 +-
.../collection-service/collection-service.ts | 4 +--
4 files changed, 25 insertions(+), 15 deletions(-)
via ceba702623665c3948fe5372ecf57ba61dae4892 (commit)
via bcca5d91296f24e10fdf842cda26a32f6f910ef4 (commit)
from 5678598e1b83b59c14a7ace3ee9ae39368be3c28 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit ceba702623665c3948fe5372ecf57ba61dae4892
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Wed Jul 4 15:53:18 2018 +0200
Make DataColum filters type generic
Feature #13703
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/components/data-table/data-column.ts b/src/components/data-table/data-column.ts
index bbfea7a..0440fe2 100644
--- a/src/components/data-table/data-column.ts
+++ b/src/components/data-table/data-column.ts
@@ -4,13 +4,13 @@
import { DataTableFilterItem } from "../data-table-filters/data-table-filters";
-export interface DataColumn<T> {
+export interface DataColumn<T, F extends DataTableFilterItem = DataTableFilterItem> {
name: string;
selected: boolean;
configurable?: boolean;
key?: React.Key;
sortDirection?: SortDirection;
- filters?: DataTableFilterItem[];
+ filters?: F[];
render: (item: T) => React.ReactElement<void>;
renderHeader?: () => React.ReactElement<void> | null;
width?: string;
diff --git a/src/components/data-table/data-table.tsx b/src/components/data-table/data-table.tsx
index e96839e..22ecf4f 100644
--- a/src/components/data-table/data-table.tsx
+++ b/src/components/data-table/data-table.tsx
@@ -7,7 +7,7 @@ import { Table, TableBody, TableRow, TableCell, TableHead, TableSortLabel, Style
import { DataColumn, SortDirection } from './data-column';
import DataTableFilters, { DataTableFilterItem } from "../data-table-filters/data-table-filters";
-export type DataColumns<T> = Array<DataColumn<T>>;
+export type DataColumns<T, F extends DataTableFilterItem = DataTableFilterItem> = Array<DataColumn<T, F>>;
export interface DataItem {
key: React.Key;
}
commit bcca5d91296f24e10fdf842cda26a32f6f910ef4
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date: Wed Jul 4 15:52:33 2018 +0200
Add convenience create method add handle Resource type in FitlerBuilder
Feature #13703
Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
diff --git a/src/common/api/filter-builder.ts b/src/common/api/filter-builder.ts
index 443c763..cc31f38 100644
--- a/src/common/api/filter-builder.ts
+++ b/src/common/api/filter-builder.ts
@@ -2,33 +2,43 @@
//
// SPDX-License-Identifier: AGPL-3.0
-export enum FilterField {
- UUID = "uuid",
- OWNER_UUID = "owner_uuid"
-}
+import * as _ from "lodash";
+import { Resource } from "./common-resource-service";
-export default class FilterBuilder {
+export default class FilterBuilder<T extends Resource = Resource> {
private filters = "";
- private addCondition(field: FilterField, cond: string, value?: string, prefix: string = "", postfix: string = "") {
+ static create<T extends Resource = Resource>() {
+ return new FilterBuilder<T>();
+ }
+
+ private addCondition(field: keyof T, cond: string, value?: string | string[], prefix: string = "", postfix: string = "") {
if (value) {
- this.filters += `["${field}","${cond}","${prefix}${value}${postfix}"]`;
+ value = typeof value === "string"
+ ? `"${prefix}${value}${postfix}"`
+ : `["${value.join(`","`)}"]`;
+
+ this.filters += `["${_.snakeCase(field.toString())}","${cond}",${value}]`;
}
return this;
}
- public addEqual(field: FilterField, value?: string) {
+ public addEqual(field: keyof T, value?: string) {
return this.addCondition(field, "=", value);
}
- public addLike(field: FilterField, value?: string) {
+ public addLike(field: keyof T, value?: string) {
return this.addCondition(field, "like", value, "", "%");
}
- public addILike(field: FilterField, value?: string) {
+ public addILike(field: keyof T, value?: string) {
return this.addCondition(field, "ilike", value, "", "%");
}
+ public addIsA(field: keyof T, value?: string | string[]) {
+ return this.addCondition(field, "is_a", value);
+ }
+
public get() {
return "[" + this.filters + "]";
}
diff --git a/src/services/collection-service/collection-service.ts b/src/services/collection-service/collection-service.ts
index bc91281..8a1d693 100644
--- a/src/services/collection-service/collection-service.ts
+++ b/src/services/collection-service/collection-service.ts
@@ -3,7 +3,7 @@
// SPDX-License-Identifier: AGPL-3.0
import { serverApi } from "../../common/api/server-api";
-import FilterBuilder, { FilterField } from "../../common/api/filter-builder";
+import FilterBuilder from "../../common/api/filter-builder";
import { ArvadosResource } from "../response";
import { Collection } from "../../models/collection";
import { getResourceKind } from "../../models/resource";
@@ -32,7 +32,7 @@ export default class CollectionService {
public getCollectionList = (parentUuid?: string): Promise<Collection[]> => {
if (parentUuid) {
const fb = new FilterBuilder();
- fb.addLike(FilterField.OWNER_UUID, parentUuid);
+ fb.addLike("ownerUuid", parentUuid);
return serverApi.get<CollectionsResponse>('/collections', { params: {
filters: fb.get()
}}).then(resp => {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list