Skip to content

Commit

Permalink
Merge pull request #877 from IgniteUI/nrobakova/treeGrid-bundle
Browse files Browse the repository at this point in the history
added treeGrid bundle
  • Loading branch information
zdrawku authored Jan 16, 2019
2 parents 08b88fc + 6c3f7db commit 3aee096
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 58 deletions.
4 changes: 2 additions & 2 deletions live-editing/configs/TreeGridConfigGenerator.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// tslint:disable:max-line-length
import { IgxButtonGroupModule, IgxButtonModule, IgxButtonModule, IgxDialogModule, IgxExcelExporterService, IgxGridModule, IgxIconModule, IgxRippleModule,
IgxSliderModule, IgxSwitchModule, IgxToggleModule, IgxToggleModule, IgxTransactionService, IgxTreeGridModule } from "igniteui-angular";
import { IgxButtonGroupModule, IgxButtonModule, IgxExcelExporterService, IgxGridModule, IgxIconModule, IgxRippleModule,
IgxSliderModule, IgxSwitchModule, IgxToggleModule, IgxTreeGridModule } from "igniteui-angular";
import { TreeGridChilddatakeySampleComponent } from "../../src/app/tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
import { TreeGridFinJSComponent } from "../../src/app/tree-grid/tree-grid-finjs/tree-grid-finjs-sample.component";
import { TreeLocalDataService } from "../../src/app/tree-grid/tree-grid-finjs/treeLocalData.service";
Expand Down
4 changes: 3 additions & 1 deletion live-editing/generators/SampleAssetsGenerator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ import * as MenusRouting from "../../src/app/menus/menus-routing.module";
import * as NotificationsRouting from "../../src/app/notifications/notifications-routing.module";
import * as SchedulingRouting from "../../src/app/scheduling/scheduling-routing.module";
import * as ThemingRouting from "../../src/app/theming/theming-routing.module";
import * as TreeGridRouting from "../../src/app/tree-grid/tree-grid-routing.module";
import { DoughnutChartConfigGenerator } from "../configs/DoughnutChartConfigGenerator";
import { PieChartConfigGenerator } from "./../configs/PieChartConfigGenerator";
import { LiveEditingFile } from "./misc/LiveEditingFile";
Expand Down Expand Up @@ -126,7 +127,8 @@ export class SampleAssetsGenerator extends Generator {
.concat(ListsRouting.listsRoutes)
.concat(InteractionsRouting.interactionsRoutes)
.concat(ExcelLibraryRouting.excelLibraryRoutes)
.concat(LayoutsRouting.layoutsRoutes);
.concat(LayoutsRouting.layoutsRoutes)
.concat(TreeGridRouting.treeGridRoutes);

for (let i = 0; i < routes.length; i++) {
let sample = routes[i];
Expand Down
41 changes: 5 additions & 36 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
GridConditionalCellStyleComponent
} from "./grid/grid-conditional-cell-style/grid-conditional-cell-style.component";
import { GridCRMComponent } from "./grid/grid-crm/grid-crm.component";
import { GridCustomFilteringComponent } from "./grid/grid-custom-filtering/grid-custom-filtering.component";
import {
GridDisplayDensitySampleComponent
} from "./grid/grid-displaydensity-sample/grid-displaydensity-sample.component";
Expand Down Expand Up @@ -99,17 +100,6 @@ import {
import {
TextHighlightSample2Component
} from "./text-highlight/text-highlight-sample-2/text-highlight-sample-2.component";
import { TreeGridBatchEditingSampleComponent } from "./tree-grid/tree-grid-batch-editing/tree-grid-batch-editing-sample.component";
import {
TreeGridChilddatakeySampleComponent
} from "./tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
import {
TreeGridPrimaryforeignkeySampleComponent
} from "./tree-grid/tree-grid-primaryforeignkey-sample/tree-grid-primaryforeignkey-sample.component";
import { TreeGridRowEditSampleComponent } from "./tree-grid/tree-grid-row-edit/tree-grid-row-editing-sample.component";

import { TreeGridFinJSComponent } from "../../src/app/tree-grid/tree-grid-finjs/tree-grid-finjs-sample.component";
import { GridCustomFilteringComponent } from "./grid/grid-custom-filtering/grid-custom-filtering.component";

export const samplesRoutes: Routes = [
{
Expand Down Expand Up @@ -163,6 +153,10 @@ export const samplesRoutes: Routes = [
{
loadChildren: "app/services/services.module#ServicesModule",
path: "services"
},
{
loadChildren: "app/tree-grid/tree-grid.module#TreeGridModule",
path: "tree-grid"
},
// excel library samples with lazy loading:
// {
Expand Down Expand Up @@ -573,31 +567,6 @@ export const samplesRoutes: Routes = [
component: TextHighlightSample2Component,
data: { displayName: "Search within multiple containers", parentName: "Text Highlight" },
path: "text-highlight-2"
},
{
component: TreeGridBatchEditingSampleComponent,
data: { displayName: "TreeGrid Batch Editing", parentName: "TreeGrid" },
path: "treegrid-batchediting"
},
{
component: TreeGridChilddatakeySampleComponent,
data: { displayName: "TreeGrid ChildDataKey", parentName: "TreeGrid" },
path: "treegrid-childdatakey"
},
{
component: TreeGridPrimaryforeignkeySampleComponent,
data: { displayName: "TreeGrid Primary/Foreign key", parentName: "TreeGrid" },
path: "treegrid-primaryforeignkey"
},
{
component: TreeGridRowEditSampleComponent,
data: { displayName: "TreeGrid Row Editing", parentName: "TreeGrid" },
path: "treegrid-row-edit"
},
{
component: TreeGridFinJSComponent,
data: { displayName: "TreeGrid Finance demo sample", parentName: "TreeGrid" },
path: "treegrid-finjs-sample"
}
];
export const appRoutes: Routes = [
Expand Down
20 changes: 1 addition & 19 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ import {
IgxTooltipModule,
IgxTreeGridModule
} from "igniteui-angular";
import { TreeGridFinJSComponent } from "../../src/app/tree-grid/tree-grid-finjs/tree-grid-finjs-sample.component";
import { AppRoutingModule } from "./app-routing.module";
import { AppComponent } from "./app.component";
import { BadgeSample1Component } from "./badge/badge-sample-1/badge-sample-1.component";
Expand Down Expand Up @@ -158,18 +157,6 @@ import {
import {
TextHighlightSample2Component
} from "./text-highlight/text-highlight-sample-2/text-highlight-sample-2.component";
import {
TreeGridBatchEditingSampleComponent
} from "./tree-grid/tree-grid-batch-editing/tree-grid-batch-editing-sample.component";
import {
TreeGridChilddatakeySampleComponent
} from "./tree-grid/tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
import {
TreeGridPrimaryforeignkeySampleComponent
} from "./tree-grid/tree-grid-primaryforeignkey-sample/tree-grid-primaryforeignkey-sample.component";
import {
TreeGridRowEditSampleComponent
} from "./tree-grid/tree-grid-row-edit/tree-grid-row-editing-sample.component";

@NgModule({
bootstrap: [AppComponent],
Expand Down Expand Up @@ -264,16 +251,11 @@ import {
FinJSDemoComponent,
SvgIconSampleComponent,
DropdownMenuComponent,
TreeGridChilddatakeySampleComponent,
TreeGridPrimaryforeignkeySampleComponent,
GridWithTransactionsComponent,
GridBatchEditingSampleComponent,
GridRowEditSampleComponent,
TreeGridRowEditSampleComponent,
TreeGridBatchEditingSampleComponent,
GridRowEditSampleComponent,
GridCustomFilteringComponent,
TreeGridFinJSComponent
GridCustomFilteringComponent
],
imports: [
IgxDropDownModule,
Expand Down
6 changes: 6 additions & 0 deletions src/app/index/index.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { notificationsRoutes } from "../notifications/notifications-routing.modu
import { schedulingRoutes } from "../scheduling/scheduling-routing.module";
import { servicesRoutes } from "../services/services-routing.module";
import { themingRoutes } from "../theming/theming-routing.module";
import { treeGridRoutes } from "../tree-grid/tree-grid-routing.module";

@Component({
selector: "app-index",
Expand Down Expand Up @@ -89,6 +90,11 @@ export class IndexComponent implements OnInit, AfterViewInit {
path: "services",
routes: servicesRoutes
}
,
{
path: "tree-grid",
routes: treeGridRoutes
}
];

private allNavItems: INavigationItem[] = [];
Expand Down
51 changes: 51 additions & 0 deletions src/app/tree-grid/tree-grid-routing.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
import { NgModule } from "@angular/core";
import { RouterModule, Routes } from "@angular/router";
import {
TreeGridBatchEditingSampleComponent
} from "./tree-grid-batch-editing/tree-grid-batch-editing-sample.component";
import {
TreeGridChilddatakeySampleComponent
} from "./tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
import { TreeGridFinJSComponent } from "./tree-grid-finjs/tree-grid-finjs-sample.component";
import {
TreeGridPrimaryforeignkeySampleComponent
} from "./tree-grid-primaryforeignkey-sample/tree-grid-primaryforeignkey-sample.component";
import { TreeGridRowEditSampleComponent } from "./tree-grid-row-edit/tree-grid-row-editing-sample.component";

export const treeGridRoutes: Routes = [
{
component: TreeGridChilddatakeySampleComponent,
data: { displayName: "TreeGrid ChildDataKey", parentName: "TreeGrid" },
path: "treegrid-childdatakey"
},
{
component: TreeGridPrimaryforeignkeySampleComponent,
data: { displayName: "TreeGrid Primary/Foreign key", parentName: "TreeGrid" },
path: "treegrid-primaryforeignkey"
},
{
component: TreeGridRowEditSampleComponent,
data: { displayName: "TreeGrid Row Editing", parentName: "TreeGrid" },
path: "treegrid-row-edit"
},
{
component: TreeGridFinJSComponent,
data: { displayName: "TreeGrid Finance demo sample", parentName: "TreeGrid" },
path: "treegrid-finjs-sample"
},
{
component: TreeGridBatchEditingSampleComponent,
data: { displayName: "TreeGrid Batch Editing", parentName: "TreeGrid" },
path: "treegrid-batchediting"
}
];

@NgModule({
exports: [
RouterModule
],
imports: [
RouterModule.forChild(treeGridRoutes)
]
})
export class TreeGridRoutingModule { }
53 changes: 53 additions & 0 deletions src/app/tree-grid/tree-grid.module.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
import { FormsModule } from "@angular/forms";
import {
IgxButtonGroupModule,
IgxButtonModule,
IgxDialogModule,
IgxGridModule,
IgxIconModule,
IgxRippleModule,
IgxSliderModule,
IgxSwitchModule,
IgxToggleModule,
IgxTreeGridModule
} from "igniteui-angular";
import {
TreeGridBatchEditingSampleComponent
} from "./tree-grid-batch-editing/tree-grid-batch-editing-sample.component";
import {
TreeGridChilddatakeySampleComponent
} from "./tree-grid-childdatakey-sample/tree-grid-childdatakey-sample.component";
import { TreeGridFinJSComponent } from "./tree-grid-finjs/tree-grid-finjs-sample.component";
import {
TreeGridPrimaryforeignkeySampleComponent
} from "./tree-grid-primaryforeignkey-sample/tree-grid-primaryforeignkey-sample.component";
import { TreeGridRoutingModule } from "./tree-grid-routing.module";
import { TreeGridRowEditSampleComponent } from "./tree-grid-row-edit/tree-grid-row-editing-sample.component";

@NgModule({
declarations: [
TreeGridChilddatakeySampleComponent,
TreeGridPrimaryforeignkeySampleComponent,
TreeGridRowEditSampleComponent,
TreeGridBatchEditingSampleComponent,
TreeGridFinJSComponent
],
imports: [
CommonModule,
FormsModule,
TreeGridRoutingModule,
IgxTreeGridModule,
IgxGridModule,
IgxButtonGroupModule,
IgxIconModule,
IgxSliderModule,
IgxToggleModule,
IgxButtonModule,
IgxSwitchModule,
IgxRippleModule,
IgxDialogModule
]
})
export class TreeGridModule { }

0 comments on commit 3aee096

Please sign in to comment.