Merge branch '16718-past-collection-versions-search'

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

diff --git a/src/models/search-bar.ts b/src/models/search-bar.ts
index efbbb157cc2be7487a11de9e270057e3d51c4faa..09b8b6b70d02670f115ab58f218c06253c630652 100644 (file)
--- a/src/models/search-bar.ts
+++ b/src/models/search-bar.ts
@@ -4,39 +4,23 @@
 
 import { ResourceKind } from '~/models/resource';
 
-export type SearchBarAdvanceFormData = {
+export type SearchBarAdvancedFormData = {
     type?: ResourceKind;
-    cluster?: ClusterObjectType;
+    cluster?: string;
     projectUuid?: string;
     inTrash: boolean;
+    pastVersions: boolean;
     dateFrom: string;
     dateTo: string;
     saveQuery: boolean;
     queryName: string;
     searchValue: string;
-    properties: PropertyValues[];
+    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"
-}
-
-export const getClusterObjectType = (cluster?: string) => {
-    switch (cluster) {
-        case "indianapolis":
-            return ClusterObjectType.INDIANAPOLIS;
-        case "kaiseraugst":
-            return ClusterObjectType.KAISERAUGST;
-        case "penzberg":
-            return ClusterObjectType.PENZBERG;
-        default:
-            return undefined;
-    }
-};