-
-
{{ property.name }}
-
—
-
+
+
{{ property.name }}
+
+ -
+
+ -
+
+
+
+ {{ item }}
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.html b/ui/src/app/metadata/configuration/component/array-property.component.scss
similarity index 100%
rename from ui/src/app/metadata/configuration/component/configuration-property.component.html
rename to ui/src/app/metadata/configuration/component/array-property.component.scss
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts b/ui/src/app/metadata/configuration/component/array-property.component.spec.ts
index 453d9d484..614738b06 100644
--- a/ui/src/app/metadata/configuration/component/array-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/array-property.component.spec.ts
@@ -21,12 +21,12 @@ class TestHostComponent {
@ViewChild(ArrayPropertyComponent)
public componentUnderTest: ArrayPropertyComponent;
- property: Property = getStepProperty(SCHEMA.properties.list, {
+ property: Property = getStepProperty(SCHEMA.properties.list, [{
name: 'foo',
type: 'baz',
description: 'foo bar baz',
list: []
- }, SCHEMA.definitions);
+ }], SCHEMA.definitions);
setProperty(property: Property): void {
this.property = property;
diff --git a/ui/src/app/metadata/configuration/component/array-property.component.ts b/ui/src/app/metadata/configuration/component/array-property.component.ts
index ff9cd0ac4..a17ad01da 100644
--- a/ui/src/app/metadata/configuration/component/array-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/array-property.component.ts
@@ -1,24 +1,38 @@
-import { Component, Input } from '@angular/core';
+import { Component, Input, OnChanges, Output, EventEmitter } from '@angular/core';
import { Property } from '../../domain/model/property';
import { Observable, of } from 'rxjs';
import { AttributesService } from '../../domain/service/attributes.service';
import { ConfigurationPropertyComponent } from './configuration-property.component';
+import UriValidator from '../../../shared/validation/uri.validator';
@Component({
selector: 'array-property',
templateUrl: './array-property.component.html',
- styleUrls: []
+ styleUrls: ['./array-property.component.scss']
})
-export class ArrayPropertyComponent extends ConfigurationPropertyComponent {
+export class ArrayPropertyComponent extends ConfigurationPropertyComponent implements OnChanges {
@Input() property: Property;
+ @Output() preview: EventEmitter
= new EventEmitter();
+
+ range = [];
+
constructor(
private attrService: AttributesService
) {
super();
}
+ ngOnChanges(): void {
+ const keys = this.property.value.reduce((val, version) => version ? version.length > val ? version.length : val : val, 0);
+ this.range = [...Array(keys).keys()];
+ }
+
+ isUrl(str: string): boolean {
+ return UriValidator.isUri(str);
+ }
+
get attributeList$(): Observable<{ key: string, label: string }[]> {
if (this.property.widget && this.property.widget.hasOwnProperty('data')) {
return of(this.property.widget.data);
diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts b/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts
index 5ef0452e0..aa7fd9478 100644
--- a/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts
+++ b/ui/src/app/metadata/configuration/component/configuration-property.component.spec.ts
@@ -62,7 +62,8 @@ describe('Configuration Property Component', () => {
describe('getItemType method', () => {
it('should return the item`s type', () => {
- expect(app.getItemType({ widget: { id: 'string' } } as Property)).toBe('string');
+ expect(app.getItemType({items: { widget: { id: 'string' } } } as Property)).toBe('string');
+ expect(app.getItemType({items: {}} as Property)).toBe('default');
expect(app.getItemType({} as Property)).toBe('default');
});
});
diff --git a/ui/src/app/metadata/configuration/component/configuration-property.component.ts b/ui/src/app/metadata/configuration/component/configuration-property.component.ts
index bcdd45711..5418bde30 100644
--- a/ui/src/app/metadata/configuration/component/configuration-property.component.ts
+++ b/ui/src/app/metadata/configuration/component/configuration-property.component.ts
@@ -3,12 +3,12 @@ import { Property } from '../../domain/model/property';
@Component({
selector: 'configuration-property',
- template: `{{ property | json }}`,
- styleUrls: []
+ template: `{{ property | json }}`
})
export class ConfigurationPropertyComponent {
@Input() property: Property;
+ @Input() columns = 1;
constructor() { }
@@ -16,8 +16,14 @@ export class ConfigurationPropertyComponent {
return Object.keys(schema.properties);
}
- getItemType(items: Property): string {
- return items.widget ? items.widget.id : 'default';
+ getItemType(property: Property): string {
+ const items = property.items;
+ const def = 'default';
+ return items ? items.widget ? items.widget.id : def : def;
+ }
+
+ get width(): string {
+ return `${ Math.floor(100 / (this.columns + 1)) }%`;
}
}
diff --git a/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
new file mode 100644
index 000000000..b8df62a11
--- /dev/null
+++ b/ui/src/app/metadata/configuration/component/filter-configuration-list-item.component.html
@@ -0,0 +1,47 @@
+
+
{{ index + 1 }}
+
+
+
+
+
+
{{ filter['@type'] }}
+
+ Enabled
+ Disabled
+
+
+
+
+
+
+
+ Edit
+
+
+
+
+
+
+
+
No Filters
+
No filters have been added to this Metadata Provider
+
Current (v{{ i + 1 }}) |
- v{{ i + 1 }} |
- {{ version.date | date }} |
+ Current (v{{ history.length - i }}) |
+ v{{ history.length - (i) }} |
+ {{ version.date | date:'medium' }} |
{{ version.creator }} |
|