SHIBUI-1502 Removed empty changes

TIER · Sep 24, 2019 · 2649e8d · 2649e8d
1 parent 2712629
commit 2649e8d
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/ui/src/app/metadata/configuration/component/metadata-configuration.component.html b/ui/src/app/metadata/configuration/component/metadata-configuration.component.html
@@ -1,6 +1,6 @@
 <div *ngIf="configuration">
     <section *ngFor="let section of configuration.sections; let i = index;" class="mb-4">
-        <div class="config-group">
+        <div class="config-group"  *ngIf="section && section.properties && section.properties.length">
             <div class="numbered-header d-flex justify-content-start bg-light align-items-center">
                 <h2 class="title h4 m-0 flex-grow-1">
                     <span *ngIf="numbered"
@@ -33,11 +33,6 @@ <h2 class="title h4 m-0 flex-grow-1">
                         (preview)="onPreview($event)">
                     </object-property>
                 </ng-container>
-                <ng-container *ngIf="!section || !section.properties || !section.properties.length">
-                    <div class="alert">
-                        No Changes
-                    </div>
-                </ng-container>
             </div>
         </div>
     </section>

diff --git a/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts b/ui/src/app/metadata/configuration/container/metadata-comparison.component.ts
@@ -39,8 +39,6 @@ export class MetadataComparisonComponent implements OnDestroy {
         this.numVersions$ = this.store.select(getComparisonConfigurationCount);
         this.type$ = this.store.select(fromReducer.getConfigurationModelType);
 
-        this.versions$.subscribe(console.log);
-
         this.sub = this.limiter.pipe(
             withLatestFrom(this.limited$),
             map(([compare, limit]) => new ViewChanged(!limit))

diff --git a/ui/src/app/metadata/configuration/reducer/index.ts b/ui/src/app/metadata/configuration/reducer/index.ts
@@ -145,6 +145,14 @@ export const getConfigurationModelNameFn =
 export const getConfigurationModelTypeFn =
     (config: Metadata) => config ? ('@type' in config) ? config['@type'] : 'resolver' : null;
 
+export const filterPluginTypes = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
+export const isAdditionalFilter = (type) => filterPluginTypes.indexOf(type) === -1;
+
+export const getVersionModelFiltersFn =
+    (model, kind) => kind === 'provider' ?
+        model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) :
+        null;
+
 // Version History
 
 export const getHistoryState = createSelector(getState, getHistoryStateFn);
@@ -178,8 +186,16 @@ export const getCompareState = createSelector(getState, getCompareStateFn);
 export const getComparisonLoading = createSelector(getCompareState, fromCompare.getComparisonLoading);
 export const getComparisonModels = createSelector(getCompareState, fromCompare.getVersionModels);
 export const getComparisonModelsLoaded = createSelector(getCompareState, fromCompare.getVersionModelsLoaded);
+
+export const getComparisonModelsFilteredFn = (models) => models.map((model) => ({
+    ...model,
+    metadataFilters: getVersionModelFiltersFn(model, model.type)
+}));
+
+export const getComparisonModelsFiltered = createSelector(getComparisonModels, getComparisonModelsFilteredFn);
+
 export const getComparisonConfigurations = createSelector(
-    getComparisonModels,
+    getComparisonModelsFiltered,
     getConfigurationDefinition,
     getConfigurationSchema,
     getConfigurationSectionsFn
@@ -228,13 +244,7 @@ export const getLimitedComparisonConfigurations = createSelector(
 
 export const getRestoreState = createSelector(getState, getRestoreStateFn);
 
-export const filterPluginTypes = ['RequiredValidUntil', 'SignatureValidation', 'EntityRoleWhiteList'];
-export const isAdditionalFilter = (type) => filterPluginTypes.indexOf(type) === -1;
 
-export const getVersionModelFiltersFn =
-    (model, kind) => kind === 'provider' ?
-    model.metadataFilters.filter(filter => isAdditionalFilter(filter['@type'])) :
-    null;
 
 export const getVersionState = createSelector(getState, getVersionStateFn);