Merged in bugfix/SHIBUI-nojira-provider-types (pull request #337)

NOJIRA: fixed issue with date
TIER · Jul 16, 2019 · 6c89c8b · 6c89c8b
2 parents f779862 + e7f5c2e
commit 6c89c8b
Show file tree

Hide file tree

Showing 12 changed files with 93 additions and 92 deletions.
diff --git a/backend/src/main/resources/dynamic-http-metadata-provider.schema.json b/backend/src/main/resources/dynamic-http-metadata-provider.schema.json
@@ -1,11 +1,41 @@
 {
     "type": "object",
     "required": [
+        "name",
+        "@type",
         "xmlId",
         "metadataURL",
         "metadataRequestURLConstructionScheme"
     ],
     "properties": {
+        "name": {
+            "title": "label.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name-dashboard-display-only",
+            "type": "string",
+            "widget": {
+                "id": "string",
+                "help": "message.must-be-unique"
+            }
+        },
+        "@type": {
+            "title": "label.metadata-provider-type",
+            "description": "tooltip.metadata-provider-type",
+            "placeholder": "label.select-metadata-type",
+            "type": "string",
+            "readOnly": true,
+            "widget": {
+                "id": "select",
+                "disabled": true
+            },
+            "oneOf": [
+                {
+                    "enum": [
+                        "DynamicHttpMetadataResolver"
+                    ],
+                    "description": "value.dynamic-http-metadata-provider"
+                }
+            ]
+        },
         "enabled": {
             "title": "label.enable-provider-upon-saving",
             "description": "tooltip.enable-provider-upon-saving",

diff --git a/backend/src/main/resources/file-system-metadata-provider.schema.json b/backend/src/main/resources/file-system-metadata-provider.schema.json
@@ -8,8 +8,8 @@
     ],
     "properties": {
         "name": {
-            "title": "label.service-provider-name-dashboard-display-only",
-            "description": "tooltip.metadata-provider-name",
+            "title": "label.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name-dashboard-display-only",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -29,7 +29,7 @@
             "oneOf": [
                 {
                     "enum": [
-                        "FileSystemMetadataResolver"
+                        "FilesystemMetadataResolver"
                     ],
                     "description": "value.file-system-metadata-provider"
                 }

diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -84,7 +84,6 @@ value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
 value.entity-attributes-filter=EntityAttributes Filter
 value.spdescriptor=SPSSODescriptor
 value.attr-auth-descriptor=AttributeAuthorityDescriptor
-value.dynamic-http-metadata-provider=DynamicHttpMetadataProvider
 value.local-dynamic-metadata-provider=LocalDynamicMetadataProvider
 
 value.md-query-protocol=MetadataQueryProtocol
@@ -409,7 +408,7 @@ label.restore=Restore
 label.compare-selected=Compare Selected
 
 label.saved=Saved
-label.by=by
+label.by=By
 
 message.delete-user-title=Delete User?
 message.delete-user-body=You are requesting to delete a user. If you complete this process the user will be removed. This cannot be undone. Do you wish to continue?

diff --git a/backend/src/main/resources/local-dynamic-metadata-provider.schema.json b/backend/src/main/resources/local-dynamic-metadata-provider.schema.json
@@ -8,8 +8,8 @@
     ],
     "properties": {
         "name": {
-            "title": "label.metadata-provider-name-display-only",
-            "description": "tooltip.metadata-provider-name-display-only",
+            "title": "label.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name-dashboard-display-only",
             "type": "string",
             "widget": {
                 "id": "string",
@@ -29,9 +29,9 @@
             "oneOf": [
                 {
                     "enum": [
-                        "FileSystemMetadataResolver"
+                        "LocalDynamicMetadataResolver"
                     ],
-                    "description": "value.file-system-metadata-provider"
+                    "description": "value.local-dynamic-metadata-provider"
                 }
             ]
         },

diff --git a/ui/src/app/metadata/configuration/component/metadata-header.component.html b/ui/src/app/metadata/configuration/component/metadata-header.component.html
@@ -1,11 +1,12 @@
 <div class="card enabled-status" *ngIf="version">
     <div class="card-body">
-        <h3 class="card-title version-title">
-            <translate-i18n key="label.saved">Saved</translate-i18n>&nbsp;
-            <span class="save-date">{{ version.date | date }}</span>,
-            <translate-i18n key="label.by">by</translate-i18n>&nbsp;
+        <h5 class="card-title version-title">
+            <translate-i18n key="label.saved">Saved</translate-i18n>:&nbsp;
+            <span class="save-date">{{ version.date | date:'medium' }}</span>
+            <br />
+            <translate-i18n key="label.by">By</translate-i18n>:&nbsp;
             <span class="author">{{ version.creator }}</span>
-        </h3>
+        </h5>
         <p class="card-text">
             <span class="badge badge-primary" *ngIf="isEnabled" translate="value.enabled">Enabled</span>
             <span class="badge badge-danger" *ngIf="!isEnabled" translate="value.disabled">Disabled</span>

diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.html
@@ -46,11 +46,12 @@
                                 </div>
                             </td>
                             <td>
-                                <a [routerLink]="['/', 'metadata', 'provider', provider.id, 'configuration', 'options']">{{ provider.name }}</a>
+                                <!--<a [routerLink]="['/', 'metadata', 'provider', provider.id, 'configuration', 'options']">{{ provider.name }}</a>-->
+                                <a href="" (click)="edit(provider, $event)">{{ provider.name }}</a>
                             </td>
                             <td>{{ provider['@type'] }}</td>
                             <td>{{ provider.createdBy }}</td>
-                            <td>{{ provider.createdDate | customDate : '&mdash;' }}</td>
+                            <td>{{ provider.createdDate | customDate }}</td>
                             <td class="text-right">
                                 <span class="badge"
                                     [class.badge-danger]="!provider.enabled"
@@ -63,25 +64,6 @@
                     </tbody>
                 </table>
             </div>
-            <!--
-            <ul class="list-unstyled m-0">
-                <li *ngFor="let provider of providers$ | async; index as i; first as isFirst; last as isLast;"
-                    [class.mt-2]="i > 0">
-                    <provider-item
-                        [index]="i + 1"
-                        [first]="isFirst"
-                        [last]="isLast"
-                        [provider]="provider"
-                        [isOpen]="(providersOpen$ | async)[provider.resourceId]"
-                        (select)="edit(provider)"
-                        (viewFilters)="gotoFilters(provider)"
-                        (toggle)="toggleEntity(provider)"
-                        (changeOrderUp)="updateOrderUp($event)"
-                        (changeOrderDown)="updateOrderDown($event)">
-                    </provider-item>
-                </li>
-            </ul>
-            -->
         </div>
     </div>
 </section>
diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.spec.ts
@@ -93,8 +93,11 @@ describe('Dashboard Providers List Page', () => {
 
     describe('edit method', () => {
         it('should route to the edit page', () => {
+            const evt = new Event('a type');
             spyOn(router, 'navigate');
-            instance.edit(provider);
+            spyOn(evt, 'preventDefault');
+            instance.edit(provider, evt);
+            expect(evt.preventDefault).toHaveBeenCalled();
             expect(router.navigate).toHaveBeenCalledWith(['metadata', 'provider', provider.resourceId, 'edit']);
         });
     });

diff --git a/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts b/ui/src/app/metadata/manager/container/dashboard-providers-list.component.ts
@@ -81,7 +81,8 @@ export class DashboardProvidersListComponent implements OnInit {
         this.router.navigate(['metadata', 'provider', id, page]);
     }
 
-    edit(provider: MetadataProvider): void {
+    edit(provider: MetadataProvider, event: Event): void {
+        event.preventDefault();
         this.view(provider.resourceId, 'edit');
     }
 

diff --git a/ui/src/app/metadata/provider/container/provider-select.component.ts b/ui/src/app/metadata/provider/container/provider-select.component.ts
@@ -20,6 +20,7 @@ import { ClearEditor } from '../action/editor.action';
 
 export class ProviderSelectComponent implements OnDestroy {
     actionsSubscription: Subscription;
+    providerSubscription: Subscription;
 
     provider$: Observable<MetadataProvider>;
 
@@ -31,11 +32,9 @@ export class ProviderSelectComponent implements OnDestroy {
             map(params => new SelectProviderRequest(params.providerId))
         ).subscribe(store);
 
-        this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => {
-            return p;
-        }));
+        this.provider$ = this.store.select(fromProviders.getSelectedProvider).pipe(filter(p => !!p));
 
-        this.provider$.subscribe(provider => {
+        this.providerSubscription = this.provider$.subscribe(provider => {
             this.setDefinition(provider);
         });
     }
@@ -50,6 +49,7 @@ export class ProviderSelectComponent implements OnDestroy {
 
     ngOnDestroy() {
         this.actionsSubscription.unsubscribe();
+        this.providerSubscription.unsubscribe();
         this.store.dispatch(new ClearProvider());
         this.store.dispatch(new ClearWizard());
         this.store.dispatch(new ClearEditor());

diff --git a/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts b/ui/src/app/metadata/provider/model/dynamic-http.provider.form.ts
@@ -6,7 +6,6 @@ export const DynamicHttpMetadataProviderWizard: Wizard<DynamicHttpMetadataProvid
     ...BaseMetadataProviderEditor,
     label: 'DynamicHttpMetadataProvider',
     type: 'DynamicHttpMetadataResolver',
-    bindings: {},
     formatter: (changes: DynamicHttpMetadataProvider) => {
         let base = BaseMetadataProviderEditor.formatter(changes);
         if (base.dynamicMetadataResolverAttributes) {
@@ -136,13 +135,43 @@ export const DynamicHttpMetadataProviderEditor: Wizard<DynamicHttpMetadataProvid
             index: 1,
             initialValues: [],
             fields: [
+                'name',
+                '@type',
                 'xmlId',
                 'metadataRequestURLConstructionScheme',
                 'enabled',
                 'requireValidMetadata',
                 'failFastInitialization'
             ],
-            order: ['xmlId', 'metadataRequestURLConstructionScheme', 'enabled', 'requireValidMetadata', 'failFastInitialization']
+            fieldsets: [
+                {
+                    type: 'section',
+                    class: ['mb-3'],
+                    fields: [
+                        'name',
+                        '@type'
+                    ]
+                },
+                {
+                    type: 'group-lg',
+                    class: ['col-12'],
+                    fields: [
+                        'xmlId',
+                        'metadataRequestURLConstructionScheme',
+                        'enabled',
+                        'requireValidMetadata',
+                        'failFastInitialization'
+                    ]
+                }
+            ],
+            override: {
+                '@type': {
+                    type: 'string',
+                    readOnly: true,
+                    widget: 'string',
+                    oneOf: [{ enum: ['DynamicHttpMetadataResolver'], description: 'value.dynamic-http-metadata-provider' }]
+                }
+            }
         },
         {
             id: 'dynamic',

diff --git a/ui/src/app/metadata/provider/reducer/collection.reducer.ts b/ui/src/app/metadata/provider/reducer/collection.reducer.ts
@@ -21,12 +21,11 @@ export const initialState: CollectionState = adapter.getInitialState({
 export function reducer(state = initialState, action: ProviderCollectionActionsUnion): CollectionState {
     switch (action.type) {
         case ProviderCollectionActionTypes.SELECT_PROVIDER_SUCCESS: {
-            return {
+            return adapter.addOne(action.payload, {
                 ...state,
                 selectedProviderId: action.payload.resourceId
-            };
+            });
         }
-
         case ProviderCollectionActionTypes.LOAD_PROVIDER_SUCCESS: {
             return adapter.addAll(action.payload, {
                 ...state,

diff --git a/ui/src/assets/schema/provider/filebacked-http.schema.json b/ui/src/assets/schema/provider/filebacked-http.schema.json
@@ -15,59 +15,16 @@
     ],
     "required": [
         "name",
+        "@type",
         "xmlId",
         "metadataURL",
         "backingFile",
         "backupFileInitNextRefreshDelay"
     ],
-    "anyOf": [
-        {
-            "properties": {
-                "initializeFromBackupFile": {
-                    "enum": [
-                        true
-                    ]
-                }
-            }
-        },
-        {
-            "properties": {
-                "initializeFromBackupFile": {
-                    "enum": [
-                        false
-                    ]
-                }
-            }
-        }
-    ],
-    "fieldsets": [
-        {
-            "type": "section",
-            "fields": [
-                "name",
-                "@type",
-                "enabled"
-            ]
-        },
-        {
-            "type": "group-lg",
-            "fields": [
-                "xmlId",
-                "metadataURL",
-                "initializeFromBackupFile",
-                "backingFile",
-                "backupFileInitNextRefreshDelay",
-                "requireValidMetadata",
-                "failFastInitialization",
-                "useDefaultPredicateRegistry",
-                "satisfyAnyPredicates"
-            ]
-        }
-    ],
     "properties": {
         "name": {
-            "title": "label.metadata-provider-name",
-            "description": "tooltip.metadata-provider-name",
+            "title": "label.metadata-provider-name-dashboard-display-only",
+            "description": "tooltip.metadata-provider-name-dashboard-display-only",
             "type": "string",
             "widget": {
                 "id": "string",