Skip to content
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

Jump to bottom

[angular] generate user-management at entities #25044

Merged
merged 1 commit into from
Feb 2, 2024
Merged

[angular] generate user-management at entities #25044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
68 changes: 53 additions & 15 deletions generators/angular/entity-files-angular.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,17 @@
import type { GeneratorDefinition } from '../base-application/generator.js';
import { clientApplicationTemplatesBlock } from '../client/support/files.js';
import CoreGenerator from '../base-core/index.js';
import { WriteFileBlock, WriteFileSection } from '../base/api.js';
import { WriteFileSection } from '../base/api.js';
import { asWritingEntitiesTask } from '../base-application/support/task-type-inference.js';

const entityModelFiles: WriteFileBlock = {
...clientApplicationTemplatesBlock(),
const entityModelFiles = clientApplicationTemplatesBlock({
templates: ['entities/_entityFolder_/_entityFile_.model.ts', 'entities/_entityFolder_/_entityFile_.test-samples.ts'],
};
});

const entityServiceFiles: WriteFileBlock = {
...clientApplicationTemplatesBlock(),
const entityServiceFiles = clientApplicationTemplatesBlock({
condition: generator => !generator.embedded,
templates: ['entities/_entityFolder_/service/_entityFile_.service.ts', 'entities/_entityFolder_/service/_entityFile_.service.spec.ts'],
};
});

export const builtInFiles: WriteFileSection = {
model: [entityModelFiles],
Expand All @@ -41,9 +40,8 @@ export const angularFiles = {
model: [entityModelFiles],
service: [entityServiceFiles],
client: [
{
clientApplicationTemplatesBlock({
condition: generator => !generator.embedded,
...clientApplicationTemplatesBlock(),
templates: [
'entities/_entityFolder_/_entityFile_.routes.ts',
'entities/_entityFolder_/detail/_entityFile_-detail.component.html',
Expand All @@ -55,10 +53,9 @@ export const angularFiles = {
'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.ts',
'entities/_entityFolder_/route/_entityFile_-routing-resolve.service.spec.ts',
],
},
{
}),
clientApplicationTemplatesBlock({
condition: generator => !generator.readOnly && !generator.embedded,
...clientApplicationTemplatesBlock(),
templates: [
'entities/_entityFolder_/update/_entityFile_-form.service.ts',
'entities/_entityFolder_/update/_entityFile_-form.service.spec.ts',
Expand All @@ -69,11 +66,39 @@ export const angularFiles = {
'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.ts',
'entities/_entityFolder_/delete/_entityFile_-delete-dialog.component.spec.ts',
],
},
}),
],
};

export async function writeEntitiesFiles(this: CoreGenerator, { application, entities }: GeneratorDefinition['writingEntitiesTaskParam']) {
export const userManagementFiles: WriteFileSection = {
userManagement: [
clientApplicationTemplatesBlock({
templates: [
'admin/user-management/user-management.route.ts',
'admin/user-management/user-management.model.ts',
'admin/user-management/list/user-management.component.html',
'admin/user-management/list/user-management.component.spec.ts',
'admin/user-management/list/user-management.component.ts',
'admin/user-management/detail/user-management-detail.component.html',
'admin/user-management/detail/user-management-detail.component.spec.ts',
'admin/user-management/detail/user-management-detail.component.ts',
'admin/user-management/update/user-management-update.component.html',
'admin/user-management/update/user-management-update.component.spec.ts',
'admin/user-management/update/user-management-update.component.ts',
'admin/user-management/delete/user-management-delete-dialog.component.html',
'admin/user-management/delete/user-management-delete-dialog.component.spec.ts',
'admin/user-management/delete/user-management-delete-dialog.component.ts',
'admin/user-management/service/user-management.service.spec.ts',
'admin/user-management/service/user-management.service.ts',
],
}),
],
};

export const writeEntitiesFiles = asWritingEntitiesTask(async function (
this: CoreGenerator,
{ application, entities }: GeneratorDefinition['writingEntitiesTaskParam'],
) {
for (const entity of entities.filter(entity => !entity.skipClient)) {
if (entity.builtInUser) {
await this.writeFiles({
Expand All @@ -85,14 +110,27 @@ export async function writeEntitiesFiles(this: CoreGenerator, { application, ent
readOnly: true,
},
});

if (application.generateUserManagement) {
await this.writeFiles({
sections: userManagementFiles,
context: {
...application,
...entity,
i18nKeyPrefix: 'userManagement',
entityFileName: 'user-management',
entityFolderPrefix: 'admin',
},
});
}
} else {
await this.writeFiles({
sections: angularFiles,
context: { ...application, ...entity },
});
}
}
}
});

export async function postWriteEntitiesFiles(this: CoreGenerator, taskParam: GeneratorDefinition['postWritingEntitiesTaskParam']) {
const { source, application } = taskParam;
Expand Down
28 changes: 0 additions & 28 deletions generators/angular/files-angular.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,23 +235,6 @@ export const files = {
'core/tracker/tracker.service.ts',
],
},
{
condition: generator => generator.generateUserManagement,
...clientApplicationTemplatesBlock(),
templates: [
'admin/user-management/user-management.route.ts',
'admin/user-management/user-management.model.ts',
'admin/user-management/list/user-management.component.ts',
'admin/user-management/list/user-management.component.html',
'admin/user-management/detail/user-management-detail.component.ts',
'admin/user-management/detail/user-management-detail.component.html',
'admin/user-management/update/user-management-update.component.ts',
'admin/user-management/update/user-management-update.component.html',
'admin/user-management/delete/user-management-delete-dialog.component.ts',
'admin/user-management/delete/user-management-delete-dialog.component.html',
'admin/user-management/service/user-management.service.ts',
],
},
{
condition: generator => generator.applicationTypeGateway && generator.serviceDiscoveryAny,
...clientApplicationTemplatesBlock(),
Expand Down Expand Up @@ -444,17 +427,6 @@ export const files = {
...clientApplicationTemplatesBlock(),
templates: ['login/login.component.spec.ts'],
},
{
condition: generator => generator.generateUserManagement,
...clientApplicationTemplatesBlock(),
templates: [
'admin/user-management/list/user-management.component.spec.ts',
'admin/user-management/detail/user-management-detail.component.spec.ts',
'admin/user-management/update/user-management-update.component.spec.ts',
'admin/user-management/delete/user-management-delete-dialog.component.spec.ts',
'admin/user-management/service/user-management.service.spec.ts',
],
},
{
condition: generator => generator.authenticationTypeSession && generator.generateUserManagement,
...clientApplicationTemplatesBlock(),
Expand Down
Loading