SHIBUI-704 Implemented url request construction schema

TIER · Nov 16, 2018 · 8a0c2e8 · 8a0c2e8
1 parent fa55443
commit 8a0c2e8
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 9 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,9 +1,5 @@
 {
     "type": "object",
-    "order": [
-        "xmlId",
-        "metadataURL"
-    ],
     "required": [
         "xmlId",
         "metadataURL"

diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.html b/ui/src/app/metadata/provider/container/provider-edit-step.component.html
@@ -10,6 +10,7 @@
         [schema]="schema$ | async"
         [model]="model$ | async"
         [validators]="validators$ | async"
+        [bindings]="bindings$ | async"
         (onChange)="valueChangeSubject.next($event)"
         (onErrorChange)="statusChangeSubject.next($event)"></sf-form>
 </ng-container>
diff --git a/ui/src/app/metadata/provider/container/provider-edit-step.component.ts b/ui/src/app/metadata/provider/container/provider-edit-step.component.ts
@@ -37,6 +37,7 @@ export class ProviderEditStepComponent implements OnDestroy {
     definition$: Observable<Wizard<MetadataProvider>>;
     changes$: Observable<MetadataProvider>;
     step$: Observable<WizardStep>;
+    bindings$: Observable<any>;
 
     validators$: Observable<{ [key: string]: any }>;
 
@@ -50,6 +51,7 @@ export class ProviderEditStepComponent implements OnDestroy {
         this.provider$ = this.store.select(fromProvider.getSelectedProvider);
         this.step$ = this.store.select(fromWizard.getCurrent);
         this.schema$ = this.store.select(fromWizard.getSchema);
+        this.bindings$ = this.definition$.pipe(map(d => d.bindings));
 
         this.step$.subscribe(s => {
             if (s && s.locked) {

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
@@ -109,13 +109,13 @@ export const DynamicHttpMetadataProviderEditor: Wizard<DynamicHttpMetadataProvid
             initialValues: [],
             schema: '/api/ui/MetadataResolver/DynamicHttpMetadataResolver',
             fields: [
-                'enabled',
                 'xmlId',
-                'metadataURL',
+                'metadataRequestURLConstructionScheme',
+                'enabled',
                 'requireValidMetadata',
-                'failFastInitialization',
-                'metadataRequestURLConstructionScheme'
-            ]
+                'failFastInitialization'
+            ],
+            order: ['xmlId', 'metadataRequestURLConstructionScheme', 'enabled', 'requireValidMetadata', 'failFastInitialization']
         },
         {
             id: 'dynamic',

diff --git a/ui/src/app/wizard/model/wizard.ts b/ui/src/app/wizard/model/wizard.ts
@@ -15,6 +15,7 @@ export interface WizardStep {
     fieldsets?: WizardFieldset[];
     summary?: boolean;
     override?: any;
+    order?: string[];
 }
 
 export interface WizardFieldset {

diff --git a/ui/src/app/wizard/reducer/index.ts b/ui/src/app/wizard/reducer/index.ts
@@ -3,6 +3,7 @@ import * as fromWizard from './wizard.reducer';
 import { createFeatureSelector, createSelector } from '@ngrx/store';
 import { Wizard, WizardStep } from '../model';
 import { diff } from 'deep-object-diff';
+import { SchemaService } from '../../schema-form/service/schema.service';
 
 export interface WizardState {
     wizard: fromWizard.State;
@@ -75,6 +76,10 @@ export const getSplitSchema = (schema: any, step: WizardStep) => {
         });
     }
 
+    if (step.order) {
+        s.order = step.order;
+    }
+
     if (schema.definitions) {
         s.definitions = schema.definitions;
     }