{
- "strict": false,
+ "strict_tags": false,
"tags": {
- "fruit": {
- "values": ["pineapple", "tomato", "orange", "banana", "advocado", "lemon", "apple", "peach", "strawberry"],
- "strict": true
+ "IDTAGFRUITS": {
+ "strict": false,
+ "labels": [
+ {"label": "Fruit"}
+ ],
+ "values": {
+ "IDVALFRUITS1": {
+ "labels": [
+ {"label": "Pineapple"}
+ ]
+ },
+ "IDVALFRUITS2": {
+ "labels": [
+ {"label": "Tomato"}
+ ]
+ },
+ "IDVALFRUITS3": {
+ "labels": [
+ {"label": "Orange"}
+ ]
+ },
+ "IDVALFRUITS4": {
+ "labels": [
+ {"label": "Banana"}
+ ]
+ },
+ "IDVALFRUITS5": {
+ "labels": [
+ {"label": "Advocado"}
+ ]
+ },
+ "IDVALFRUITS6": {
+ "labels": [
+ {"label": "Lemon"}
+ ]
+ },
+ "IDVALFRUITS7": {
+ "labels": [
+ {"label": "Apple"}
+ ]
+ },
+ "IDVALFRUITS8": {
+ "labels": [
+ {"label": "Peach"}
+ ]
+ },
+ "IDVALFRUITS9": {
+ "labels": [
+ {"label": "Strawberry"}
+ ]
+ }
+ }
},
- "animal": {
- "values": ["human", "dog", "elephant", "eagle"],
- "strict": false
+ "IDTAGANIMALS": {
+ "strict": false,
+ "labels": [
+ {"label": "Animal" },
+ {"label": "Creature"}
+ ],
+ "values": {
+ "IDVALANIMALS1": {
+ "labels": [
+ {"label": "Human"},
+ {"label": "Homo sapiens"}
+ ]
+ },
+ "IDVALANIMALS2": {
+ "labels": [
+ {"label": "Dog"},
+ {"label": "Canis lupus familiaris"}
+ ]
+ },
+ "IDVALANIMALS3": {
+ "labels": [
+ {"label": "Elephant"},
+ {"label": "Loxodonta"}
+ ]
+ },
+ "IDVALANIMALS4": {
+ "labels": [
+ {"label": "Eagle"},
+ {"label": "Haliaeetus leucocephalus"}
+ ]
+ }
+ }
},
- "color": {
- "values": ["yellow", "red", "magenta", "green"],
- "strict": false
+ "IDTAGCOLORS": {
+ "strict": false,
+ "labels": [
+ {"label": "Color"}
+ ],
+ "values": {
+ "IDVALCOLORS1": {
+ "labels": [
+ {"label": "Yellow"}
+ ]
+ },
+ "IDVALCOLORS2": {
+ "labels": [
+ {"label": "Red"}
+ ]
+ },
+ "IDVALCOLORS3": {
+ "labels": [
+ {"label": "Magenta"}
+ ]
+ },
+ "IDVALCOLORS4": {
+ "labels": [
+ {"label": "Green"}
+ ]
+ }
+ }
},
- "text": {},
- "category": {
- "values": ["experimental", "development", "production"]
+ "IDTAGCOMMENT": {
+ "labels": [
+ {"label": "Comment"},
+ {"label": "Text"}
+ ]
},
- "comments": {},
- "importance": {
- "values": ["critical", "important", "low priority"]
+ "IDTAGCATEGORIES": {
+ "strict": true,
+ "labels": [
+ {"label": "Category"}
+ ],
+ "values": {
+ "IDTAGCAT1": {
+ "labels": [
+ {"label": "Experimental"}
+ ]
+ },
+ "IDTAGCAT2": {
+ "labels": [
+ {"label": "Development"}
+ ]
+ },
+ "IDTAGCAT3": {
+ "labels": [
+ {"label": "Production"}
+ ]
+ }
+ }
},
- "size": {
- "values": ["x-small", "small", "medium", "large", "x-large"]
+ "IDTAGIMPORTANCES": {
+ "strict": true,
+ "labels": [
+ {"label": "Importance"},
+ {"label": "Priority"}
+ ],
+ "values": {
+ "IDVALIMPORTANCES1": {
+ "labels": [
+ {"label": "Critical"},
+ {"label": "Urgent"},
+ {"label": "High"}
+ ]
+ },
+ "IDVALIMPORTANCES2": {
+ "labels": [
+ {"label": "Normal"},
+ {"label": "Moderate"}
+ ]
+ },
+ "IDVALIMPORTANCES3": {
+ "labels": [
+ {"label": "Low"}
+ ]
+ }
+ }
},
- "country": {
- "values": ["Afghanistan","Åland Islands","Albania","Algeria","American Samoa","AndorrA","Angola","Anguilla","Antarctica","Antigua and Barbuda","Argentina","Armenia","Aruba","Australia","Austria","Azerbaijan","Bahamas","Bahrain","Bangladesh","Barbados","Belarus","Belgium","Belize","Benin","Bermuda","Bhutan","Bolivia","Bosnia and Herzegovina","Botswana","Bouvet Island","Brazil","British Indian Ocean Territory","Brunei Darussalam","Bulgaria","Burkina Faso","Burundi","Cambodia","Cameroon","Canada","Cape Verde","Cayman Islands","Central African Republic","Chad","Chile","China","Christmas Island","Cocos (Keeling) Islands","Colombia","Comoros","Congo","Congo, The Democratic Republic of the","Cook Islands","Costa Rica","Cote D'Ivoire","Croatia","Cuba","Cyprus","Czech Republic","Denmark","Djibouti","Dominica","Dominican Republic","Ecuador","Egypt","El Salvador","Equatorial Guinea","Eritrea","Estonia","Ethiopia","Falkland Islands (Malvinas)","Faroe Islands","Fiji","Finland","France","French Guiana","French Polynesia","French Southern Territories","Gabon","Gambia","Georgia","Germany","Ghana","Gibraltar","Greece","Greenland","Grenada","Guadeloupe","Guam","Guatemala","Guernsey","Guinea","Guinea-Bissau","Guyana","Haiti","Heard Island and Mcdonald Islands","Holy See (Vatican City State)","Honduras","Hong Kong","Hungary","Iceland","India","Indonesia","Iran, Islamic Republic Of","Iraq","Ireland","Isle of Man","Israel","Italy","Jamaica","Japan","Jersey","Jordan","Kazakhstan","Kenya","Kiribati","Korea, Democratic People'S Republic of","Korea, Republic of","Kuwait","Kyrgyzstan","Lao People'S Democratic Republic","Latvia","Lebanon","Lesotho","Liberia","Libyan Arab Jamahiriya","Liechtenstein","Lithuania","Luxembourg","Macao","Macedonia, The Former Yugoslav Republic of","Madagascar","Malawi","Malaysia","Maldives","Mali","Malta","Marshall Islands","Martinique","Mauritania","Mauritius","Mayotte","Mexico","Micronesia, Federated States of","Moldova, Republic of","Monaco","Mongolia","Montserrat","Morocco","Mozambique","Myanmar","Namibia","Nauru","Nepal","Netherlands","Netherlands Antilles","New Caledonia","New Zealand","Nicaragua","Niger","Nigeria","Niue","Norfolk Island","Northern Mariana Islands","Norway","Oman","Pakistan","Palau","Palestinian Territory, Occupied","Panama","Papua New Guinea","Paraguay","Peru","Philippines","Pitcairn","Poland","Portugal","Puerto Rico","Qatar","Reunion","Romania","Russian Federation","RWANDA","Saint Helena","Saint Kitts and Nevis","Saint Lucia","Saint Pierre and Miquelon","Saint Vincent and the Grenadines","Samoa","San Marino","Sao Tome and Principe","Saudi Arabia","Senegal","Serbia and Montenegro","Seychelles","Sierra Leone","Singapore","Slovakia","Slovenia","Solomon Islands","Somalia","South Africa","South Georgia and the South Sandwich Islands","Spain","Sri Lanka","Sudan","Suriname","Svalbard and Jan Mayen","Swaziland","Sweden","Switzerland","Syrian Arab Republic","Taiwan, Province of China","Tajikistan","Tanzania, United Republic of","Thailand","Timor-Leste","Togo","Tokelau","Tonga","Trinidad and Tobago","Tunisia","Turkey","Turkmenistan","Turks and Caicos Islands","Tuvalu","Uganda","Ukraine","United Arab Emirates","United Kingdom","United States","United States Minor Outlying Islands","Uruguay","Uzbekistan","Vanuatu","Venezuela","Viet Nam","Virgin Islands, British","Virgin Islands, U.S.","Wallis and Futuna","Western Sahara","Yemen","Zambia","Zimbabwe"],
- "strict": true
+ "IDTAGSIZES": {
+ "strict": true,
+ "labels": [
+ {"label": "Size"}
+ ],
+ "values": {
+ "IDVALSIZES1": {
+ "labels": [
+ {"label": "XS"},
+ {"label": "x-small"}
+ ]
+ },
+ "IDVALSIZES2": {
+ "labels": [
+ {"label": "S"},
+ {"label": "small"}
+ ]
+ },
+ "IDVALSIZES3": {
+ "labels": [
+ {"label": "M"},
+ {"label": "medium"}
+ ]
+ },
+ "IDVALSIZES4": {
+ "labels": [
+ {"label": "L"},
+ {"label": "large"}
+ ]
+ },
+ "IDVALSIZES5": {
+ "labels": [
+ {"label": "XL"},
+ {"label": "x-large"}
+ ]
+ }
+ }
}
}
}
\ No newline at end of file
// SPDX-License-Identifier: AGPL-3.0
import { PropertyValue } from "~/models/search-bar";
+import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "~/models/vocabulary";
export const formatDate = (isoDate?: string | null, utc: boolean = false) => {
if (isoDate) {
}
];
-export const formatPropertyValue = (pv: PropertyValue) => {
+export const formatPropertyValue = (pv: PropertyValue, vocabulary?: Vocabulary) => {
+ if (vocabulary && pv.keyID && pv.valueID) {
+ return `${getTagKeyLabel(pv.keyID, vocabulary)}: ${getTagValueLabel(pv.keyID, pv.valueID!, vocabulary)}`;
+ }
if (pv.key) {
return pv.value
? `${pv.key}: ${pv.value}`
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Input as MuiInput, Chip as MuiChip, Popper as MuiPopper, Paper as MuiPaper, FormControl, InputLabel, StyleRulesCallback, withStyles, RootRef, ListItemText, ListItem, List, FormHelperText } from '@material-ui/core';
+import {
+ Input as MuiInput,
+ Chip as MuiChip,
+ Popper as MuiPopper,
+ Paper as MuiPaper,
+ FormControl, InputLabel, StyleRulesCallback, withStyles, RootRef, ListItemText, ListItem, List, FormHelperText
+} from '@material-ui/core';
import { PopperProps } from '@material-ui/core/Popper';
import { WithStyles } from '@material-ui/core/styles';
import { noop } from 'lodash';
import { getBuildInfo } from '~/common/app-info';
import { DragDropContextProvider } from 'react-dnd';
import HTML5Backend from 'react-dnd-html5-backend';
-import { initAdvanceFormProjectsTree } from '~/store/search-bar/search-bar-actions';
+import { initAdvancedFormProjectsTree } from '~/store/search-bar/search-bar-actions';
import { repositoryActionSet } from '~/views-components/context-menu/action-sets/repository-action-set';
import { sshKeyActionSet } from '~/views-components/context-menu/action-sets/ssh-key-action-set';
import { keepServiceActionSet } from '~/views-components/context-menu/action-sets/keep-service-action-set';
await store.dispatch(loadWorkbench());
addRouteChangeHandlers(history, store);
// ToDo: move to searchBar component
- store.dispatch(initAdvanceFormProjectsTree());
+ store.dispatch(initAdvancedFormProjectsTree());
}
};
};
import { ResourceKind } from '~/models/resource';
-export type SearchBarAdvanceFormData = {
+export type SearchBarAdvancedFormData = {
type?: ResourceKind;
cluster?: string;
projectUuid?: string;
export interface PropertyValue {
key: string;
+ keyID?: string;
value: string;
+ valueID?: string;
}
export interface TagProperty {
key: string;
+ keyID?: string;
value: string;
+ valueID?: string;
}
export enum TagTailType {
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as Vocabulary from './vocabulary';
+import { pipe } from 'lodash/fp';
+
+describe('Vocabulary', () => {
+ let vocabulary: Vocabulary.Vocabulary;
+
+ beforeEach(() => {
+ vocabulary = {
+ strict_tags: false,
+ tags: {
+ IDKEYCOMMENT: {
+ labels: []
+ },
+ IDKEYANIMALS: {
+ strict: false,
+ labels: [
+ {label: "Animal" },
+ {label: "Creature"}
+ ],
+ values: {
+ IDVALANIMALS1: {
+ labels: [
+ {label: "Human"},
+ {label: "Homo sapiens"}
+ ]
+ },
+ IDVALANIMALS2: {
+ labels: [
+ {label: "Dog"},
+ {label: "Canis lupus familiaris"}
+ ]
+ },
+ }
+ },
+ IDKEYSIZES: {
+ labels: [{label: "Sizes"}],
+ values: {
+ IDVALSIZES1: {
+ labels: [{label: "Small"}]
+ },
+ IDVALSIZES2: {
+ labels: [{label: "Medium"}]
+ },
+ IDVALSIZES3: {
+ labels: [{label: "Large"}]
+ },
+ IDVALSIZES4: {
+ labels: []
+ }
+ }
+ }
+ }
+ }
+ });
+
+ it('returns the list of tag keys', () => {
+ const tagKeys = Vocabulary.getTags(vocabulary);
+ // Alphabetically ordered by label
+ expect(tagKeys).toEqual([
+ {id: "IDKEYANIMALS", label: "Animal"},
+ {id: "IDKEYANIMALS", label: "Creature"},
+ {id: "IDKEYCOMMENT", label: "IDKEYCOMMENT"},
+ {id: "IDKEYSIZES", label: "Sizes"},
+ ]);
+ });
+
+ it('returns the tag values for a given key', () => {
+ const tagValues = Vocabulary.getTagValues('IDKEYSIZES', vocabulary);
+ // Alphabetically ordered by label
+ expect(tagValues).toEqual([
+ {id: "IDVALSIZES4", label: "IDVALSIZES4"},
+ {id: "IDVALSIZES3", label: "Large"},
+ {id: "IDVALSIZES2", label: "Medium"},
+ {id: "IDVALSIZES1", label: "Small"},
+ ])
+ });
+
+ it('returns an empty list of values for an non-existent key', () => {
+ const tagValues = Vocabulary.getTagValues('IDNONSENSE', vocabulary);
+ expect(tagValues).toEqual([]);
+ });
+
+ it('returns a key id for a given key label', () => {
+ const testCases = [
+ // Two labels belonging to the same ID
+ {keyLabel: 'Animal', expected: 'IDKEYANIMALS'},
+ {keyLabel: 'Creature', expected: 'IDKEYANIMALS'},
+ // Non-existent label returns empty string
+ {keyLabel: 'ThisKeyLabelDoesntExist', expected: ''},
+ ]
+ testCases.forEach(tc => {
+ const tagValueID = Vocabulary.getTagKeyID(tc.keyLabel, vocabulary);
+ expect(tagValueID).toEqual(tc.expected);
+ });
+ });
+
+ it('returns an key label for a given key id', () => {
+ const testCases = [
+ // ID with many labels return the first one
+ {keyID: 'IDKEYANIMALS', expected: 'Animal'},
+ // Key IDs without any labels or unknown keys should return the literal
+ // key from the API's response (that is, the key 'id')
+ {keyID: 'IDKEYCOMMENT', expected: 'IDKEYCOMMENT'},
+ {keyID: 'FOO', expected: 'FOO'},
+ ]
+ testCases.forEach(tc => {
+ const tagValueID = Vocabulary.getTagKeyLabel(tc.keyID, vocabulary);
+ expect(tagValueID).toEqual(tc.expected);
+ });
+ });
+
+ it('returns a value id for a given key id and value label', () => {
+ const testCases = [
+ // Key ID and value label known
+ {keyID: 'IDKEYANIMALS', valueLabel: 'Human', expected: 'IDVALANIMALS1'},
+ {keyID: 'IDKEYANIMALS', valueLabel: 'Homo sapiens', expected: 'IDVALANIMALS1'},
+ // Key ID known, value label unknown
+ {keyID: 'IDKEYANIMALS', valueLabel: 'Dinosaur', expected: ''},
+ // Key ID unknown
+ {keyID: 'IDNONSENSE', valueLabel: 'Does not matter', expected: ''},
+ ]
+ testCases.forEach(tc => {
+ const tagValueID = Vocabulary.getTagValueID(tc.keyID, tc.valueLabel, vocabulary);
+ expect(tagValueID).toEqual(tc.expected);
+ });
+ });
+
+ it('returns a value label for a given key & value id pair', () => {
+ const testCases = [
+ // Known key & value ids with multiple value labels: returns the first label
+ {keyId: 'IDKEYANIMALS', valueId: 'IDVALANIMALS1', expected: 'Human'},
+ // Values without label or unknown values should return the literal value from
+ // the API's response (that is, the value 'id')
+ {keyId: 'IDKEYSIZES', valueId: 'IDVALSIZES4', expected: 'IDVALSIZES4'},
+ {keyId: 'IDKEYCOMMENT', valueId: 'FOO', expected: 'FOO'},
+ {keyId: 'IDKEYANIMALS', valueId: 'BAR', expected: 'BAR'},
+ {keyId: 'IDKEYNONSENSE', valueId: 'FOOBAR', expected: 'FOOBAR'},
+ ]
+ testCases.forEach(tc => {
+ const tagValueLabel = Vocabulary.getTagValueLabel(tc.keyId, tc.valueId, vocabulary);
+ expect(tagValueLabel).toEqual(tc.expected);
+ });
+ });
+});
import { isObject, has, every } from 'lodash/fp';
export interface Vocabulary {
- strict: boolean;
+ strict_tags: boolean;
tags: Record<string, Tag>;
}
+export interface Label {
+ lang?: string;
+ label: string;
+}
+
+export interface TagValue {
+ labels: Label[];
+}
+
export interface Tag {
strict?: boolean;
- values?: string[];
+ labels: Label[];
+ values?: Record<string, TagValue>;
+}
+
+export interface PropFieldSuggestion {
+ id: string;
+ label: string;
}
const VOCABULARY_VALIDATORS = [
isObject,
- has('strict'),
+ has('strict_tags'),
has('tags'),
];
export const isVocabulary = (value: any) =>
- every(validator => validator(value), VOCABULARY_VALIDATORS);
\ No newline at end of file
+ every(validator => validator(value), VOCABULARY_VALIDATORS);
+
+export const isStrictTag = (tagKeyID: string, vocabulary: Vocabulary) => {
+ const tag = vocabulary.tags[tagKeyID];
+ return tag ? tag.strict : false;
+};
+
+export const getTagValueID = (tagKeyID:string, tagValueLabel:string, vocabulary: Vocabulary) =>
+ (tagKeyID && vocabulary.tags[tagKeyID] && vocabulary.tags[tagKeyID].values)
+ ? Object.keys(vocabulary.tags[tagKeyID].values!).find(
+ k => vocabulary.tags[tagKeyID].values![k].labels.find(
+ l => l.label === tagValueLabel) !== undefined) || ''
+ : '';
+
+export const getTagValueLabel = (tagKeyID:string, tagValueID:string, vocabulary: Vocabulary) =>
+ vocabulary.tags[tagKeyID] &&
+ vocabulary.tags[tagKeyID].values &&
+ vocabulary.tags[tagKeyID].values![tagValueID] &&
+ vocabulary.tags[tagKeyID].values![tagValueID].labels.length > 0
+ ? vocabulary.tags[tagKeyID].values![tagValueID].labels[0].label
+ : tagValueID;
+
+const compare = (a: PropFieldSuggestion, b: PropFieldSuggestion) => {
+ if (a.label < b.label) {return -1;}
+ if (a.label > b.label) {return 1;}
+ return 0;
+};
+
+export const getTagValues = (tagKeyID: string, vocabulary: Vocabulary) => {
+ const tag = vocabulary.tags[tagKeyID];
+ const ret = tag && tag.values
+ ? Object.keys(tag.values).map(
+ tagValueID => tag.values![tagValueID].labels && tag.values![tagValueID].labels.length > 0
+ ? tag.values![tagValueID].labels.map(
+ lbl => Object.assign({}, {"id": tagValueID, "label": lbl.label}))
+ : [{"id": tagValueID, "label": tagValueID}])
+ .reduce((prev, curr) => [...prev, ...curr], [])
+ .sort(compare)
+ : [];
+ return ret;
+};
+
+export const getTags = ({ tags }: Vocabulary) => {
+ const ret = tags && Object.keys(tags)
+ ? Object.keys(tags).map(
+ tagID => tags[tagID].labels && tags[tagID].labels.length > 0
+ ? tags[tagID].labels.map(
+ lbl => Object.assign({}, {"id": tagID, "label": lbl.label}))
+ : [{"id": tagID, "label": tagID}])
+ .reduce((prev, curr) => [...prev, ...curr], [])
+ .sort(compare)
+ : [];
+ return ret;
+};
+
+export const getTagKeyID = (tagKeyLabel:string, vocabulary: Vocabulary) =>
+ Object.keys(vocabulary.tags).find(
+ k => vocabulary.tags[k].labels.find(
+ l => l.label === tagKeyLabel) !== undefined
+ ) || '';
+
+export const getTagKeyLabel = (tagKeyID:string, vocabulary: Vocabulary) =>
+ vocabulary.tags[tagKeyID] && vocabulary.tags[tagKeyID].labels.length > 0
+ ? vocabulary.tags[tagKeyID].labels[0].label
+ : tagKeyID;
//
// SPDX-License-Identifier: AGPL-3.0
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
export class SearchService {
private recentQueries = this.getRecentQueries();
- private savedQueries: SearchBarAdvanceFormData[] = this.getSavedQueries();
+ private savedQueries: SearchBarAdvancedFormData[] = this.getSavedQueries();
saveRecentQuery(query: string) {
if (this.recentQueries.length >= MAX_NUMBER_OF_RECENT_QUERIES) {
return JSON.parse(localStorage.getItem('recentQueries') || '[]');
}
- saveQuery(data: SearchBarAdvanceFormData) {
+ saveQuery(data: SearchBarAdvancedFormData) {
this.savedQueries.push({...data});
localStorage.setItem('savedQueries', JSON.stringify(this.savedQueries));
}
- editSavedQueries(data: SearchBarAdvanceFormData) {
+ editSavedQueries(data: SearchBarAdvancedFormData) {
const itemIndex = this.savedQueries.findIndex(item => item.queryName === data.queryName);
this.savedQueries[itemIndex] = {...data};
localStorage.setItem('savedQueries', JSON.stringify(this.savedQueries));
}
getSavedQueries() {
- return JSON.parse(localStorage.getItem('savedQueries') || '[]') as SearchBarAdvanceFormData[];
+ return JSON.parse(localStorage.getItem('savedQueries') || '[]') as SearchBarAdvancedFormData[];
}
deleteSavedQuery(id: number) {
uuid, {
properties: {
...JSON.parse(JSON.stringify(item.properties)),
- [data.key]: data.value
+ [data.keyID || data.key]: data.valueID || data.value
}
}
);
- item.properties[data.key] = data.value;
+ item.properties = updatedCollection.properties;
dispatch(resourcesActions.SET_RESOURCES([updatedCollection]));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Tag has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
return updatedCollection;
dispatch(startSubmit(PROJECT_PROPERTIES_FORM_NAME));
try {
if (project) {
- project.properties[data.key] = data.value;
- const updatedProject = await services.projectService.update(project.uuid, { properties: project.properties });
+ const updatedProject = await services.projectService.update(
+ project.uuid, {
+ properties: {
+ ...JSON.parse(JSON.stringify(project.properties)),
+ [data.keyID || data.key]: data.valueID || data.value
+ }
+ }
+ );
dispatch(resourcesActions.SET_RESOURCES([updatedProject]));
dispatch(snackbarActions.OPEN_SNACKBAR({ message: "Property has been successfully added.", hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
dispatch(stopSubmit(PROJECT_PROPERTIES_FORM_NAME));
import { ofType, unionize, UnionOf } from "~/common/unionize";
import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service';
import { Dispatch } from 'redux';
-import { arrayPush, change, initialize } from 'redux-form';
+import { change, initialize, untouch } from 'redux-form';
import { RootState } from '~/store/store';
import { initUserProject, treePickerActions } from '~/store/tree-picker/tree-picker-actions';
import { ServiceRepository } from '~/services/services';
import { SearchView } from '~/store/search-bar/search-bar-reducer';
import { navigateTo, navigateToSearchResults } from '~/store/navigation/navigation-action';
import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
-import { PropertyValue, SearchBarAdvanceFormData } from '~/models/search-bar';
+import { PropertyValue, SearchBarAdvancedFormData } from '~/models/search-bar';
import * as _ from "lodash";
import { getModifiedKeysValues } from "~/common/objects";
import { activateSearchBarProject } from "~/store/search-bar/search-bar-tree-actions";
import { ListResults } from "~/services/common-service/common-service";
import * as parser from './search-query/arv-parser';
import { Keywords } from './search-query/arv-parser';
+import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "~/models/vocabulary";
export const searchBarActions = unionize({
SET_CURRENT_VIEW: ofType<string>(),
CLOSE_SEARCH_VIEW: ofType<{}>(),
SET_SEARCH_RESULTS: ofType<GroupContentsResource[]>(),
SET_SEARCH_VALUE: ofType<string>(),
- SET_SAVED_QUERIES: ofType<SearchBarAdvanceFormData[]>(),
+ SET_SAVED_QUERIES: ofType<SearchBarAdvancedFormData[]>(),
SET_RECENT_QUERIES: ofType<string[]>(),
- UPDATE_SAVED_QUERY: ofType<SearchBarAdvanceFormData[]>(),
+ UPDATE_SAVED_QUERY: ofType<SearchBarAdvancedFormData[]>(),
SET_SELECTED_ITEM: ofType<string>(),
MOVE_UP: ofType<{}>(),
MOVE_DOWN: ofType<{}>(),
export type SearchBarActions = UnionOf<typeof searchBarActions>;
-export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName';
+export const SEARCH_BAR_ADVANCED_FORM_NAME = 'searchBarAdvancedFormName';
-export const SEARCH_BAR_ADVANCE_FORM_PICKER_ID = 'searchBarAdvanceFormPickerId';
+export const SEARCH_BAR_ADVANCED_FORM_PICKER_ID = 'searchBarAdvancedFormPickerId';
export const DEFAULT_SEARCH_DEBOUNCE = 1000;
}
};
-export const searchAdvanceData = (data: SearchBarAdvanceFormData) =>
+export const searchAdvancedData = (data: SearchBarAdvancedFormData) =>
async (dispatch: Dispatch, getState: () => RootState) => {
dispatch<any>(saveQuery(data));
const searchValue = getState().searchBar.searchValue;
dispatch(navigateToSearchResults(searchValue));
};
-export const setSearchValueFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) =>
+export const setSearchValueFromAdvancedData = (data: SearchBarAdvancedFormData, prevData?: SearchBarAdvancedFormData) =>
(dispatch: Dispatch, getState: () => RootState) => {
const searchValue = getState().searchBar.searchValue;
const value = getQueryFromAdvancedData({
dispatch(searchBarActions.SET_SEARCH_VALUE(value));
};
-export const setAdvancedDataFromSearchValue = (search: string) =>
+export const setAdvancedDataFromSearchValue = (search: string, vocabulary: Vocabulary) =>
async (dispatch: Dispatch) => {
- const data = getAdvancedDataFromQuery(search);
- dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data));
+ const data = getAdvancedDataFromQuery(search, vocabulary);
+ dispatch<any>(initialize(SEARCH_BAR_ADVANCED_FORM_NAME, data));
if (data.projectUuid) {
await dispatch<any>(activateSearchBarProject(data.projectUuid));
- dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID, id: data.projectUuid }));
+ dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID, id: data.projectUuid }));
}
};
-const saveQuery = (data: SearchBarAdvanceFormData) =>
+const saveQuery = (data: SearchBarAdvancedFormData) =>
(dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
const savedQueries = services.searchService.getSavedQueries();
if (data.saveQuery && data.queryName) {
return savedSearchQueries || [];
};
-export const editSavedQuery = (data: SearchBarAdvanceFormData) =>
+export const editSavedQuery = (data: SearchBarAdvancedFormData) =>
(dispatch: Dispatch<any>) => {
dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED));
dispatch(searchBarActions.SET_SEARCH_VALUE(getQueryFromAdvancedData(data)));
- dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data));
+ dispatch<any>(initialize(SEARCH_BAR_ADVANCED_FORM_NAME, data));
};
export const openSearchView = () =>
export const closeAdvanceView = () =>
(dispatch: Dispatch<any>) => {
dispatch(searchBarActions.SET_SEARCH_VALUE(''));
- dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID }));
+ dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID }));
dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC));
};
return value;
};
-export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) => {
+export const getQueryFromAdvancedData = (data: SearchBarAdvancedFormData, prevData?: SearchBarAdvancedFormData) => {
let value = '';
- const flatData = (data: SearchBarAdvanceFormData) => {
+ const flatData = (data: SearchBarAdvancedFormData) => {
const fo = {
searchValue: data.searchValue,
type: data.type,
dateFrom: data.dateFrom,
dateTo: data.dateTo,
};
- (data.properties || []).forEach(p => fo[`prop-"${p.key}"`] = `"${p.value}"`);
+ (data.properties || []).forEach(p => fo[`prop-"${p.keyID || p.key}"`] = `"${p.valueID || p.value}"`);
return fo;
};
['to', 'dateTo']
];
_.union(data.properties, prevData ? prevData.properties : [])
- .forEach(p => keyMap.push([`has:"${p.key}"`, `prop-"${p.key}"`]));
+ .forEach(p => keyMap.push([`has:"${p.keyID || p.key}"`, `prop-"${p.keyID || p.key}"`]));
if (prevData) {
const obj = getModifiedKeysValues(flatData(data), flatData(prevData));
value = buildQueryFromKeyMap({
searchValue: data.searchValue,
...obj
- } as SearchBarAdvanceFormData, keyMap, "reuse");
+ } as SearchBarAdvancedFormData, keyMap, "reuse");
} else {
value = buildQueryFromKeyMap(flatData(data), keyMap, "rebuild");
}
return value;
};
-export const getAdvancedDataFromQuery = (query: string): SearchBarAdvanceFormData => {
+export const getAdvancedDataFromQuery = (query: string, vocabulary?: Vocabulary): SearchBarAdvancedFormData => {
const { tokens, searchString } = parser.parseSearchQuery(query);
const getValue = parser.getValue(tokens);
return {
inTrash: parser.isTrashed(tokens),
dateFrom: getValue(Keywords.FROM) || '',
dateTo: getValue(Keywords.TO) || '',
- properties: parser.getProperties(tokens),
+ properties: vocabulary
+ ? parser.getProperties(tokens).map(
+ p => {
+ return {
+ keyID: p.key,
+ key: getTagKeyLabel(p.key, vocabulary),
+ valueID: p.value,
+ value: getTagValueLabel(p.key, p.value, vocabulary),
+ };
+ })
+ : parser.getProperties(tokens),
saveQuery: false,
queryName: ''
};
return date ? date : '';
};
-export const initAdvanceFormProjectsTree = () =>
+export const initAdvancedFormProjectsTree = () =>
(dispatch: Dispatch) => {
- dispatch<any>(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID));
+ dispatch<any>(initUserProject(SEARCH_BAR_ADVANCED_FORM_PICKER_ID));
};
-export const changeAdvanceFormProperty = (property: string, value: PropertyValue[] | string = '') =>
+export const changeAdvancedFormProperty = (propertyField: string, value: PropertyValue[] | string = '') =>
(dispatch: Dispatch) => {
- dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value));
+ dispatch(change(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField, value));
};
-export const updateAdvanceFormProperties = (propertyValues: PropertyValue) =>
+export const resetAdvancedFormProperty = (propertyField: string) =>
(dispatch: Dispatch) => {
- dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues));
+ dispatch(change(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField, null));
+ dispatch(untouch(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField));
};
export const moveUp = () =>
SearchBarActions
} from '~/store/search-bar/search-bar-actions';
import { GroupContentsResource } from '~/services/groups-service/groups-service';
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
type SearchResult = GroupContentsResource;
export type SearchBarSelectedItem = {
open: boolean;
searchResults: SearchResult[];
searchValue: string;
- savedQueries: SearchBarAdvanceFormData[];
+ savedQueries: SearchBarAdvancedFormData[];
recentQueries: string[];
selectedItem: SearchBarSelectedItem;
}
const makeSelectedItem = (id: string, query?: string): SearchBarSelectedItem => ({ id, query: query ? query : id });
-const makeQueryList = (recentQueries: string[], savedQueries: SearchBarAdvanceFormData[]) => {
+const makeQueryList = (recentQueries: string[], savedQueries: SearchBarAdvancedFormData[]) => {
const recentIds = recentQueries.map((q, idx) => makeSelectedItem(`RQ-${idx}-${q}`, q));
const savedIds = savedQueries.map((q, idx) => makeSelectedItem(`SQ-${idx}-${q.queryName}`, getQueryFromAdvancedData(q)));
return recentIds.concat(savedIds);
import { OrderBuilder } from "~/services/api/order-builder";
import { ProjectResource } from "~/models/project";
import { resourcesActions } from "~/store/resources/resources-actions";
-import { SEARCH_BAR_ADVANCE_FORM_PICKER_ID } from "~/store/search-bar/search-bar-actions";
+import { SEARCH_BAR_ADVANCED_FORM_PICKER_ID } from "~/store/search-bar/search-bar-actions";
const getSearchBarTreeNode = (id: string) => (treePicker: TreePicker) => {
- const searchTree = getTreePicker(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)(treePicker);
+ const searchTree = getTreePicker(SEARCH_BAR_ADVANCED_FORM_PICKER_ID)(treePicker);
return searchTree
? getNode(id)(searchTree)
: undefined;
export const loadSearchBarTreeProjects = (projectUuid: string) =>
async (dispatch: Dispatch, getState: () => RootState) => {
- const treePicker = getTreePicker(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)(getState().treePicker);
+ const treePicker = getTreePicker(SEARCH_BAR_ADVANCED_FORM_PICKER_ID)(getState().treePicker);
const node = treePicker ? getNode(projectUuid)(treePicker) : undefined;
if (node || projectUuid === '') {
await dispatch<any>(loadSearchBarProject(projectUuid));
};
export const getSearchBarTreeNodeAncestorsIds = (id: string) => (treePicker: TreePicker) => {
- const searchTree = getTreePicker(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)(treePicker);
+ const searchTree = getTreePicker(SEARCH_BAR_ADVANCED_FORM_PICKER_ID)(treePicker);
return searchTree
? getNodeAncestorsIds(id)(searchTree)
: [];
...[],
...ancestors.map(ancestor => ancestor.uuid)
],
- pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID
+ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID
}));
- dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id, pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID }));
+ dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ id, pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID }));
};
export const expandSearchBarTreeItem = (id: string) =>
async (dispatch: Dispatch, getState: () => RootState) => {
const node = getSearchBarTreeNode(id)(getState().treePicker);
if (node && !node.expanded) {
- dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID }));
+ dispatch(treePickerActions.TOGGLE_TREE_PICKER_NODE_COLLAPSE({ id, pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID }));
}
};
}
dispatch(treePickerActions.EXPAND_TREE_PICKER_NODES({
ids: getSearchBarTreeNodeAncestorsIds(id)(treePicker),
- pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID
+ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID
}));
dispatch<any>(expandSearchBarTreeItem(id));
};
const loadSearchBarProject = (projectUuid: string) =>
async (dispatch: Dispatch, _: () => RootState, services: ServiceRepository) => {
- dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID }));
+ dispatch(treePickerActions.LOAD_TREE_PICKER_NODE({ id: projectUuid, pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID }));
const params = {
filters: new FilterBuilder()
.addEqual('ownerUuid', projectUuid)
const { items } = await services.projectService.list(params);
dispatch(treePickerActions.LOAD_TREE_PICKER_NODE_SUCCESS({
id: projectUuid,
- pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID,
+ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID,
nodes: items.map(item => initTreeNode({ id: item.uuid, value: item })),
}));
dispatch(resourcesActions.SET_RESOURCES(items));
import { Dispatch } from 'redux';
import { ServiceRepository } from '~/services/services';
import { propertiesActions } from '~/store/properties/properties-actions';
-import { VOCABULARY_PROPERTY_NAME, DEFAULT_VOCABULARY } from './vocabulary-selctors';
+import { VOCABULARY_PROPERTY_NAME, DEFAULT_VOCABULARY } from './vocabulary-selectors';
import { isVocabulary } from '~/models/vocabulary';
export const loadVocabulary = async (dispatch: Dispatch, _: {}, { vocabularyService }: ServiceRepository) => {
export const VOCABULARY_PROPERTY_NAME = 'vocabulary';
export const DEFAULT_VOCABULARY: Vocabulary = {
- strict: false,
+ strict_tags: false,
tags: {},
};
import { DetailsData } from "./details-data";
import { DetailsAttribute } from "~/components/details-attribute/details-attribute";
import { RichTextEditorLink } from '~/components/rich-text-editor-link/rich-text-editor-link';
-import { withStyles, StyleRulesCallback, Chip, WithStyles } from '@material-ui/core';
+import { withStyles, StyleRulesCallback, WithStyles } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
+import { Dispatch } from 'redux';
+import { PropertyChipComponent } from '../resource-properties-form/property-chip';
export class ProjectDetails extends DetailsData<ProjectResource> {
getIcon(className?: string) {
}
});
-
interface ProjectDetailsComponentDataProps {
project: ProjectResource;
}
onClick: () => void;
}
-const mapDispatchToProps = ({ onClick: openProjectPropertiesDialog });
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+ onClick: () => dispatch<any>(openProjectPropertiesDialog()),
+});
type ProjectDetailsComponentProps = ProjectDetailsComponentDataProps & ProjectDetailsComponentActionProps & WithStyles<CssRules>;
</div>
</DetailsAttribute>
{
- Object.keys(project.properties).map(k => {
- return <Chip key={k} className={classes.tag} label={`${k}: ${project.properties[k]}`} />;
- })
+ Object.keys(project.properties).map(k =>
+ <PropertyChipComponent key={k}
+ propKey={k} propValue={project.properties[k]}
+ className={classes.tag} />
+ )
}
</div>
));
// SPDX-License-Identifier: AGPL-3.0
import * as React from "react";
-import { Field, WrappedFieldProps, FieldArray, formValues } from 'redux-form';
+import { Field, WrappedFieldProps, 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 { HomeTreePicker } from '~/views-components/projects-tree-picker/home-tree-picker';
-import { SEARCH_BAR_ADVANCE_FORM_PICKER_ID } from '~/store/search-bar/search-bar-actions';
+import { SEARCH_BAR_ADVANCED_FORM_PICKER_ID } from '~/store/search-bar/search-bar-actions';
import { SearchBarAdvancedPropertiesView } from '~/views-components/search-bar/search-bar-advanced-properties-view';
import { TreeItem } from "~/components/tree/tree";
import { ProjectsTreePickerItem } from "~/views-components/projects-tree-picker/generic-projects-tree-picker";
-import { PropertyKeyInput } from '~/views-components/resource-properties-form/property-key-field';
-import { PropertyValueInput, PropertyValueFieldProps } from '~/views-components/resource-properties-form/property-value-field';
-import { VocabularyProp, connectVocabulary } from '~/views-components/resource-properties-form/property-field-common';
-import { compose } from 'redux';
+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";
const ProjectsPicker = (props: WrappedFieldProps) =>
<div style={{ height: '100px', display: 'flex', flexDirection: 'column', overflow: 'overlay' }}>
<HomeTreePicker
- pickerId={SEARCH_BAR_ADVANCE_FORM_PICKER_ID}
+ pickerId={SEARCH_BAR_ADVANCED_FORM_PICKER_ID}
toggleItemActive={
(_: any, { id }: TreeItem<ProjectsTreePickerItem>) => {
props.input.onChange(id);
name="properties"
component={SearchBarAdvancedPropertiesView} />;
-export const SearchBarKeyField = connectVocabulary(
- ({ vocabulary }: VocabularyProp) =>
- <Field
- name='key'
- component={PropertyKeyInput}
- vocabulary={vocabulary} />);
+export const SearchBarKeyField = () =>
+ <PropertyKeyField skipValidation={true} />;
-export const SearchBarValueField = compose(
- connectVocabulary,
- formValues({ propertyKey: 'key' })
-)(
- (props: PropertyValueFieldProps) =>
- <Field
- name='value'
- component={PropertyValueInput}
- {...props} />);
+export const SearchBarValueField = () =>
+ <PropertyValueField skipValidation={true} />;
export const SearchBarSaveSearchField = () =>
<Field
import { withDialog, WithDialogProps } from "~/store/dialog/with-dialog";
import { ProjectResource } from '~/models/project';
import { PROJECT_PROPERTIES_DIALOG_NAME, deleteProjectProperty } from '~/store/details-panel/details-panel-action';
-import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Chip, withStyles, StyleRulesCallback, WithStyles } from '@material-ui/core';
+import { Dialog, DialogTitle, DialogContent, DialogActions, Button, withStyles, StyleRulesCallback, WithStyles } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
import { ProjectPropertiesForm } from '~/views-components/project-properties-dialog/project-properties-form';
import { getResource } from '~/store/resources/resources';
+import { PropertyChipComponent } from "../resource-properties-form/property-chip";
type CssRules = 'tag';
handleDelete: (key: string) => void;
}
-const mapStateToProps = ({ detailsPanel, resources }: RootState): ProjectPropertiesDialogDataProps => {
- const project = getResource(detailsPanel.resourceUuid)(resources) as ProjectResource;
- return { project };
-};
+const mapStateToProps = ({ detailsPanel, resources, properties }: RootState): ProjectPropertiesDialogDataProps => ({
+ project: getResource(detailsPanel.resourceUuid)(resources) as ProjectResource,
+});
const mapDispatchToProps = (dispatch: Dispatch): ProjectPropertiesDialogActionProps => ({
- handleDelete: (key: string) => dispatch<any>(deleteProjectProperty(key))
+ handleDelete: (key: string) => dispatch<any>(deleteProjectProperty(key)),
});
type ProjectPropertiesDialogProps = ProjectPropertiesDialogDataProps & ProjectPropertiesDialogActionProps & WithDialogProps<{}> & WithStyles<CssRules>;
<DialogTitle>Properties</DialogTitle>
<DialogContent>
<ProjectPropertiesForm />
- {project && project.properties &&
- Object.keys(project.properties).map(k => {
- return <Chip key={k} className={classes.tag}
+ {project && project.properties &&
+ Object.keys(project.properties).map(k =>
+ <PropertyChipComponent
onDelete={() => handleDelete(k)}
- label={`${k}: ${project.properties[k]}`} />;
- })
+ key={k} className={classes.tag}
+ propKey={k} propValue={project.properties[k]} />)
}
</DialogContent>
<DialogActions>
</Button>
</DialogActions>
</Dialog>
-)));
\ No newline at end of file
+ )
+));
\ No newline at end of file
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import * as React from 'react';
+import { Chip } from '@material-ui/core';
+import { connect } from 'react-redux';
+import { RootState } from '~/store/store';
+import * as CopyToClipboard from 'react-copy-to-clipboard';
+import { getVocabulary } from '~/store/vocabulary/vocabulary-selectors';
+import { Dispatch } from 'redux';
+import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { getTagValueLabel, getTagKeyLabel, Vocabulary } from '~/models/vocabulary';
+
+interface PropertyChipComponentDataProps {
+ propKey: string;
+ propValue: string;
+ className: string;
+ vocabulary: Vocabulary;
+}
+
+interface PropertyChipComponentActionProps {
+ onDelete?: () => void;
+ onCopy: (message: string) => void;
+}
+
+type PropertyChipComponentProps = PropertyChipComponentActionProps & PropertyChipComponentDataProps;
+
+const mapStateToProps = ({ properties }: RootState) => ({
+ vocabulary: getVocabulary(properties),
+});
+
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+ onCopy: (message: string) => dispatch(snackbarActions.OPEN_SNACKBAR({
+ message,
+ hideDuration: 2000,
+ kind: SnackbarKind.SUCCESS
+ }))
+});
+
+// Renders a Chip with copyable-on-click tag:value data based on the vocabulary
+export const PropertyChipComponent = connect(mapStateToProps, mapDispatchToProps)(
+ ({ propKey, propValue, vocabulary, className, onCopy, onDelete }: PropertyChipComponentProps) => {
+ const label = `${getTagKeyLabel(propKey, vocabulary)}: ${getTagValueLabel(propKey, propValue, vocabulary)}`;
+ return (
+ <CopyToClipboard key={propKey} text={label} onCopy={() => onCopy("Copied to clipboard")}>
+ <Chip onDelete={onDelete} key={propKey}
+ className={className} label={label} />
+ </CopyToClipboard>
+ );
+ }
+);
// SPDX-License-Identifier: AGPL-3.0
import { connect } from 'react-redux';
-import { WrappedFieldMetaProps, WrappedFieldInputProps, WrappedFieldProps } from 'redux-form';
-import { identity } from 'lodash';
-import { Vocabulary } from '~/models/vocabulary';
+import { change, WrappedFieldMetaProps, WrappedFieldInputProps, WrappedFieldProps } from 'redux-form';
+import { Vocabulary, PropFieldSuggestion } from '~/models/vocabulary';
import { RootState } from '~/store/store';
-import { getVocabulary } from '~/store/vocabulary/vocabulary-selctors';
+import { getVocabulary } from '~/store/vocabulary/vocabulary-selectors';
export interface VocabularyProp {
vocabulary: Vocabulary;
}
-export const mapStateToProps = (state: RootState): VocabularyProp => ({
+export interface ValidationProp {
+ skipValidation?: boolean;
+}
+
+export const mapStateToProps = (state: RootState, ownProps: ValidationProp): VocabularyProp & ValidationProp => ({
+ skipValidation: ownProps.skipValidation,
vocabulary: getVocabulary(state.properties),
});
? meta.error
: '';
-export const handleBlur = ({ onBlur, value }: WrappedFieldInputProps) =>
- () =>
+export const buildProps = ({ input, meta }: WrappedFieldProps) => {
+ return {
+ value: input.value,
+ onChange: input.onChange,
+ items: ITEMS_PLACEHOLDER,
+ renderSuggestion: (item: PropFieldSuggestion) => item.label,
+ error: hasError(meta),
+ helperText: getErrorMsg(meta),
+ };
+};
+
+// Attempts to match a manually typed value label with a value ID, when the user
+// doesn't select the value from the suggestions list.
+export const handleBlur = (
+ fieldName: string,
+ formName: string,
+ { dispatch }: WrappedFieldMetaProps,
+ { onBlur, value }: WrappedFieldInputProps,
+ fieldValue: string) =>
+ () => {
+ dispatch(change(formName, fieldName, fieldValue));
onBlur(value);
+ };
-export const buildProps = ({ input, meta }: WrappedFieldProps) => ({
- value: input.value,
- onChange: input.onChange,
- onBlur: handleBlur(input),
- items: ITEMS_PLACEHOLDER,
- onSelect: input.onChange,
- renderSuggestion: identity,
- error: hasError(meta),
- helperText: getErrorMsg(meta),
-});
+// When selecting a property value, save its ID for later usage.
+export const handleSelect = (
+ fieldName: string,
+ formName: string,
+ { onChange }: WrappedFieldInputProps,
+ { dispatch }: WrappedFieldMetaProps) =>
+ (item: PropFieldSuggestion) => {
+ if (item) {
+ onChange(item.label);
+ dispatch(change(formName, fieldName, item.id));
+ }
+ };
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { WrappedFieldProps, Field } from 'redux-form';
+import { WrappedFieldProps, Field, FormName } from 'redux-form';
import { memoize } from 'lodash';
import { Autocomplete } from '~/components/autocomplete/autocomplete';
-import { Vocabulary } from '~/models/vocabulary';
-import { connectVocabulary, VocabularyProp, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { Vocabulary, getTags, getTagKeyID } from '~/models/vocabulary';
+import { handleSelect, handleBlur, connectVocabulary, VocabularyProp, ValidationProp, buildProps } from '~/views-components/resource-properties-form/property-field-common';
import { TAG_KEY_VALIDATION } from '~/validators/validators';
import { escapeRegExp } from '~/common/regexp.ts';
export const PROPERTY_KEY_FIELD_NAME = 'key';
+export const PROPERTY_KEY_FIELD_ID = 'keyID';
export const PropertyKeyField = connectVocabulary(
- ({ vocabulary }: VocabularyProp) =>
+ ({ vocabulary, skipValidation }: VocabularyProp & ValidationProp) =>
<Field
name={PROPERTY_KEY_FIELD_NAME}
component={PropertyKeyInput}
vocabulary={vocabulary}
- validate={getValidation(vocabulary)} />);
-
-export const PropertyKeyInput = ({ vocabulary, ...props }: WrappedFieldProps & VocabularyProp) =>
- <Autocomplete
- label='Key'
- suggestions={getSuggestions(props.input.value, vocabulary)}
- {...buildProps(props)}
- />;
+ validate={skipValidation ? undefined : getValidation(vocabulary)} />
+);
+
+const PropertyKeyInput = ({ vocabulary, ...props }: WrappedFieldProps & VocabularyProp) =>
+ <FormName children={data => (
+ <Autocomplete
+ label='Key'
+ suggestions={getSuggestions(props.input.value, vocabulary)}
+ onSelect={handleSelect(PROPERTY_KEY_FIELD_ID, data.form, props.input, props.meta)}
+ onBlur={handleBlur(PROPERTY_KEY_FIELD_ID, data.form, props.meta, props.input, getTagKeyID(props.input.value, vocabulary))}
+ {...buildProps(props)}
+ />
+ )} />;
const getValidation = memoize(
(vocabulary: Vocabulary) =>
- vocabulary.strict
+ vocabulary.strict_tags
? [...TAG_KEY_VALIDATION, matchTags(vocabulary)]
: TAG_KEY_VALIDATION);
const matchTags = (vocabulary: Vocabulary) =>
(value: string) =>
- getTagsList(vocabulary).find(tag => tag.includes(value))
+ getTags(vocabulary).find(tag => tag.label === value)
? undefined
: 'Incorrect key';
const getSuggestions = (value: string, vocabulary: Vocabulary) => {
const re = new RegExp(escapeRegExp(value), "i");
- return getTagsList(vocabulary).filter(tag => re.test(tag) && tag !== value);
+ return getTags(vocabulary).filter(tag => re.test(tag.label) && tag.label !== value);
};
-
-const getTagsList = ({ tags }: Vocabulary) =>
- Object.keys(tags);
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { WrappedFieldProps, Field, formValues } from 'redux-form';
+import { WrappedFieldProps, Field, formValues, FormName } from 'redux-form';
import { compose } from 'redux';
import { Autocomplete } from '~/components/autocomplete/autocomplete';
-import { Vocabulary } from '~/models/vocabulary';
-import { PROPERTY_KEY_FIELD_NAME } from '~/views-components/resource-properties-form/property-key-field';
-import { VocabularyProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common';
+import { Vocabulary, isStrictTag, getTagValues, getTagValueID } from '~/models/vocabulary';
+import { PROPERTY_KEY_FIELD_ID } from '~/views-components/resource-properties-form/property-key-field';
+import { handleSelect, handleBlur, VocabularyProp, ValidationProp, connectVocabulary, buildProps } from '~/views-components/resource-properties-form/property-field-common';
import { TAG_VALUE_VALIDATION } from '~/validators/validators';
import { escapeRegExp } from '~/common/regexp.ts';
propertyKey: string;
}
-export type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp;
+type PropertyValueFieldProps = VocabularyProp & PropertyKeyProp & ValidationProp;
export const PROPERTY_VALUE_FIELD_NAME = 'value';
+export const PROPERTY_VALUE_FIELD_ID = 'valueID';
-export const PropertyValueField = compose(
+const connectVocabularyAndPropertyKey = compose(
connectVocabulary,
- formValues({ propertyKey: PROPERTY_KEY_FIELD_NAME })
-)(
- (props: PropertyValueFieldProps) =>
+ formValues({ propertyKey: PROPERTY_KEY_FIELD_ID }),
+);
+
+export const PropertyValueField = connectVocabularyAndPropertyKey(
+ ({ skipValidation, ...props }: PropertyValueFieldProps) =>
<Field
name={PROPERTY_VALUE_FIELD_NAME}
component={PropertyValueInput}
- validate={getValidation(props)}
- {...props} />);
-
-export const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldProps & PropertyValueFieldProps) =>
- <Autocomplete
- label='Value'
- suggestions={getSuggestions(props.input.value, propertyKey, vocabulary)}
- {...buildProps(props)}
- />;
+ validate={skipValidation ? undefined : getValidation(props)}
+ {...props} />
+);
+
+const PropertyValueInput = ({ vocabulary, propertyKey, ...props }: WrappedFieldProps & PropertyValueFieldProps) =>
+ <FormName children={data => (
+ <Autocomplete
+ label='Value'
+ suggestions={getSuggestions(props.input.value, propertyKey, vocabulary)}
+ onSelect={handleSelect(PROPERTY_VALUE_FIELD_ID, data.form, props.input, props.meta)}
+ onBlur={handleBlur(PROPERTY_VALUE_FIELD_ID, data.form, props.meta, props.input, getTagValueID(propertyKey, props.input.value, vocabulary))}
+ {...buildProps(props)}
+ />
+ )} />;
const getValidation = (props: PropertyValueFieldProps) =>
isStrictTag(props.propertyKey, props.vocabulary)
const matchTagValues = ({ vocabulary, propertyKey }: PropertyValueFieldProps) =>
(value: string) =>
- getTagValues(propertyKey, vocabulary).find(v => v.includes(value))
+ getTagValues(propertyKey, vocabulary).find(v => v.label === value)
? undefined
: 'Incorrect value';
const getSuggestions = (value: string, tagName: string, vocabulary: Vocabulary) => {
const re = new RegExp(escapeRegExp(value), "i");
- return getTagValues(tagName, vocabulary).filter(v => re.test(v) && v !== value);
-};
-
-const isStrictTag = (tagName: string, vocabulary: Vocabulary) => {
- const tag = vocabulary.tags[tagName];
- return tag ? tag.strict : false;
-};
-
-const getTagValues = (tagName: string, vocabulary: Vocabulary) => {
- const tag = vocabulary.tags[tagName];
- return tag && tag.values ? tag.values : [];
+ return getTagValues(tagName, vocabulary).filter(v => re.test(v.label) && v.label !== value);
};
import * as React from 'react';
import { InjectedFormProps } from 'redux-form';
import { Grid, withStyles, WithStyles } from '@material-ui/core';
-import { PropertyKeyField, PROPERTY_KEY_FIELD_NAME } from './property-key-field';
-import { PropertyValueField, PROPERTY_VALUE_FIELD_NAME } from './property-value-field';
+import { PropertyKeyField, PROPERTY_KEY_FIELD_NAME, PROPERTY_KEY_FIELD_ID } from './property-key-field';
+import { PropertyValueField, PROPERTY_VALUE_FIELD_NAME, PROPERTY_VALUE_FIELD_ID } from './property-value-field';
import { ProgressButton } from '~/components/progress-button/progress-button';
import { GridClassKey } from '@material-ui/core/Grid';
export interface ResourcePropertiesFormData {
[PROPERTY_KEY_FIELD_NAME]: string;
+ [PROPERTY_KEY_FIELD_ID]: string;
[PROPERTY_VALUE_FIELD_NAME]: string;
+ [PROPERTY_VALUE_FIELD_ID]: string;
}
export type ResourcePropertiesFormProps = InjectedFormProps<ResourcePropertiesFormData> & WithStyles<GridClassKey>;
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
-import { Dispatch } from 'redux';
+import { Dispatch, compose } from 'redux';
import { connect } from 'react-redux';
import { InjectedFormProps, formValueSelector } from 'redux-form';
import { Grid, withStyles, StyleRulesCallback, WithStyles, Button } from '@material-ui/core';
import { RootState } from '~/store/store';
import {
- SEARCH_BAR_ADVANCE_FORM_NAME,
- changeAdvanceFormProperty,
- updateAdvanceFormProperties
+ SEARCH_BAR_ADVANCED_FORM_NAME,
+ changeAdvancedFormProperty,
+ resetAdvancedFormProperty
} from '~/store/search-bar/search-bar-actions';
import { PropertyValue } from '~/models/search-bar';
import { ArvadosTheme } from '~/common/custom-theme';
import { SearchBarKeyField, SearchBarValueField } from '~/views-components/form-fields/search-bar-form-fields';
import { Chips } from '~/components/chips/chips';
import { formatPropertyValue } from "~/common/formatters";
+import { Vocabulary } from '~/models/vocabulary';
+import { connectVocabulary } from '../resource-properties-form/property-field-common';
type CssRules = 'label' | 'button';
pristine: boolean;
propertyValues: PropertyValue;
fields: PropertyValue[];
+ vocabulary: Vocabulary;
}
interface SearchBarAdvancedPropertiesViewActionProps {
setProps: () => void;
- addProp: (propertyValues: PropertyValue) => void;
+ setProp: (propertyValues: PropertyValue, properties: PropertyValue[]) => void;
getAllFields: (propertyValues: PropertyValue[]) => PropertyValue[] | [];
}
& SearchBarAdvancedPropertiesViewActionProps
& InjectedFormProps & WithStyles<CssRules>;
-const selector = formValueSelector(SEARCH_BAR_ADVANCE_FORM_NAME);
+const selector = formValueSelector(SEARCH_BAR_ADVANCED_FORM_NAME);
const mapStateToProps = (state: RootState) => {
return {
- propertyValues: selector(state, 'key', 'value')
+ propertyValues: selector(state, 'key', 'value', 'keyID', 'valueID')
};
};
const mapDispatchToProps = (dispatch: Dispatch) => ({
setProps: (propertyValues: PropertyValue[]) => {
- dispatch<any>(changeAdvanceFormProperty('properties', propertyValues));
+ dispatch<any>(changeAdvancedFormProperty('properties', propertyValues));
},
- addProp: (propertyValues: PropertyValue) => {
- dispatch<any>(updateAdvanceFormProperties(propertyValues));
- dispatch<any>(changeAdvanceFormProperty('key'));
- dispatch<any>(changeAdvanceFormProperty('value'));
+ setProp: (propertyValue: PropertyValue, properties: PropertyValue[]) => {
+ dispatch<any>(changeAdvancedFormProperty(
+ 'properties',
+ [...properties.filter(e => e.keyID! !== propertyValue.keyID!), propertyValue]
+ ));
+ dispatch<any>(resetAdvancedFormProperty('key'));
+ dispatch<any>(resetAdvancedFormProperty('value'));
+ dispatch<any>(resetAdvancedFormProperty('keyID'));
+ dispatch<any>(resetAdvancedFormProperty('valueID'));
},
getAllFields: (fields: any) => {
return fields.getAll() || [];
}
});
-export const SearchBarAdvancedPropertiesView = connect(mapStateToProps, mapDispatchToProps)(
+export const SearchBarAdvancedPropertiesView = compose(
+ connectVocabulary,
+ connect(mapStateToProps, mapDispatchToProps))(
withStyles(styles)(
- ({ classes, fields, propertyValues, setProps, addProp, getAllFields }: SearchBarAdvancedPropertiesViewProps) =>
+ ({ classes, fields, propertyValues, setProps, setProp, getAllFields, vocabulary }: SearchBarAdvancedPropertiesViewProps) =>
<Grid container item xs={12} spacing={16}>
<Grid item xs={2} className={classes.label}>Properties</Grid>
<Grid item xs={4}>
<SearchBarValueField />
</Grid>
<Grid container item xs={2} justify='flex-end' alignItems="center">
- <Button className={classes.button} onClick={() => addProp(propertyValues)}
+ <Button className={classes.button} onClick={() => setProp(propertyValues, getAllFields(fields))}
color="primary"
size='small'
variant="contained"
<Chips values={getAllFields(fields)}
deletable
onChange={setProps}
- getLabel={(field: PropertyValue) => formatPropertyValue(field)} />
+ getLabel={(field: PropertyValue) => formatPropertyValue(field, vocabulary)} />
</Grid>
</Grid>
)
import { compose, Dispatch } from 'redux';
import { Paper, StyleRulesCallback, withStyles, WithStyles, Button, Grid, IconButton, CircularProgress } from '@material-ui/core';
import {
- SEARCH_BAR_ADVANCE_FORM_NAME, SEARCH_BAR_ADVANCE_FORM_PICKER_ID,
- searchAdvanceData,
+ SEARCH_BAR_ADVANCED_FORM_NAME, SEARCH_BAR_ADVANCED_FORM_PICKER_ID,
+ searchAdvancedData,
setSearchValueFromAdvancedData
} from '~/store/search-bar/search-bar-actions';
import { ArvadosTheme } from '~/common/custom-theme';
import { CloseIcon } from '~/components/icon/icon';
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
import {
SearchBarTypeField, SearchBarClusterField, SearchBarProjectField, SearchBarTrashField,
SearchBarDateFromField, SearchBarDateToField, SearchBarPropertiesField,
};
export const SearchBarAdvancedView = compose(
- reduxForm<SearchBarAdvanceFormData, SearchBarAdvancedViewProps>({
- form: SEARCH_BAR_ADVANCE_FORM_NAME,
+ reduxForm<SearchBarAdvancedFormData, SearchBarAdvancedViewProps>({
+ form: SEARCH_BAR_ADVANCED_FORM_NAME,
validate,
- onSubmit: (data: SearchBarAdvanceFormData, dispatch: Dispatch) => {
- dispatch<any>(searchAdvanceData(data));
- dispatch(reset(SEARCH_BAR_ADVANCE_FORM_NAME));
- dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID }));
+ onSubmit: (data: SearchBarAdvancedFormData, dispatch: Dispatch) => {
+ dispatch<any>(searchAdvancedData(data));
+ dispatch(reset(SEARCH_BAR_ADVANCED_FORM_NAME));
+ dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID }));
},
- onChange: (data: SearchBarAdvanceFormData, dispatch: Dispatch, props: any, prevData: SearchBarAdvanceFormData) => {
+ onChange: (data: SearchBarAdvancedFormData, dispatch: Dispatch, props: any, prevData: SearchBarAdvancedFormData) => {
dispatch<any>(setSearchValueFromAdvancedData(data, prevData));
},
}),
import { withStyles, WithStyles, StyleRulesCallback, List, ListItem, ListItemText, ListItemSecondaryAction, Tooltip, IconButton } from '@material-ui/core';
import { ArvadosTheme } from '~/common/custom-theme';
import { RemoveIcon, EditSavedQueryIcon } from '~/components/icon/icon';
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
import { SearchBarSelectedItem } from "~/store/search-bar/search-bar-reducer";
import { getQueryFromAdvancedData } from "~/store/search-bar/search-bar-actions";
});
export interface SearchBarSavedQueriesDataProps {
- savedQueries: SearchBarAdvanceFormData[];
+ savedQueries: SearchBarAdvancedFormData[];
selectedItem: SearchBarSelectedItem;
}
export interface SearchBarSavedQueriesActionProps {
onSearch: (searchValue: string) => void;
deleteSavedQuery: (id: number) => void;
- editSavedQuery: (data: SearchBarAdvanceFormData, id: number) => void;
+ editSavedQuery: (data: SearchBarAdvancedFormData, id: number) => void;
}
type SearchBarSavedQueriesProps = SearchBarSavedQueriesDataProps
// SPDX-License-Identifier: AGPL-3.0
import * as React from 'react';
+import { compose } from 'redux';
import {
IconButton,
Paper,
} from '~/views-components/search-bar/search-bar-advanced-view';
import { KEY_CODE_DOWN, KEY_CODE_ESC, KEY_CODE_UP, KEY_ENTER } from "~/common/codes";
import { debounce } from 'debounce';
+import { Vocabulary } from '~/models/vocabulary';
+import { connectVocabulary } from '../resource-properties-form/property-field-common';
type CssRules = 'container' | 'containerSearchViewOpened' | 'input' | 'view';
currentView: string;
isPopoverOpen: boolean;
debounce?: number;
+ vocabulary?: Vocabulary;
}
export type SearchBarActionProps = SearchBarViewActionProps
loadRecentQueries: () => string[];
moveUp: () => void;
moveDown: () => void;
- setAdvancedDataFromSearchValue: (search: string) => void;
+ setAdvancedDataFromSearchValue: (search: string, vocabulary?: Vocabulary) => void;
}
type SearchBarViewProps = SearchBarDataProps & SearchBarActionProps & WithStyles<CssRules>;
const handleDropdownClick = (e: React.MouseEvent, props: SearchBarViewProps) => {
e.stopPropagation();
- if (props.isPopoverOpen) {
- if (props.currentView === SearchView.ADVANCED) {
- props.closeView();
- } else {
- props.setAdvancedDataFromSearchValue(props.searchValue);
- props.onSetView(SearchView.ADVANCED);
- }
+ if (props.isPopoverOpen && props.currentView === SearchView.ADVANCED) {
+ props.closeView();
} else {
- props.setAdvancedDataFromSearchValue(props.searchValue);
+ props.setAdvancedDataFromSearchValue(props.searchValue, props.vocabulary);
props.onSetView(SearchView.ADVANCED);
}
};
-export const SearchBarView = withStyles(styles)(
+export const SearchBarView = compose(connectVocabulary, withStyles(styles))(
class extends React.Component<SearchBarViewProps> {
debouncedSearch = debounce(() => {
navigateToItem,
editSavedQuery,
changeData,
- submitData, moveUp, moveDown, setAdvancedDataFromSearchValue
+ submitData, moveUp, moveDown, setAdvancedDataFromSearchValue, SEARCH_BAR_ADVANCED_FORM_NAME
} from '~/store/search-bar/search-bar-actions';
import { SearchBarView, SearchBarActionProps, SearchBarDataProps } from '~/views-components/search-bar/search-bar-view';
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
+import { Vocabulary } from '~/models/vocabulary';
const mapStateToProps = ({ searchBar, form }: RootState): SearchBarDataProps => {
return {
searchResults: searchBar.searchResults,
selectedItem: searchBar.selectedItem,
savedQueries: searchBar.savedQueries,
- tags: form.searchBarAdvanceFormName,
- saveQuery: form.searchBarAdvanceFormName &&
- form.searchBarAdvanceFormName.values &&
- form.searchBarAdvanceFormName.values.saveQuery
+ tags: form[SEARCH_BAR_ADVANCED_FORM_NAME],
+ saveQuery: form[SEARCH_BAR_ADVANCED_FORM_NAME] &&
+ form[SEARCH_BAR_ADVANCED_FORM_NAME].values &&
+ form[SEARCH_BAR_ADVANCED_FORM_NAME].values!.saveQuery
};
};
deleteSavedQuery: (id: number) => dispatch<any>(deleteSavedQuery(id)),
openSearchView: () => dispatch<any>(openSearchView()),
navigateTo: (uuid: string) => dispatch<any>(navigateToItem(uuid)),
- editSavedQuery: (data: SearchBarAdvanceFormData) => dispatch<any>(editSavedQuery(data)),
+ editSavedQuery: (data: SearchBarAdvance
dFormData) => dispatch<any>(editSavedQuery(data)),
moveUp: () => dispatch<any>(moveUp()),
moveDown: () => dispatch<any>(moveDown()),
- setAdvancedDataFromSearchValue: (search: string) => dispatch<any>(setAdvancedDataFromSearchValue(search))
+ setAdvancedDataFromSearchValue: (search: string, vocabulary: Vocabulary) => dispatch<any>(setAdvancedDataFromSearchValue(search, vocabulary))
});
export const SearchBar = connect(mapStateToProps, mapDispatchToProps)(SearchBarView);
import * as React from 'react';
import {
StyleRulesCallback, WithStyles, withStyles, Card,
- CardHeader, IconButton, CardContent, Grid, Chip, Tooltip
+ CardHeader, IconButton, CardContent, Grid, Tooltip
} from '@material-ui/core';
import { connect, DispatchProp } from "react-redux";
import { RouteComponentProps } from 'react-router';
import { getResourceData } from "~/store/resources-data/resources-data";
import { ResourceData } from "~/store/resources-data/resources-data-reducer";
import { openDetailsPanel } from '~/store/details-panel/details-panel-action';
-import * as CopyToClipboard from 'react-copy-to-clipboard';
import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
+import { PropertyChipComponent } from '~/views-components/resource-properties-form/property-chip';
type CssRules = 'card' | 'iconHeader' | 'tag' | 'label' | 'value' | 'link';
& WithStyles<CssRules> & RouteComponentProps<{ id: string }>;
export const CollectionPanel = withStyles(styles)(
- connect((state: RootState, props: RouteComponentProps<{ id: string }>) => {
- const item = getResource(props.match.params.id)(state.resources);
- const data = getResourceData(props.match.params.id)(state.resourcesData);
- return { item, data };
- })(
+ connect((state: RootState, props: RouteComponentProps<{ id: string }>) => {
+ const item = getResource(props.match.params.id)(state.resources);
+ const data = getResourceData(props.match.params.id)(state.resourcesData);
+ return { item, data };
+ })(
class extends React.Component<CollectionPanelProps> {
render() {
<CollectionTagForm />
</Grid>
<Grid item xs={12}>
- {
- Object.keys(item.properties).map(k => {
- const label = `${k}: ${item.properties[k]}`;
- return <CopyToClipboard key={k} text={label} onCopy={() => this.onCopy("Copied")}>
- <Chip className={classes.tag}
- onDelete={this.handleDelete(k)}
- label={label} />
- </CopyToClipboard>;
- })
- }
+ {Object.keys(item.properties).map(k =>
+ <PropertyChipComponent
+ key={k} className={classes.tag}
+ onDelete={this.handleDelete(k)}
+ propKey={k} propValue={item.properties[k]} />
+ )}
</Grid>
</Grid>
</CardContent>
import { loadDetailsPanel } from '~/store/details-panel/details-panel-action';
import { SearchResultsPanelView } from '~/views/search-results-panel/search-results-panel-view';
import { RootState } from '~/store/store';
-import { SearchBarAdvanceFormData } from '~/models/search-bar';
+import { SearchBarAdvancedFormData } from '~/models/search-bar';
import { User } from "~/models/user";
import { Config } from '~/common/config';
import { Session } from "~/models/session";
export interface SearchResultsPanelDataProps {
- data: SearchBarAdvanceFormData;
+ data: SearchBarAdvancedFormData;
user: User;
sessions: Session[];
remoteHostsConfig: { [key: string]: Config };
projects / arvados-workbench2.git / commitdiff