Skip to content

fix(HGrid): Save State Sample Issue #2344 #2345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 11, 2020
Merged

fix(HGrid): Save State Sample Issue #2344 #2345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
164c51f
fix(HGrid): Save State Sample Issue #2344
Nov 10, 2020
c7fdfa9
Merge branch 'vNext' into teodosiah/fix-hgrid-save-state-sample
zdrawku Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,5 +255,8 @@
"@schematics/angular:directive": {
"prefix": "app"
}
},
"cli": {
"analytics": false
}
}
}
20 changes: 14 additions & 6 deletions live-editing/configs/HierarchicalGridConfigGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ IgxToggleModule} from 'igniteui-angular';
import {AppModuleConfig} from './core/AppModuleConfig';
import {Config} from './core/Config';
import {IConfigGenerator} from './core/IConfigGenerator';
import {Router, RouterModule} from '@angular/router'
export class HierarchicalGridConfigGenerator implements IConfigGenerator {
public additionalImports = {
IgxPreventDocumentScrollModule: '../../src/app/directives/prevent-scroll.directive',
Expand Down Expand Up @@ -718,16 +719,23 @@ export class HierarchicalGridConfigGenerator implements IConfigGenerator {
component: 'HGridRemotePagingDefaultTemplateComponent'
}));

configs.push(new Config({
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
const hGridSaveStateSampleConfig = new Config({
additionalFiles: [
"/src/app/directives/prevent-scroll.directive.ts",
"/src/app/hierarchical-grid/data.ts",
"/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.ts",
"/src/app/hierarchical-grid/hierarchical-grid-save-state/about.component.html"
],
appModuleConfig: new AppModuleConfig({
imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule'],
imports: ['IgxHierarchicalGridModule', 'HGridSaveStateComponent', 'HGridAboutComponent', 'IgxPreventDocumentScrollModule', 'Router', 'RouterModule'],
ngDeclarations: ['HGridSaveStateComponent', 'HGridAboutComponent'],
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule', 'HttpClientModule',
"RouterModule.forRoot([\{component: 'HGridAboutComponent', path: 'hGrid-state-about'},\{component: 'HGridSaveStateComponent', path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])]"]
ngImports: ['IgxPreventDocumentScrollModule', 'IgxHierarchicalGridModule',
"RouterModule.forRoot([\{component: HGridAboutComponent, path: 'hGrid-state-about'},\{component: HGridSaveStateComponent, path: 'hGrid-state'},\{ path: '', redirectTo: '/hGrid-state', pathMatch: 'full' }])"]
}),
component: 'HGridSaveStateComponent'
}));
});
hGridSaveStateSampleConfig.usesRouting = true;
configs.push(hGridSaveStateSampleConfig);

configs.push(new Config({
additionalFiles: ["/src/app/directives/prevent-scroll.directive.ts", "/src/app/hierarchical-grid/data.ts"],
Expand Down
2 changes: 1 addition & 1 deletion src/app/hierarchical-grid/hierarchical-grid-routes-data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export const hierarchicalGridRoutesData = {
"hgrid-keyboard-guide": { displayName: "HGrid Keyboard navigation guide", parentName: "Hierarchical Grid" },
"remote-paging-default-template": { displayName: "HGrid remote paging with default template", parentName: "Hierarchical Grid" },
"hGrid-state": { displayName: "HGrid Save State", parentName: "Hierarchical Grid" },
"hGrid-state-about": { displayName: "About", parentName: "Hierarchical Grid" },
"hGrid-state-about": { displayName: "HGrid About", parentName: "Hierarchical Grid" },
"hGrid-editing-lifecycle": { displayName: "Hierarchical Grid Editing lifecycle", parentName: "Hierarchical Grid" },
"hGrid-cell-selection": {displayName: "HGrid Cell Selection", parentName: "Hierarchical Grid"}
};
1 change: 1 addition & 0 deletions src/app/hierarchical-grid/hierarchical-grid.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ import { HierarchicalGridCellSelectionComponent } from './hierarchical-grid-cell
HGridSummarySampleComponent,
HGridSummaryStylingComponent,
HGridSaveStateComponent,
HGridAboutComponent,
HGridPagingSampleComponent,
HGridPagingStyleSampleComponent,
HGridRemotePagingSampleComponent,
Expand Down