Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit 3d6039d

Browse files
committed
fix(grid-generator): Change paths to libs
1 parent d121e25 commit 3d6039d

20 files changed

Lines changed: 20 additions & 9 deletions

src/generators/grid.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,22 @@ export class GridGenerator extends Base {
3939
(customOptions && customOptions.project.libsConfigs[1] && customOptions &&
4040
customOptions.project.libsConfigs[1].shortName) ?
4141
customOptions && customOptions.project.libsConfigs[1].shortName : 'web';
42-
let coreFolder =
42+
let coreFolder =
43+
(customOptions && customOptions.project.libsConfigs[0] && customOptions &&
44+
customOptions.project.libsConfigs[0].rootPath) ?
45+
customOptions && customOptions.project.libsConfigs[0].rootPath : 'core';
46+
let platformFolder =
47+
(customOptions && customOptions.project.libsConfigs[1] && customOptions &&
48+
customOptions.project.libsConfigs[1].rootPath) ?
49+
customOptions && customOptions.project.libsConfigs[1].rootPath : 'web';
50+
let coreLocalFolder =
4351
(customOptions && customOptions.project.libsConfigs[0] && customOptions &&
44-
customOptions.project.libsConfigs[0].rootPath) ?
45-
customOptions && customOptions.project.libsConfigs[0].rootPath : 'core';
46-
let platformFolder =
52+
customOptions.project.libsConfigs[0].localPath) ?
53+
customOptions && customOptions.project.libsConfigs[0].localPath : 'core';
54+
let platformLocalFolder =
4755
(customOptions && customOptions.project.libsConfigs[1] && customOptions &&
48-
customOptions.project.libsConfigs[1].rootPath) ?
49-
customOptions && customOptions.project.libsConfigs[1].rootPath : 'web';
56+
customOptions.project.libsConfigs[1].localPath) ?
57+
customOptions && customOptions.project.libsConfigs[1].localPath : 'web';
5058
let pkField: string = 'id';
5159
let fields: string[] = [
5260
'name',
@@ -88,7 +96,9 @@ export class GridGenerator extends Base {
8896
'core': coreLib,
8997
'platform': platformLib,
9098
'coreFolder': coreFolder,
91-
'platformFolder': platformFolder
99+
'platformFolder': platformFolder,
100+
'coreLocalFolder': coreLocalFolder,
101+
'platformLocalFolder': platformLocalFolder
92102
},
93103
'grid': {
94104
'list': {
@@ -132,8 +142,7 @@ export class GridGenerator extends Base {
132142
rootFolder,
133143
'generatorGrid',
134144
'grid.select.input.modal',
135-
options,
136-
rootFolder
145+
options
137146
);
138147
}
139148
}

src/lib/project.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export class Project extends Base {
2626
map((lib: any) => {
2727
lib.shortName = path.basename(path.dirname(lib.root));
2828
lib.rootPath = path.resolve(this.rootFolder + '/' + _.trimStart(lib.root, './') + '/../');
29+
lib.localPath = _.trimStart(lib.root, './') + '/../';
2930
return lib;
3031
});
3132
this.libsPaths = this.libsConfigs.map((lib: any) => lib.rootPath);
@@ -34,6 +35,7 @@ export class Project extends Base {
3435
filter((app: any) => app.appRoot === undefined).
3536
map((app: any) => {
3637
app.rootPath = path.resolve(this.rootFolder + '/' + _.trimStart(app.root, './') + '/../');
38+
app.localPath = _.trimStart(app.root, './') + '/../';
3739
return app;
3840
});
3941
this.appsPaths = this.appsConfigs.map((app: any) => app.rootPath);

srcgen/grid.select.input.modal/libs/%libs.core%/src/shared/models/%grid.name.kebab%.model.ts renamed to srcgen/grid.select.input.modal/%libs.coreLocalFolder%/src/shared/models/%grid.name.kebab%.model.ts

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.core%/src/shared/services/%grid.list.name.kebab%.service.ts renamed to srcgen/grid.select.input.modal/%libs.coreLocalFolder%/src/shared/services/%grid.list.name.kebab%.service.ts

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.html renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.html

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.scss renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.scss

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.ts renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.component.ts

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.module.ts renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-grid.module.ts

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-list-modal/%grid.list.name.kebab%-list-modal.component.html renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-list-modal/%grid.list.name.kebab%-list-modal.component.html

File renamed without changes.

srcgen/grid.select.input.modal/libs/%libs.platform%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-list-modal/%grid.list.name.kebab%-list-modal.component.scss renamed to srcgen/grid.select.input.modal/%libs.platformLocalFolder%/src/grids/%grid.list.name.kebab%-grid/%grid.list.name.kebab%-list-modal/%grid.list.name.kebab%-list-modal.component.scss

File renamed without changes.

0 commit comments

Comments
 (0)