Merge branch 'master' into feature/SHIBUI-1517

ui/src/app/admin/component/enable-metadata.component.html

@@ -1,4 +1,9 @@
-<ul class="list-unstyled m-0">
+<resolvers-list
+    [entities]="resolvers$ | async"
+    (delete)="deleteResolver($event)"
+    (toggleEnabled)="toggleResolverEnabled($event)"></resolvers-list>
+
+<!--<ul class="list-unstyled m-0">
     <li *ngFor="let resolver of resolvers$ | async; index as i"
         [ngClass]="{'mt-2': i > 0}"
         aria-label="Provider Item Accordion. Press Spacebar to open">
@@ -13,4 +18,4 @@
             [allowDelete]="true">
         </resolver-item>
     </li>
-</ul>
+</ul>-->

ui/src/app/admin/component/enable-metadata.component.ts

@@ -11,39 +11,25 @@ import * as fromMetadata from '../reducer';
 import { DeleteDialogComponent } from '../../metadata/manager/component/delete-dialog.component';
 import { PreviewEntity } from '../../metadata/domain/action/entity.action';
 import { FileBackedHttpMetadataResolver } from '../../metadata/domain/entity';
-import { RemoveMetadataRequest, UpdateMetadataRequest, LoadMetadataRequest } from '../action/metadata-collection.action';
+import { RemoveMetadataRequest, UpdateMetadataRequest } from '../action/metadata-collection.action';
 
 @Component({
     selector: 'enable-metadata',
     templateUrl: './enable-metadata.component.html'
 })
 
-export class EnableMetadataComponent implements OnInit {
-    resolvers$: Observable<FileBackedHttpMetadataResolver[]>;
-    loading$: Observable<boolean>;
-
-    total$: Observable<number>;
-    page = 1;
-    limit = 8;
-
-    entitiesOpen$: Observable<{ [key: string]: boolean }>;
+export class EnableMetadataComponent {
+    resolvers$: Observable<FileBackedHttpMetadataResolver[]> = this.store
+        .select(fromMetadata.getMetadataCollection)
+        .pipe(
+            map(resolvers => resolvers.map(r => new FileBackedHttpMetadataResolver(r)))
+        );
 
     constructor(
         private store: Store<fromDashboard.DashboardState>,
         private router: Router,
         private modalService: NgbModal
-    ) {
-        this.resolvers$ = this.store
-            .select(fromMetadata.getMetadataCollection)
-            .pipe(
-                map(resolvers => resolvers.map(r => new FileBackedHttpMetadataResolver(r)))
-            );
-        this.loading$ = this.store.select(fromDashboard.getSearchLoading);
-
-        this.total$ = this.resolvers$.pipe(map(list => list.length));
-    }
-
-    ngOnInit(): void {}
+    ) {}
 
     edit(entity: MetadataEntity): void {
         this.router.navigate(['metadata', 'resolver', entity.getId(), 'edit']);
@@ -53,8 +39,8 @@ export class EnableMetadataComponent implements OnInit {
         this.store.dispatch(new PreviewEntity({ id: entity.getId(), entity }));
     }
 
-    toggleResolverEnabled(entity: MetadataResolver, enabled: boolean): void {
-        let update = { ...entity, serviceEnabled: enabled };
+    toggleResolverEnabled(entity: MetadataResolver): void {
+        let update = { ...entity, serviceEnabled: !entity.serviceEnabled };
         this.store.dispatch(new UpdateMetadataRequest(update));
     }
 

ui/src/app/metadata/configuration/reducer/utilities.ts

@@ -4,6 +4,33 @@ import * as utils from '../../domain/utility/configuration';
 import { getSplitSchema } from '../../../wizard/reducer';
 import { SectionProperty } from '../model/section';
 
+function omit(key, obj) {
+    if (!obj) {
+        return obj;
+    }
+    const { [key]: omitted, ...rest } = obj;
+    return rest;
+}
+
+export const rollupDifferences = (prop) => {
+    let updates = {
+        ...prop
+    };
+
+    if (prop.properties) {
+        updates = {
+            ...updates,
+            properties: [
+                ...prop.properties.map(p => rollupDifferences(p))
+            ]
+        };
+    }
+
+    prop.differences = prop.properties.some(p => p.differences);
+
+    return updates;
+};
+
 export const getConfigurationSectionsFn = (models, definition, schema): MetadataConfiguration => {
     return !definition || !schema || !models ? null :
         ({
@@ -38,22 +65,20 @@ export const getConfigurationSectionsFn = (models, definition, schema): Metadata
         });
 };
 
+const getDifferences = (models, prop) => {
+    return models.some((model, index, array) => {
+        if (!array) {
+            return false;
+        }
+        const prop1 = omit('modifiedDate', model[prop.id]);
+        const prop2 = omit('modifiedDate', array[0][prop.id]);
+        return JSON.stringify(prop1) !== JSON.stringify(prop2);
+    });
+};
+
 export const assignValueToProperties = (models, properties, definition: any): any[] => {
     return properties.map(prop => {
-        const differences = models.some((model, index, array) => {
-            if (!array) {
-                return false;
-            }
-            let prop1 = model[prop.id];
-            let prop2 = array[0][prop.id];
-            if (prop1 && prop1.modifiedDate) {
-                let { checkedModifiedDate, checkedProp } = prop1;
-                let { firstModifiedDate, firstProp } = prop2;
-                prop1 = checkedProp;
-                prop2 = firstProp;
-            }
-            return JSON.stringify(prop1) !== JSON.stringify(prop2);
-        });
+        const differences = getDifferences(models, prop);
 
         const widget = prop.type === 'array' && prop.widget && prop.widget.data ? ({
             ...prop.widget,
@@ -72,12 +97,12 @@ export const assignValueToProperties = (models, properties, definition: any): an
             case 'object':
                 return {
                     ...prop,
-                    differences,
                     properties: assignValueToProperties(
                         models.map(model => definition.formatter(model)[prop.id] || {}),
                         prop.properties,
                         definition
-                    )
+                    ),
+                    differences: getDifferences(models, prop)
                 };
             default:
                 return {

ui/src/app/metadata/filter/model/entity-attributes-configuration.filter.ts

@@ -22,7 +22,6 @@ export const EntityAttributesFilterConfiguration: Wizard<MetadataFilter> = {
                 'name',
                 '@type',
                 'resourceId',
-                'version',
                 'filterEnabled',
                 'relyingPartyOverrides'
             ]

ui/src/app/metadata/filter/model/nameid-configuration.filter.ts

@@ -23,7 +23,6 @@ export const NameIDFilterConfiguration: Wizard<MetadataFilter> = {
                 'filterEnabled',
                 '@type',
                 'resourceId',
-                'version',
                 'removeExistingFormats',
                 'formats'
             ]