Merge branch '16602-wb2-acr-version' refs #16602

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

diff --git a/src/models/search-bar.ts b/src/models/search-bar.ts
index 4df5c38f2527278babfa187210681d89310685cb..c71faf2ff47c132453e923a8d021816865ef67ee 100644 (file)
--- a/src/models/search-bar.ts
+++ b/src/models/search-bar.ts
@@ -4,25 +4,22 @@
 
 import { ResourceKind } from '~/models/resource';
 
-export type SearchBarAdvanceFormData = {
+export type SearchBarAdvancedFormData = {
     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;
+    keyID?: string;
     value: string;
+    valueID?: string;
 }
-
-export enum ClusterObjectType {
-    INDIANAPOLIS = "indianapolis",
-    KAISERAUGST = "kaiseraugst",
-    PENZBERG = "penzberg"
-}
\ No newline at end of file