Merge branch 'release/5.2.2'

hso-nn · Jul 29, 2021 · f908a2c · f908a2c
2 parents 79194cb + eaae8f0
commit f908a2c
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 8 deletions.
diff --git a/bin/Entity/Entity.model.ts b/bin/Entity/Entity.model.ts
@@ -1,6 +1,7 @@
 /* This is a generated file, please regenerate and do not modify */
 /* eslint-disable max-len  */
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 interface EntityModel extends Model {}
 
 /* eslint-enable max-len  */
diff --git a/bin/Entity/Entity.service.ts b/bin/Entity/Entity.service.ts
@@ -2,7 +2,7 @@ import {WebApi} from '../WebApi/WebApi';
 import {Service} from '../WebApi/Service';
 
 export class EntityService {
-    private static logicalName = 'EntityLogicalName';
+    public static logicalName = 'EntityLogicalName';
 
     public static async retrieveMultipleRecords(multipleSystemQueryOptions: MultipleSystemQueryOptions): Promise<EntityModel[]> {
         return WebApi.retrieveMultipleRecords(EntityService.logicalName, multipleSystemQueryOptions);

diff --git a/bin/EnvironmentVariable/EnvironmentVariable.service.ts b/bin/EnvironmentVariable/EnvironmentVariable.service.ts
@@ -3,7 +3,7 @@
 import {WebApi} from '../WebApi/WebApi';
 
 export class EnvironmentVariableService {
-    private static logicalName = 'environmentvariablevalue';
+    public static logicalName = 'environmentvariablevalue';
     private static async retrieveMultipleRecords(multipleSystemQueryOptions: MultipleSystemQueryOptions): Promise<EnvironmentVariableModel[]> {
         return WebApi.retrieveMultipleRecords(EnvironmentVariableService.logicalName, multipleSystemQueryOptions);
     }

diff --git a/bin/main.js b/bin/main.js
diff --git a/bin/root/src/Annotation/Annotation.service.ts b/bin/root/src/Annotation/Annotation.service.ts
@@ -3,7 +3,7 @@ import {Base64} from '../util/Base64';
 import {Service} from '../WebApi/Service';
 
 export class AnnotationService {
-    private static logicalName = 'annotation';
+    public static logicalName = 'annotation';
 
     public static async parseAnnotation(blob: Blob, filename: string, id: string, targetEntityName: string): Promise<AnnotationModel> {
         return {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hso/d365-cli",
-  "version": "5.2.1",
+  "version": "5.2.2",
   "author": "HSO Innovation <[email protected]> (http://www.hso.com)",
   "description": "HSO D365 Command Line Interface",
   "repository": {

diff --git a/src/generator/Entity.ts b/src/generator/Entity.ts
@@ -70,7 +70,7 @@ export class Entity extends AdalRouter {
             // Entity.registerWebpackConfig(this.entityName);
         } else {
             const fileData = String(fs.readFileSync(serviceFilepath));
-            const match = fileData.match(new RegExp(`private static logicalName = '([a-zA-Z_]*)';`));
+            const match = fileData.match(new RegExp(`static logicalName = '([a-zA-Z_]*)';`));
             this.entityLogicalName = match[1];
             console.log(colors.green(`Entity ${this.entityName} already exist`));
         }

diff --git a/src/generator/ModelRouter.ts b/src/generator/ModelRouter.ts
@@ -48,7 +48,7 @@ export class ModelRouter extends AdalRouter {
         } else {
             const serviceFilepath = `src/${this.entityName}/${this.entityName}.service.ts`;
             const fileData = String(fs.readFileSync(serviceFilepath));
-            const match = fileData.match(new RegExp(`private static logicalName = '([a-zA-Z_]*)';`));
+            const match = fileData.match(new RegExp(`static logicalName = '([a-zA-Z_]*)';`));
             this.entityLogicalName = match[1];
             console.log(colors.green(`Entity ${this.entityName} already exist`));
             await Model.generateModel(this.bearer, this.entityName, this.entityLogicalName, async (message: string) => this.log(message));

diff --git a/src/root/tools/Webresource/Webresource.service.ts b/src/root/tools/Webresource/Webresource.service.ts
@@ -2,7 +2,7 @@ import {WebresourceModel} from './Webresource.model';
 import {NodeApi} from '../NodeApi/NodeApi';
 
 export class WebresourceService {
-    private static logicalName = 'webresource';
+    public static logicalName = 'webresource';
     private static entitySetName = 'webresourceset';
 
     public static async retrieveMultipleRecords(multipleSystemQueryOptions: MultipleSystemQueryOptions, bearer: string): Promise<WebresourceModel[]> {