X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/32dcbe112366f6ce4037e87527aac5ea7865bee0..2a7fd99c212c33a1ec9911f8529fa5afc59a7bb2:/src/views-components/form-fields/search-bar-form-fields.tsx?ds=sidebyside

diff --git a/src/views-components/form-fields/search-bar-form-fields.tsx b/src/views-components/form-fields/search-bar-form-fields.tsx
index 210affcfdc..47633a0b12 100644
--- a/src/views-components/form-fields/search-bar-form-fields.tsx
+++ b/src/views-components/form-fields/search-bar-form-fields.tsx
@@ -2,67 +2,98 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import * as React from "react";
-import { Field } from 'redux-form';
-import { TextField } from "~/components/text-field/text-field";
-import { CheckboxField } from '~/components/checkbox-field/checkbox-field';
+import React from "react";
+import { Field, FieldArray } from 'redux-form';
+import { TextField, DateTextField } from "components/text-field/text-field";
+import { CheckboxField } from 'components/checkbox-field/checkbox-field';
+import { NativeSelectField } from 'components/select-field/select-field';
+import { ResourceKind } from 'models/resource';
+import { SearchBarAdvancedPropertiesView } from 'views-components/search-bar/search-bar-advanced-properties-view';
+import { PropertyKeyField, } from 'views-components/resource-properties-form/property-key-field';
+import { PropertyValueField } from 'views-components/resource-properties-form/property-value-field';
+import { connect } from "react-redux";
+import { RootState } from "store/store";
+import { ProjectInput, ProjectCommandInputParameter } from 'views/run-process-panel/inputs/project-input';
 
 export const SearchBarTypeField = () =>
     <Field
         name='type'
-        component={TextField}
-        label="Type"/>;
+        component={NativeSelectField as any}
+        items={[
+            { key: '', value: 'Any' },
+            { key: ResourceKind.COLLECTION, value: 'Collection' },
+            { key: ResourceKind.PROJECT, value: 'Project' },
+            { key: ResourceKind.PROCESS, value: 'Process' }
+        ]} />;
 
-export const SearchBarClusterField = () =>
-    <Field
+
+interface SearchBarClusterFieldProps {
+    clusters: { key: string, value: string }[];
+}
+
+export const SearchBarClusterField = connect(
+    (state: RootState) => ({
+        clusters: [{ key: '', value: 'Any' }].concat(
+            state.auth.sessions
+                .filter(s => s.loggedIn)
+                .map(s => ({
+                    key: s.clusterId,
+                    value: s.clusterId
+                })))
+    }))((props: SearchBarClusterFieldProps) => <Field
         name='cluster'
-        component={TextField}
-        label="Cluster name" />;
+        component={NativeSelectField as any}
+        items={props.clusters} />
+    );
 
-export const SearchBarProjectField = () => 
-    <Field
-        name='project'
-        component={TextField}
-        label="Project name" />;
+export const SearchBarProjectField = () =>
+    <ProjectInput required={false} input={{
+        id: "projectObject",
+        label: "Limit search to Project"
+    } as ProjectCommandInputParameter}
+        options={{ showOnlyOwned: false, showOnlyWritable: false }} />
 
-export const SearchBarTrashField = () => 
+export const SearchBarTrashField = () =>
     <Field
         name='inTrash'
         component={CheckboxField}
         label="In trash" />;
 
-export const SearchBarDataFromField = () => 
+export const SearchBarPastVersionsField = () =>
     <Field
-        name='dataFrom'
-        component={TextField}
-        label="From" />;
+        name='pastVersions'
+        component={CheckboxField}
+        label="Past versions" />;
 
-export const SearchBarDataToField = () =>
+export const SearchBarDateFromField = () =>
     <Field
-        name='dataTo'
-        component={TextField}
-        label="To" />;
+        name='dateFrom'
+        component={DateTextField as any} />;
 
-export const SearchBarKeyField = () => 
+export const SearchBarDateToField = () =>
     <Field
-        name='key'
-        component={TextField}
-        label="Key" />;
+        name='dateTo'
+        component={DateTextField as any} />;
 
-export const SearchBarValueField = () => 
-    <Field
-        name='value'
-        component={TextField}
-        label="Value" />;
+export const SearchBarPropertiesField = () =>
+    <FieldArray
+        name="properties"
+        component={SearchBarAdvancedPropertiesView as any} />;
+
+export const SearchBarKeyField = () =>
+    <PropertyKeyField skipValidation={true} />;
+
+export const SearchBarValueField = () =>
+    <PropertyValueField skipValidation={true} />;
 
-export const SearchBarSaveSearchField = () => 
+export const SearchBarSaveSearchField = () =>
     <Field
         name='saveQuery'
         component={CheckboxField}
-        label="Save search query" />;
+        label="Save query" />;
 
-export const SearchBarQuerySearchField = () => 
+export const SearchBarQuerySearchField = () =>
     <Field
-        name='searchQuery'
-        component={TextField}
-        label="Search query name" />;
\ No newline at end of file
+        name='queryName'
+        component={TextField as any}
+        label="Query name" />;
