hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 07:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improved icons handler in chips.component.ts

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-07-11 18:45:56 +02:00
parent 683c2f2f6b
commit c4f1738520
9 changed files with 191 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/shared/chips/models/chips.model.ts
View File

@@ -1,9 +1,7 @@
import { findIndex, isEqual } from 'lodash';
import { findIndex, isEqual, isObject } from 'lodash';
import { BehaviorSubject } from 'rxjs/BehaviorSubject';
import { ChipsItem, ChipsItemIcon } from './chips-item.model';
import { hasValue } from '../../empty.util';
import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
import { AuthorityValueModel } from '../../../core/integration/models/authority-value.model';
export interface ChipsIconsConfig {
[metadata: string]: string;
@@ -99,15 +97,25 @@ export class Chips {
Object.keys(item)
.forEach((metadata) => {
const value = item[metadata];
if (hasValue(value)
&& (value instanceof FormFieldMetadataValueObject || value instanceof AuthorityValueModel)
&& ((value as FormFieldMetadataValueObject).authority || (value as AuthorityValueModel).id)
&& this.iconsConfig.hasOwnProperty(metadata)) {
if (hasValue(value) && isObject(value) && this.iconsConfig.hasOwnProperty(metadata)) {
const icon: ChipsItemIcon = {
style: this.iconsConfig[metadata]
};
icons.push(icon);
let icon: ChipsItemIcon;
const hasAuthority: boolean = ((value.hasOwnProperty('authority') && value.authority)
|| (value.hasOwnProperty('id') && value.id)) ? true : false;
// Set icons
if ((this.displayObj && this.displayObj === metadata && hasAuthority)
|| (this.displayObj && this.displayObj !== metadata)) {
icon = {
metadata,
hasAuthority: hasAuthority,
style: this.iconsConfig[metadata]
};
}
if (icon) {
icons.push(icon);
}
}
});