SHIBUI-914 Fixing layout issues

TIER · Oct 18, 2018 · 10ca896 · 10ca896
1 parent 60b3f67
commit 10ca896
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties
@@ -255,7 +255,6 @@ label.default-authentication-methods=Default Authentication Method(s)
 
 label.new-of-type=New { type }
 
-label.filter-name=Filter Name (Dashboard Display Only)
 label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only)
 label.filter-enable=Enable this Filter?
 label.search-criteria=Search Criteria

diff --git a/backend/src/main/resources/i18n/messages_en.properties b/backend/src/main/resources/i18n/messages_en.properties
@@ -237,7 +237,6 @@ label.default-authentication-methods=Default Authentication Method(s)
 
 label.new-of-type=New { type }
 
-label.filter-name=Filter Name (Dashboard Display Only)
 label.metadata-filter-name=Metadata Filter Name (Dashboard Display Only)
 label.filter-enable=Enable this Filter?
 label.search-criteria=Search Criteria

diff --git a/ui/src/app/i18n/effect/message.effect.ts b/ui/src/app/i18n/effect/message.effect.ts
@@ -29,7 +29,6 @@ export class MessageEffects {
         ),
         map(([action, locale]) => locale.replace('-', '_')),
         switchMap(locale => {
-            console.log(locale);
             return this.i18nService.get(locale)
                 .pipe(
                     map(u => new MessagesLoadSuccessAction({ ...u })),

diff --git a/ui/src/app/metadata/filter/effect/collection.effect.ts b/ui/src/app/metadata/filter/effect/collection.effect.ts
@@ -189,7 +189,6 @@ export class FilterCollectionEffects {
         withLatestFrom(this.store.select(fromFilter.getAdditionalFilterOrder)),
         map(([id, order]) => {
             const index = order.indexOf(id);
-            console.log(id, order);
             if (index > 0) {
                 const newOrder = array_move(order, index, index - 1);
                 return new SetOrderFilterRequest(newOrder);

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
@@ -81,16 +81,20 @@ export class ProviderEditStepComponent implements OnDestroy {
                 this.changes$,
                 this.definition$
             ),
-            map(([schema, provider, model, changes, definition]) => ({
-                model: {
-                    ...model,
-                    ...provider,
-                    ...changes
-                },
-                definition
-            })),
-            filter(({ model, definition }) => !definition || !model),
-            map(({ model, definition }) => definition ? definition.formatter(model) : {})
+            map(([schema, provider, model, changes, definition]) => {
+                return ({
+                    model: {
+                        ...model,
+                        ...provider,
+                        ...changes
+                    },
+                    definition
+                });
+            }),
+            filter(({ model, definition }) => definition && model),
+            map(({ model, definition }) => {
+                return definition ? definition.formatter(model) : {};
+            })
         );
 
         this.valueChangeEmitted$.pipe(

diff --git a/ui/src/app/metadata/resolver/effect/collection.effects.ts b/ui/src/app/metadata/resolver/effect/collection.effects.ts
@@ -79,7 +79,6 @@ export class ResolverCollectionEffects {
         ofType<providerActions.AddResolverRequest>(ResolverCollectionActionTypes.ADD_RESOLVER),
         map(action => action.payload),
         map(provider => {
-            console.log(provider);
             return ({
                 ...provider,
                 relyingPartyOverrides: removeNulls(provider.relyingPartyOverrides)

diff --git a/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts b/ui/src/app/metadata/resolver/effect/draft-collection.effects.ts
@@ -75,7 +75,6 @@ export class DraftCollectionEffects {
         ofType<actions.UpdateDraftRequest>(DraftActionTypes.UPDATE_DRAFT_REQUEST),
         map(getPayload),
         switchMap(provider => {
-            console.log(provider);
             return this.draftService
                 .update(provider)
                 .pipe(

diff --git a/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json b/ui/src/assets/schema/provider/filebacked-http-advanced.schema.json
@@ -18,13 +18,15 @@
                 {
                     "title": "label.http-security-attributes",
                     "type": "section",
+                    "class": "col-12",
                     "fields": [
                         "disregardTLSCertificate"
                     ]
                 },
                 {
                     "title": "label.http-proxy-attributes",
                     "type": "section",
+                    "class": "col-12",
                     "fields": [
                         "proxyHost",
                         "proxyPort",
@@ -35,6 +37,7 @@
                 {
                     "title": "label.http-caching-attributes",
                     "type": "section",
+                    "class": "col-12",
                     "fields": [
                         "httpCaching",
                         "httpCacheDirectory",
@@ -45,6 +48,7 @@
                 {
                     "title": "",
                     "type": "hidden",
+                    "class": "col-12",
                     "fields": [
                         "tlsTrustEngineRef",
                         "httpClientSecurityParametersRef",