Merge branch 'master' into 14604-ui-improvements

[arvados-workbench2.git] / src / models / search-bar.ts

diff --git a/src/models/search-bar.ts b/src/models/search-bar.ts
index 4df5c38f2527278babfa187210681d89310685cb..effaeed4c0e676882e6bccc9f445e9eb732d9483 100644 (file)
--- a/src/models/search-bar.ts
+++ b/src/models/search-bar.ts
@@ -6,23 +6,18 @@ import { ResourceKind } from '~/models/resource';
 
 export type SearchBarAdvanceFormData = {
     type?: ResourceKind;
-    cluster?: ClusterObjectType;
+    cluster?: string;
     projectUuid?: string;
     inTrash: boolean;
     dateFrom: string;
     dateTo: string;
     saveQuery: boolean;
-    searchQuery: string;
-    properties: PropertyValues[];
-} & PropertyValues;
+    queryName: string;
+    searchValue: string;
+    properties: PropertyValue[];
+};
 
-export interface PropertyValues {
+export interface PropertyValue {
     key: string;
     value: string;
 }
-
-export enum ClusterObjectType {
-    INDIANAPOLIS = "indianapolis",
-    KAISERAUGST = "kaiseraugst",
-    PENZBERG = "penzberg"
-}
\ No newline at end of file