From 9280e4276ef449415700571c59f7856896f41590 Mon Sep 17 00:00:00 2001 From: ThuF Date: Mon, 23 Mar 2026 14:53:04 +0000 Subject: [PATCH] Migrate from project.json to package.json --- codbex-cities/codbex-cities.edm | 20 ++++++------- codbex-cities/codbex-cities.gen | 30 ++++++++++++------- codbex-cities/codbex-cities.model | 10 ++++++- .../api/Settings/CityController.ts | 2 +- .../ui/Settings/City/dialog-window/index.html | 4 +-- codbex-cities/package.json | 4 +-- codbex-cities/project.json | 26 +--------------- codbex-cities/tsconfig.json | 23 -------------- 8 files changed, 44 insertions(+), 75 deletions(-) delete mode 100644 codbex-cities/tsconfig.json diff --git a/codbex-cities/codbex-cities.edm b/codbex-cities/codbex-cities.edm index 7fe561e..67d311a 100644 --- a/codbex-cities/codbex-cities.edm +++ b/codbex-cities/codbex-cities.edm @@ -1,16 +1,16 @@ - - - - + + + + - - - - - + + + + + @@ -20,5 +20,5 @@ - + \ No newline at end of file diff --git a/codbex-cities/codbex-cities.gen b/codbex-cities/codbex-cities.gen index f4e2bf2..8bc82c0 100644 --- a/codbex-cities/codbex-cities.gen +++ b/codbex-cities/codbex-cities.gen @@ -4,13 +4,21 @@ "brandUrl": "https://www.codbex.com/", "title": "Cities Management Module", "description": "Managing Cities Data", + "fileName": "codbex-cities", + "genFolderName": "codbex-cities", + "dataSource": "DefaultDB", + "roles": [ + { + "entityName": "City", + "roleRead": "codbex-cities.Cities.CityReadOnly", + "roleWrite": "codbex-cities.Cities.CityFullAccess" + } + ], + "tprefix": "codbex-cities-model", "projectName": "codbex-cities", "workspaceName": "workspace", "filePath": "codbex-cities.model", "templateId": "template-application-angular-v2/template/template.js", - "fileName": "codbex-cities", - "genFolderName": "codbex-cities", - "dataSource": "DefaultDB", "perspectives": { "Settings": { "views": [ @@ -26,18 +34,11 @@ "role": "" } }, - "roles": [ - { - "entityName": "City", - "roleRead": "codbex-cities.Cities.CityReadOnly", - "roleWrite": "codbex-cities.Cities.CityFullAccess" - } - ], - "tprefix": "codbex-cities-model", "models": [ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": true, "dataName": "CITY_ID", "dataNullable": true, @@ -63,6 +64,7 @@ "inputRule": "" }, { + "auditType": "NONE", "dataLength": "100", "dataName": "CITY_NAME", "dataNullable": false, @@ -91,6 +93,7 @@ "inputRule": "" }, { + "auditType": "NONE", "dataName": "CITY_COUNTRY", "dataNullable": false, "dataType": "INTEGER", @@ -165,6 +168,7 @@ { "properties": [ { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataAutoIncrement": true, @@ -192,6 +196,7 @@ "inputRule": "" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "255", @@ -222,6 +227,7 @@ "inputRule": "" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "2", @@ -252,6 +258,7 @@ "inputRule": "" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "3", @@ -282,6 +289,7 @@ "inputRule": "" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "3", diff --git a/codbex-cities/codbex-cities.model b/codbex-cities/codbex-cities.model index 61731cf..655735b 100644 --- a/codbex-cities/codbex-cities.model +++ b/codbex-cities/codbex-cities.model @@ -4,6 +4,7 @@ { "properties": [ { + "auditType": "NONE", "dataAutoIncrement": "true", "dataName": "CITY_ID", "dataNullable": "true", @@ -18,6 +19,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "dataLength": "100", "dataName": "CITY_NAME", "dataNullable": "false", @@ -32,6 +34,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "dataName": "CITY_COUNTRY", "dataNullable": "false", "dataType": "INTEGER", @@ -69,7 +72,7 @@ "name": "City", "perspectiveHeader": "", "perspectiveIcon": "/services/web/resources/unicons/copy.svg", - "perspectiveLabel": "Entities", + "perspectiveLabel": "Settings", "perspectiveName": "Settings", "perspectiveNavId": "", "perspectiveOrder": "100", @@ -83,6 +86,7 @@ { "properties": [ { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataAutoIncrement": "true", @@ -99,6 +103,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "255", @@ -115,6 +120,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "2", @@ -131,6 +137,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "3", @@ -147,6 +154,7 @@ "widgetType": "TEXTBOX" }, { + "auditType": "NONE", "calculatedPropertyExpressionCreate": "", "calculatedPropertyExpressionUpdate": "", "dataLength": "3", diff --git a/codbex-cities/gen/codbex-cities/api/Settings/CityController.ts b/codbex-cities/gen/codbex-cities/api/Settings/CityController.ts index 7ea7711..df64b21 100644 --- a/codbex-cities/gen/codbex-cities/api/Settings/CityController.ts +++ b/codbex-cities/gen/codbex-cities/api/Settings/CityController.ts @@ -44,7 +44,7 @@ class CityController { this.checkPermissions('write'); this.validateEntity(entity); entity.Id = this.repository.create(entity) as any; - response.setHeader('Content-Location', '/services/ts/codbex-cities/gen/codbex-cities/api/Settings/CityService.ts/' + entity.Id); + response.setHeader('Content-Location', '/services/ts/codbex-cities/gen/codbex-cities/api/Settings/CityController.ts/' + entity.Id); response.setStatus(response.CREATED); return entity; } catch (error: any) { diff --git a/codbex-cities/gen/codbex-cities/ui/Settings/City/dialog-window/index.html b/codbex-cities/gen/codbex-cities/ui/Settings/City/dialog-window/index.html index ccdbf59..39d333e 100644 --- a/codbex-cities/gen/codbex-cities/ui/Settings/City/dialog-window/index.html +++ b/codbex-cities/gen/codbex-cities/ui/Settings/City/dialog-window/index.html @@ -31,7 +31,7 @@ state="{{ forms.details['Name'].$valid ? '' : 'error' }}" ng-required="true" ng-model="entity.Name" - ng-readonly="true" + ng-readonly="action === 'select'" ng-maxlength="100.0" type="text" placeholder="{{ 'codbex-cities:codbex-cities-model.messages.inputEnter' | t:{'name':'$t(codbex-cities:codbex-cities-model.t.CITY_NAME)'} }}"> @@ -49,7 +49,7 @@ state="{{ forms.details['Country'].$valid ? '' : 'error' }}" ng-required="true" ng-model="entity.Country" - is-readonly="true" + is-readonly="action === 'select'" dropdown-items="optionsCountry" placeholder="{{ 'codbex-cities:codbex-cities-model.messages.inputSearch' | t:{'name':'$t(codbex-cities:codbex-cities-model.t.CITY_COUNTRY)'} }}" btn-aria-label="{{ 'codbex-cities:codbex-cities-model.aria.showHide' | t:{'name':'Country'} }}" list-aria-label="{{ 'codbex-cities:codbex-cities-model.aria.options' | t:{'name':'Country'} }}"> diff --git a/codbex-cities/package.json b/codbex-cities/package.json index bd1793c..bee2ac8 100644 --- a/codbex-cities/package.json +++ b/codbex-cities/package.json @@ -12,6 +12,6 @@ "build": "tsc" }, "dependencies": { - "@codbex/codbex-countries": "1.0.0" + "@codbex/codbex-countries": "^1.0.0" } -} +} \ No newline at end of file diff --git a/codbex-cities/project.json b/codbex-cities/project.json index 7d3df41..9bd1ba4 100644 --- a/codbex-cities/project.json +++ b/codbex-cities/project.json @@ -1,27 +1,3 @@ { - "guid": "codbex-cities", - "dependencies": [ - { - "guid": "codbex-countries", - "type": "git", - "url": "https://github.com/codbex/codbex-countries.git", - "branch": "main" - } - ], - "actions": [ - { - "name": "Build TypeScript", - "commands": [ - { - "os": "unix", - "command": "tsc" - }, - { - "os": "windows", - "command": "cmd /c tsc" - } - ], - "registry": "true" - } - ] + "guid": "codbex-cities" } \ No newline at end of file diff --git a/codbex-cities/tsconfig.json b/codbex-cities/tsconfig.json deleted file mode 100644 index 9b957e3..0000000 --- a/codbex-cities/tsconfig.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "compilerOptions": { - "module": "ESNext", - "target": "ES6", - "moduleResolution": "Node", - "baseUrl": "../", - "lib": [ - "ESNext", - "DOM" - ], - "paths": { - "sdk/*": [ - "./modules/src/*" - ], - "/*": [ - "./*" - ] - }, - "types": [ - "../modules/types" - ] - } -} \ No newline at end of file