16068: Merge branch 'main' of git.arvados.org:arvados-workbench2 into 16068

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

diff --git a/src/models/search-bar.ts b/src/models/search-bar.ts
index 798f9c8f27bd84d1aeb6fbb06aaa244771ff840b..b404496f9381c0d76ac0ea2c16f6d09bf378795c 100644 (file)
--- a/src/models/search-bar.ts
+++ b/src/models/search-bar.ts
@@ -2,13 +2,14 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { ResourceKind } from '~/models/resource';
+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;
@@ -19,11 +20,7 @@ export type SearchBarAdvanceFormData = {
 
 export interface PropertyValue {
     key: string;
+    keyID?: string;
     value: string;
-}
-
-export enum ClusterObjectType {
-    INDIANAPOLIS = "indianapolis",
-    KAISERAUGST = "kaiseraugst",
-    PENZBERG = "penzberg"
+    valueID?: string;
 }