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.

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

Release v2.0.4 #8552

Merged
merged 93 commits into from
May 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
f974044
fix(client): modify the to attribute of the Link used by ProjectListI…
77629296 Nov 11, 2023
11c0c79
Merge branch 'next' into fix/7403-fix-jump-twice
yuval-hazaz Feb 9, 2024
49e9bcf
fix(client): keep the link on the to property and remove the handler
77629296 Feb 19, 2024
671b33b
Merge branch 'fix/7403-fix-jump-twice' of github.com:77629296/amplica…
77629296 Feb 19, 2024
b019c43
feat(code-gen-types): add DotNet plugin events and types
morhag90 May 13, 2024
75435db
chore(client): improve git repo connection page
Jayanth-Parthsarathy May 13, 2024
7c28a24
chore(code-gen-types): update plugin afterevent type
overbit May 16, 2024
cc27e82
feat(code-gen-types): update dotnet event param and types (PluginEven…
morhag90 May 16, 2024
340194b
fix(server): handle renaming of the id arg on the index attribute
abrl91 May 17, 2024
10e9dc8
chore(code-gen-types): add dotnet plugin event for csproj
overbit May 17, 2024
9d9d30a
chore(code-gen-types): update dotnet csproj plugin event params
overbit May 17, 2024
e210672
refactor(code-gen-types): rename dotnet CreateServerDockerComposeDB i…
overbit May 17, 2024
fef6366
test(server): add test
abrl91 May 20, 2024
ebfe9a1
Merge branch 'next' into fix/8503-id-field-and-index-attribute
abrl91 May 20, 2024
c6d557a
chore(code-gen-types): add new dotnet event for appsettings.json
overbit May 20, 2024
91318b9
refactor(code-gen-types): remove redundant dotnet createServerDotenv …
overbit May 20, 2024
d014338
Merge pull request #8468 from amplication/feat/8467
overbit May 20, 2024
51788dc
refactor(code-gen-types): update appsettings event param type
overbit May 20, 2024
effab7f
Merge branch 'next' into feat/8509-add-appsettings-dotnet-event
overbit May 20, 2024
16bfe51
refactor(code-gen-types): remove redundant param from CreateServerApp…
overbit May 20, 2024
eb26669
Merge branch 'feat/8509-add-appsettings-dotnet-event' of github.com:a…
overbit May 20, 2024
409d6c3
feat(code-gen-types): add event for create-extensions
morhag90 May 21, 2024
0aa5086
feat(code-gen-types): version bump
morhag90 May 21, 2024
a74aa43
Merge pull request #8510 from amplication/feat/8509-add-appsettings-d…
overbit May 21, 2024
0394536
Merge branch 'next' into feat/8515-create-extensions-event
morhag90 May 21, 2024
4177918
chore(generator): add script to generate local code through container
overbit May 21, 2024
25fac31
chore(dsg): fix linting rules
overbit May 21, 2024
497f1e0
Merge pull request #8518 from amplication/chore/8517
morhag90 May 21, 2024
eb98751
Merge pull request #8516 from amplication/feat/8515-create-extensions…
morhag90 May 21, 2024
542f10a
feat(code-gen-types): add new dotnet event for programcs generation
overbit May 21, 2024
3cdfc9d
Merge pull request #8519 from amplication/feat/programcs-8513
morhag90 May 21, 2024
0df1785
fix(server): mapper spread bug and field name changed
abrl91 May 21, 2024
bb6f7a0
Merge branch 'next' into fix/8503-id-field-and-index-attribute
abrl91 May 21, 2024
734cbd0
Merge pull request #8504 from amplication/fix/8503-id-field-and-index…
mulygottlieb May 21, 2024
e34a81f
Merge branch 'master' into feat/programcs-8513
overbit May 21, 2024
f819aba
Merge branch 'next' into feat/programcs-8513
overbit May 21, 2024
6fe1c8b
chore(code-gen-types): improve params for dotnet event createProgramFile
overbit May 21, 2024
cab076f
feat(server):alter reserved name on creation
yuval-hazaz May 21, 2024
a37bbf4
Merge branch 'next' into feat/entity-reserved-name
mulygottlieb May 21, 2024
6b11a79
feat(code-gen-types): change dotnet create entity conroller base params
abrl91 May 21, 2024
fb6579c
Merge pull request #8522 from amplication/feat/entity-reserved-name
mulygottlieb May 21, 2024
25c3ce7
feat(server):add event
yuval-hazaz May 21, 2024
b6a5dde
feat(clienet):add events
yuval-hazaz May 21, 2024
e0b81b2
feat(code-gen-types): remove module container from event params
abrl91 May 22, 2024
57947eb
Merge branch 'next' into feat/dotnet-create-entity-controller-base-pa…
abrl91 May 22, 2024
e49d4c8
Merge branch 'next' into feat/programcs-8513
overbit May 22, 2024
e0fefd5
Merge branch 'master' into next
overbit May 22, 2024
ea933ce
Merge branch 'next' into feat/programcs-8513
overbit May 22, 2024
976d8fa
Merge pull request #8526 from amplication/feat/programcs-8513
overbit May 22, 2024
a139a42
Merge branch 'next' into feat/dotnet-create-entity-controller-base-pa…
overbit May 22, 2024
9be4deb
chore(code-gen-types): bump and publish version
abrl91 May 22, 2024
2f2c447
Merge pull request #8525 from amplication/feat/dotnet-create-entity-c…
abrl91 May 22, 2024
ed959da
chore(code-gen-types): remove dotnet plugin unneeded event
overbit May 23, 2024
49f9069
Merge branch 'next' into feat/jovu-analytics
yuval-hazaz May 25, 2024
df09d72
feat(server):track demo repo
yuval-hazaz May 25, 2024
7310525
feat(server):track field creation from jovu
yuval-hazaz May 25, 2024
249025f
feat(server):remove searchAPI event
yuval-hazaz May 25, 2024
c41d7f8
Merge branch 'next' into chore/7878-improved-git-connection-page
yuval-hazaz May 25, 2024
5442e7e
Merge pull request #8480 from Jayanth-Parthsarathy/chore/7878-improve…
yuval-hazaz May 25, 2024
91dc7be
Merge branch 'next' into fix/7403-fix-jump-twice
yuval-hazaz May 25, 2024
367e786
Merge pull request #7404 from 77629296/fix/7403-fix-jump-twice
yuval-hazaz May 25, 2024
9ef09b3
Merge branch 'next' into feat/jovu-analytics
yuval-hazaz May 26, 2024
0f87e2d
Merge pull request #8543 from amplication/feat/jovu-analytics
morhag90 May 26, 2024
891b898
fix(server):validate auth entity
yuval-hazaz May 26, 2024
cfc3b38
fix(server):validate auth entity
yuval-hazaz May 26, 2024
adc30a1
fix(server): module disabled/enabled toggle
morhag90 May 26, 2024
db11a96
feat(server):handle auth entity for jovu
yuval-hazaz May 26, 2024
421c667
fix(server):remove unused imports
yuval-hazaz May 26, 2024
6375b00
refactor(client): remove unused import
morhag90 May 26, 2024
d238570
fix(server/client): update module actions
morhag90 May 26, 2024
6920638
fix(server): btm apply changes fail => cannot find entity module
morhag90 May 26, 2024
6e6f719
Merge pull request #8549 from amplication/feat/default-user-entity
mulygottlieb May 27, 2024
df0765a
Merge branch 'next' into fix/8356
yuval-hazaz May 27, 2024
e9bfc0b
Merge pull request #8551 from amplication/fix/8356
morhag90 May 27, 2024
0fa0e89
Merge pull request #8537 from amplication/feat/8528-dotnet-events-docker
mulygottlieb May 28, 2024
9495975
chore(code-gen-types): update csharp ast dep
overbit May 28, 2024
1fc1dab
fix(client): add input/output types only for a custom action
morhag90 May 28, 2024
050b289
fix(server): add a validation for input/output type args.
morhag90 May 28, 2024
135b5b5
feat(server): add test to moduleAction => validation on inputType dat…
morhag90 May 28, 2024
2a85d29
Merge pull request #8550 from amplication/fix/8545-models-actions-tog…
mulygottlieb May 28, 2024
54cfb9f
fix(client):remove unused code
yuval-hazaz May 28, 2024
1368359
fix(client):remove unused code
yuval-hazaz May 28, 2024
2c0f638
fix(client):remove unused code
yuval-hazaz May 28, 2024
ba28056
fix(client):remove unused code
yuval-hazaz May 28, 2024
9f39c57
feat(client):use commit query fragment
yuval-hazaz May 28, 2024
7617eda
feat(client):add commitLastError
yuval-hazaz May 28, 2024
2f45c2f
feat(client):update last commit when build status changes
yuval-hazaz May 28, 2024
0f76671
feat(client):show last commit error
yuval-hazaz May 28, 2024
15a2f07
feat(client):update commit list after jovu commit
yuval-hazaz May 28, 2024
68b332b
feat(client):update last commit status
yuval-hazaz May 28, 2024
a8002e7
Merge branch 'next' into feat/commit-errors
yuval-hazaz May 28, 2024
92fe699
Merge pull request #8560 from amplication/feat/commit-errors
mulygottlieb May 28, 2024
8af9acf
Merge branch 'master' into next
mulygottlieb May 29, 2024
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
4 changes: 2 additions & 2 deletions libs/util/code-gen-types/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ In order to publish to npm `@amplication/code-gen-types` run the following:
# From the monorepo root folder
npm i

npx nx build amplication-code-gen-types
npx nx build code-gen-types

cd ./dist/packages/amplication-code-gen-types
cd ./dist/libs/util/code-gen-types

npm publish --access public ....
```
5 changes: 3 additions & 2 deletions libs/util/code-gen-types/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@amplication/code-gen-types",
"version": "2.0.27",
"version": "2.0.33-beta.12",
"description": "This library supplies all the contracts for Amplication Code Generation. The purpose is to make the contracts available for inclusion in plugins.",
"main": "src/index.js",
"author": {
Expand All @@ -13,6 +13,7 @@
"json-schema": "^0.4.0",
"prisma-schema-dsl-types": "^1.1.2",
"tslib": "^2.6.2",
"type-fest": "^3.11.0"
"type-fest": "^3.11.0",
"@amplication/csharp-ast": "^0.0.2"
}
}
174 changes: 174 additions & 0 deletions libs/util/code-gen-types/src/dotnet-plugin-events-params.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
import { CodeBlock } from "@amplication/csharp-ast";
import {
Entity,
EntityLookupField,
ModuleContainer,
ModuleAction,
entityActions,
} from "./code-gen-types";
import { EventParams } from "./plugins.types";

export interface CreateEntityServiceBaseParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
moduleActions: ModuleAction[];
entities: Entity[];
}

export interface CreateEntityServiceParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
entityActions: entityActions;
}

// export interface CreateCustomModuleServiceParams extends EventParams {
// customModuleName: string;
// templateMapping: { [key: string]: any };
// serviceId: namedTypes.Identifier;
// template: namedTypes.File;
// moduleActions: ModuleAction[];
// dtoNameToPath: Record<string, string>;
// }
export interface CreateEntityControllerParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
entityActions: entityActions;
}

// export interface CreateCustomModuleControllerParams extends EventParams {
// template: namedTypes.File;
// customModuleName: string;
// templateMapping: { [key: string]: any };
// controllerId: namedTypes.Identifier;
// serviceId: namedTypes.Identifier;
// moduleActions: ModuleAction[];
// customModuleServiceModule: string;
// dtoNameToPath: Record<string, string>;
// }
export interface CreateEntityControllerBaseParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
moduleActions: ModuleAction[];
entities: Entity[];
}

export interface CreateEntityGrpcControllerParams extends EventParams {
entity: Entity;
}
export interface CreateEntityGrpcControllerBaseParams extends EventParams {
entity: Entity;
}

export interface CreateEntityInterfaceParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
moduleContainers: ModuleContainer[];
moduleActions: ModuleAction[];
entities: Entity[];
}

export interface CreateEntityControllerToManyRelationMethodsParams
extends EventParams {
field: EntityLookupField;
entity: Entity;
}

export interface CreateServerAuthParams extends EventParams {}

export interface CreateServerParams extends EventParams {}

export type VariableDictionary = {
[variable: string]: string;
}[];

export interface CreateServerGitIgnoreParams extends EventParams {
gitignorePaths: string[];
}

export interface CreateServerDockerComposeParams extends EventParams {
fileContent: string;
updateProperties: { [key: string]: any }[];
outputFileName: string;
}

export interface CreateServerCsprojParams extends EventParams {
packageReferences: {
include: string;
version: string;
includeAssets?: string;
privateAssets?: string;
}[];
}
export interface CreateServerAppsettingsParams extends EventParams {
updateProperties: { [key: string]: any };
}

export interface CreateMessageBrokerParams extends EventParams {}

export interface CreateMessageBrokerTopicsEnumParams extends EventParams {}

export interface CreateMessageBrokerClientOptionsFactoryParams
extends EventParams {}

export interface CreateMessageBrokerServiceParams extends EventParams {}
export interface CreateMessageBrokerServiceBaseParams extends EventParams {}

export interface CreateProgramFileParams extends EventParams {
/**
* List of code blocks that will be added to the program file.
* The code blocks will be added to the `builder` object, before builder.Build() gets called.
* i.e. `builder.services.AddControllers();`
* @type {CodeBlock[]}
*/
builderServicesBlocks: CodeBlock[];
/**
* List of code blocks that will be added to the program file.
* The code blocks will be added to the `app` object after builder.Build() gets called.
* i.e. `app.UseCors();`
* @type {CodeBlock[]}
*/
appBlocks: CodeBlock[];
}

export interface CreateSwaggerParams extends EventParams {
fileDir: string;
outputFileName: string;
}

export interface CreateSeedParams extends EventParams {
fileDir: string;
outputFileName: string;
dtoNameToPath: Record<string, string>;
}
export interface CreateDTOsParams extends EventParams {
entity: Entity;
dtoName: string;
dtoBasePath: string;
}
export interface LoadStaticFilesParams extends EventParams {
source: string;
basePath: string;
}

export interface CreateServerSecretsManagerParams extends EventParams {
/**
* Array of secretsName secrectKey pairs that will generate the SecretsNameKey enum.
* SecrectKey is used by the Secrets Manager Service to retrieve the secret value
*/
secretsNameKey: SecretsNameKey[];
}
export interface CreateEntityExtensionsParams extends EventParams {
entity: Entity;
resourceName: string;
apisDir: string;
}

export interface SecretsNameKey {
name: string;
key: string;
}
77 changes: 77 additions & 0 deletions libs/util/code-gen-types/src/dotnet-plugin-events.types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
import {
CreateDTOsParams,
CreateEntityControllerBaseParams,
CreateEntityControllerParams,
CreateEntityControllerToManyRelationMethodsParams,
CreateEntityExtensionsParams,
CreateEntityGrpcControllerBaseParams,
CreateEntityGrpcControllerParams,
CreateEntityInterfaceParams,
CreateEntityServiceBaseParams,
CreateEntityServiceParams,
CreateMessageBrokerClientOptionsFactoryParams,
CreateMessageBrokerParams,
CreateMessageBrokerServiceBaseParams,
CreateMessageBrokerServiceParams,
CreateMessageBrokerTopicsEnumParams,
CreateProgramFileParams,
CreateSeedParams,
CreateServerAppsettingsParams,
CreateServerAuthParams,
CreateServerCsprojParams,
CreateServerDockerComposeParams,
CreateServerGitIgnoreParams,
CreateServerParams,
CreateServerSecretsManagerParams,
CreateSwaggerParams,
LoadStaticFilesParams,
} from "./dotnet-plugin-events-params.types";
import { DotnetEventNames, PluginEventType } from "./dotnet-plugins.types";
import { CodeBlock, Interface } from "@amplication/csharp-ast";

export type DotnetEvents = {
[DotnetEventNames.CreateServerAuth]?: PluginEventType<CreateServerAuthParams>;
[DotnetEventNames.CreateServer]?: PluginEventType<CreateServerParams>;
[DotnetEventNames.CreateServerGitIgnore]?: PluginEventType<
CreateServerGitIgnoreParams,
CodeBlock
>;
[DotnetEventNames.CreateServerCsproj]?: PluginEventType<
CreateServerCsprojParams,
CodeBlock
>;
[DotnetEventNames.CreateServerAppsettings]?: PluginEventType<
CreateServerAppsettingsParams,
CodeBlock
>;
[DotnetEventNames.CreateEntityService]?: PluginEventType<CreateEntityServiceParams>;
[DotnetEventNames.CreateEntityServiceBase]?: PluginEventType<CreateEntityServiceBaseParams>;
[DotnetEventNames.CreateEntityController]?: PluginEventType<CreateEntityControllerParams>;
[DotnetEventNames.CreateEntityControllerBase]?: PluginEventType<CreateEntityControllerBaseParams>;
[DotnetEventNames.CreateEntityGrpcController]?: PluginEventType<CreateEntityGrpcControllerParams>;
[DotnetEventNames.CreateEntityGrpcControllerBase]?: PluginEventType<CreateEntityGrpcControllerBaseParams>;
[DotnetEventNames.CreateServerDockerCompose]?: PluginEventType<
CreateServerDockerComposeParams,
CodeBlock
>;
[DotnetEventNames.CreateMessageBroker]?: PluginEventType<CreateMessageBrokerParams>;
[DotnetEventNames.CreateMessageBrokerTopicsEnum]?: PluginEventType<CreateMessageBrokerTopicsEnumParams>;
[DotnetEventNames.CreateMessageBrokerClientOptionsFactory]?: PluginEventType<CreateMessageBrokerClientOptionsFactoryParams>;
[DotnetEventNames.CreateMessageBrokerService]?: PluginEventType<CreateMessageBrokerServiceParams>;
[DotnetEventNames.CreateMessageBrokerServiceBase]?: PluginEventType<CreateMessageBrokerServiceBaseParams>;
[DotnetEventNames.CreateProgramFile]?: PluginEventType<
CreateProgramFileParams,
CodeBlock
>;
[DotnetEventNames.CreateSwagger]?: PluginEventType<CreateSwaggerParams>;
[DotnetEventNames.CreateSeed]?: PluginEventType<CreateSeedParams>;
[DotnetEventNames.CreateEntityControllerToManyRelationMethods]?: PluginEventType<CreateEntityControllerToManyRelationMethodsParams>;
[DotnetEventNames.CreateDTOs]?: PluginEventType<CreateDTOsParams>;
[DotnetEventNames.LoadStaticFiles]?: PluginEventType<LoadStaticFilesParams>;
[DotnetEventNames.CreateServerSecretsManager]?: PluginEventType<CreateServerSecretsManagerParams>;
[DotnetEventNames.CreateEntityInterface]?: PluginEventType<
CreateEntityInterfaceParams,
Interface
>;
[DotnetEventNames.CreateEntityExtensions]?: PluginEventType<CreateEntityExtensionsParams>;
};
Loading
Loading