X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/45ee419ff7952fc722a139666c327a321a92cc81..cfa81dfc3041cb459c8a0918a2732dfcf3a11d40:/src/models/vocabulary.ts diff --git a/src/models/vocabulary.ts b/src/models/vocabulary.ts index 158d8058..6c629059 100644 --- a/src/models/vocabulary.ts +++ b/src/models/vocabulary.ts @@ -2,6 +2,7 @@ // // SPDX-License-Identifier: AGPL-3.0 +import { escapeRegExp } from 'common/regexp'; import { isObject, has, every } from 'lodash/fp'; export interface Vocabulary { @@ -25,8 +26,9 @@ export interface Tag { } export interface PropFieldSuggestion { - "id": string; - "label": string; + id: string; + label: string; + synonyms?: string[]; } const VOCABULARY_VALIDATORS = [ @@ -47,43 +49,94 @@ export const getTagValueID = (tagKeyID:string, tagValueLabel:string, 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) || '' + l => l.label.toLowerCase() === tagValueLabel.toLowerCase()) !== 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) => { +export const getTagValues = (tagKeyID: string, vocabulary: Vocabulary): PropFieldSuggestion[] => { const tag = vocabulary.tags[tagKeyID]; - const ret = tag && tag.values + return tag && tag.values ? Object.keys(tag.values).map( - tagValueID => tag.values![tagValueID].labels + 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) +export const getPreferredTagValues = (tagKeyID: string, vocabulary: Vocabulary, withMatch?: string): PropFieldSuggestion[] => { + const tag = vocabulary.tags[tagKeyID]; + const regex = !!withMatch ? new RegExp(escapeRegExp(withMatch), 'i') : undefined; + return tag && tag.values + ? Object.keys(tag.values).map( + tagValueID => tag.values![tagValueID].labels && tag.values![tagValueID].labels.length > 0 + ? { + "id": tagValueID, + "label": tag.values![tagValueID].labels[0].label, + "synonyms": !!withMatch && tag.values![tagValueID].labels.length > 1 + ? tag.values![tagValueID].labels.slice(1) + .filter(l => !!regex ? regex.test(l.label) : true) + .map(l => l.label) + : [] + } + : {"id": tagValueID, "label": tagValueID, "synonyms": []}) + .sort(compare) + : []; +}; + +export const getTags = ({ tags }: Vocabulary): PropFieldSuggestion[] => { + return tags && Object.keys(tags) ? Object.keys(tags).map( - tagID => tags[tagID].labels + 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 getPreferredTags = ({ tags }: Vocabulary, withMatch?: string): PropFieldSuggestion[] => { + const regex = !!withMatch ? new RegExp(escapeRegExp(withMatch), 'i') : undefined; + return tags && Object.keys(tags) + ? Object.keys(tags).map( + tagID => tags[tagID].labels && tags[tagID].labels.length > 0 + ? { + "id": tagID, + "label": tags[tagID].labels[0].label, + "synonyms": !!withMatch && tags[tagID].labels.length > 1 + ? tags[tagID].labels.slice(1) + .filter(l => !!regex ? regex.test(l.label) : true) + .map(lbl => lbl.label) + : [] + } + : {"id": tagID, "label": tagID, "synonyms": []}) + .sort(compare) + : []; }; export const getTagKeyID = (tagKeyLabel:string, vocabulary: Vocabulary) => Object.keys(vocabulary.tags).find( k => vocabulary.tags[k].labels.find( - l => l.label === tagKeyLabel) !== undefined) || ''; + l => l.label.toLowerCase() === tagKeyLabel.toLowerCase()) !== undefined + ) || ''; + +export const getTagKeyLabel = (tagKeyID:string, vocabulary: Vocabulary) => + vocabulary.tags[tagKeyID] && vocabulary.tags[tagKeyID].labels.length > 0 + ? vocabulary.tags[tagKeyID].labels[0].label + : tagKeyID;