fixed merge issues and sample configs

Author: tishko0

live-editing/configs/HierarchicalGridConfigGenerator.ts

@@ -934,6 +934,20 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
             })
         }));
 
+        configs.push(new Config({
+            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts', '/src/app/hierarchical-grid/models.ts',
+                '/projects/app-lob/src/_app-layout.scss', '/projects/app-lob/src/_variables.scss', '/src/app/services/remoteValues.service.ts'],
+            additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
+            appModuleConfig: new AppModuleConfig({
+                imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent', 'IgxSparklineCoreModule', 'IgxSparklineModule',
+                    'RemoteValuesService'],
+                ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],
+                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxSparklineCoreModule', 'IgxSparklineModule'],
+                ngProviders: ['RemoteValuesService']
+            }),
+            component: 'HGridColumnAutoSizingSampleComponent'
+        }));
+
         return configs;
     }
 }

live-editing/configs/app-dv-configs/DVHierarchicalGridConfig.ts

@@ -28,21 +28,6 @@ export class DVHierarchicalGridConfigGenerator implements IConfigGenerator {
             component: 'HGridColumnResizingSampleComponent'
         }));
 
-        configs.push(new Config({
-            additionalFiles: ['/src/app/directives/prevent-scroll.directive.ts', '/src/app/data/singersData.ts', '/src/app/hierarchical-grid/models.ts',
-                '/projects/app-lob/src/_app-layout.scss', '/projects/app-lob/src/_variables.scss', '/src/app/services/remoteValues.service.ts'],
-            additionalDependencies: ['igniteui-angular-charts', 'igniteui-angular-core'],
-            appModuleConfig: new AppModuleConfig({
-                imports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HGridColumnAutoSizingSampleComponent', 'IgxSparklineCoreModule', 'IgxSparklineModule',
-                    'RemoteValuesService'],
-                ngDeclarations: ['HGridColumnAutoSizingSampleComponent'],
-                ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'IgxSparklineCoreModule', 'IgxSparklineModule'],
-                ngProviders: ['RemoteValuesService']
-            }),
-            component: 'HGridColumnAutoSizingSampleComponent'
-        }));
-
-
         return configs;
     }
 }

src/app/grid/grid-routes-data.ts

@@ -117,6 +117,6 @@ export const gridsRoutesData = {
     'grid-crud': { displayName: 'Grid CRUD Operations', parentName: 'Grid'},
     'grid-rowClasses-sample': { displayName: 'Grid rowClasses', parentName: 'Grid'},
     'grid-rowStyles-sample': { displayName: 'Grid rowStyles', parentName: 'Grid'},
-    'grid-columnAutoResizing-sample': { displayName: 'Grid Column Autoresizing', parentName: 'Grid'}
+    'grid-columnAutoResizing-sample': { displayName: 'Grid Column Autoresizing', parentName: 'Grid'},
     'grid-with-rating': { displayName: 'Grid with Rating', parentName: 'Rating' }
 };

src/app/grid/grids.module.ts

@@ -254,7 +254,7 @@ import { GridWithRatingComponent } from './grid-with-rating/grid-with-rating.com
         GridSummaryFormatterComponent,
         GridRowClassesComponent,
         GridRowStylesComponent,
-        GridColumnAutosizingComponent
+        GridColumnAutosizingComponent,
         GridWithRatingComponent
     ],
     imports: [

src/app/hierarchical-grid/hgrid-column-autosizing/hgrid-column-autosizing.component.html

@@ -1,20 +1,20 @@
 <div class="grid__wrapper">
     <igx-hierarchical-grid igxPreventDocumentScroll class="hierarchicalGrid" [data]="localdata" (columnResized)="onResize($event)" [autoGenerate]="false"
-        [height]="'480px'" [width]="'100%'" [rowHeight]="'65px'" #hierarchicalGrid>
+        [height]="'480px'" [rowHeight]="'65px'" #hierarchicalGrid>
         <igx-column field="Artist" [resizable]="true"></igx-column>
-        <igx-column field="Photo" [resizable]="true" [minWidth]="'115px'">
+        <igx-column field="Photo" [resizable]="true" [minWidth]="'115px'" [width]="'auto'">
             <ng-template igxCell let-cell="cell">
                 <div class="cell__inner_2">
                     <img [src]="cell.value" class="photo" />
                 </div>
             </ng-template>
         </igx-column>
-        <igx-column field="Debut" width="auto" [resizable]="true" [minWidth]="'88px'" [maxWidth]="'230px'" dataType="number" [formatter]="formatter"></igx-column>
-        <igx-column field="GrammyNominations" width="auto" header="Grammy Nominations" [resizable]="true"></igx-column>
-        <igx-column field="GrammyAwards" width="auto" header="Grammy Awards" [resizable]="true"></igx-column>
-        <igx-column field="Sales" width="auto" header="Album Sales in last {{ this.years }} years" [width]="'230px'" [filterable]="false" >
+        <igx-column field="Debut" [resizable]="true" [width]="'auto'" [minWidth]="'88px'" [maxWidth]="'230px'" dataType="number" [formatter]="formatter"></igx-column>
+        <igx-column field="GrammyNominations" [width]="'auto'" header="Grammy Nominations" [resizable]="true"></igx-column>
+        <igx-column field="GrammyAwards" [width]="'auto'" header="Grammy Awards" [resizable]="true"></igx-column>
+        <igx-column field="Sales" [width]="'auto'" header="Album Sales in last {{ this.years }} years" [filterable]="false" >
             <ng-template igxCell let-val>
-                <igx-sparkline height="40px" width="220px"
+                <igx-sparkline height="40px"
                     [dataSource]="val"
                     valueMemberPath="Copies"
                     displayType="Line"

src/app/hierarchical-grid/hgrid-column-autosizing/hgrid-column-autosizing.component.ts

@@ -5,7 +5,7 @@ import { RemoteValuesService } from '../../services/remoteValues.service';
 @Component({
     selector: 'hierarchical-grid-column-autosizing',
     styleUrls: ['./hgrid-column-autosizing.component.scss'],
-    templateUrl: '/hgrid-column-autosizing.component.html',
+    templateUrl: './hgrid-column-autosizing.component.html',
     providers: [RemoteValuesService]
 })