Skip to content

Commit d57582a

Browse files
fix navigation type
1 parent 28b127d commit d57582a

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed
Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
export const navigation: { path?: string, text: string, icon: string, items?: any[] }[] = [];
1+
type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
2+
export const navigation: NavigationItem[] = [];
3+

packages/devextreme-schematics/src/add-sample-views/index_spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ describe('sample views', () => {
4949

5050
const navigationContent = tree.readContent('/src/app/app-navigation.ts');
5151
expect(navigationContent).toMatch(/text: 'Home'/);
52-
expect(navigationContent).toContain(`export const navigation: { path?: string, text: string, icon: string, items?: any[] }[] = [
52+
expect(navigationContent).toContain(
53+
`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
54+
export const navigation: NavigationItem[] = [
5355
{
5456
text: 'Home',
5557
path: '/home',

packages/devextreme-schematics/src/add-view/index_spec.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ describe('view', () => {
117117
expect(moduleContent).toMatch(/text: 'Test'/);
118118
expect(moduleContent).toMatch(/icon: 'folder'/);
119119

120-
expect(moduleContent).toContain(`navigation: { path?: string, text: string, icon: string, items?: any[] }[] = [
120+
expect(moduleContent).toContain(
121+
`type NavigationItem = { path?: string, text: string, icon?: string, items?: NavigationItem[] };
122+
export const navigation: NavigationItem[] = [
121123
{
122124
text: 'Test',
123125
path: '/pages/test',

packages/devextreme-schematics/src/utility/change.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ export function insertItemToArray(
3636

3737
const nodeContent = node.getText();
3838
const nodePosition = node.getStart();
39-
const leftBracketPosition = nodePosition + nodeContent.indexOf('[', nodeContent.indexOf('=') || 0);
39+
const leftBracketPosition = nodePosition + nodeContent.indexOf('[', nodeContent.lastIndexOf('=') || 0);
4040
const rightBracketPosition = nodePosition + nodeContent.lastIndexOf(']');
4141
let itemPosition = leftBracketPosition + 1;
4242
let fileRecorder = host.beginUpdate(filePath);

0 commit comments

Comments
 (0)