From 3d11999b9b901ea464028c374f2a1e3500066109 Mon Sep 17 00:00:00 2001 From: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com> Date: Mon, 18 Aug 2025 09:25:20 +0200 Subject: [PATCH 1/3] Updated latest versions (#680) --- docs/aditional-information/52-versions.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/aditional-information/52-versions.md b/docs/aditional-information/52-versions.md index f21597022..7d68962fb 100644 --- a/docs/aditional-information/52-versions.md +++ b/docs/aditional-information/52-versions.md @@ -28,14 +28,21 @@ In this section you can check the different releases of **OntimizeWeb** and its + + 15.6.0 + 15.1.0 + 15.0.1
15.0.0 + 15.2.0 + 15.1.2
15.1.1
15.1.0
15.0.0 + 15.1.0 + 15.1.1
15.1.0
15.0.0 + 15.5.8 15.0.0 - 15.0.1
15.0.0 15.1.6
15.1.5
15.1.4
15.1.3
15.1.2
15.1.1
15.1.0
15.0.1
15.0.0 - 15.1.2
15.1.1
15.1.0
15.0.0 15.0.4
15.0.3
15.0.2
15.0.1
15.0.0 - 15.1.1
15.1.0
15.0.0 + 15.5.7 From b8c0a808782686b5b7a2b8e92b39f23cb5ea05fa Mon Sep 17 00:00:00 2001 From: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com> Date: Mon, 18 Aug 2025 09:25:43 +0200 Subject: [PATCH 2/3] Migration Guide: Upgrading from 15.x.x to 15.6.0 (#679) * Migration Guide: Upgrading from 15.x.x to 15.6.0 * Updated migration to 15.6.0 --- _data/menu_descriptions.yml | 2 +- docs/aditional-information/19-migrations.md | 4 +- .../20-migrations-to-15.6.0.md | 97 +++++++++++++++++++ docs/aditional-information/migration-page.md | 3 +- 4 files changed, 103 insertions(+), 3 deletions(-) create mode 100644 docs/aditional-information/20-migrations-to-15.6.0.md diff --git a/_data/menu_descriptions.yml b/_data/menu_descriptions.yml index 6dc272541..8c8e09c92 100644 --- a/_data/menu_descriptions.yml +++ b/_data/menu_descriptions.yml @@ -347,7 +347,7 @@ sections: description: "Section that resolves common questions about Ontimize Web" - url: "/versions/" title: "Releases" - description: "Tables of all the Onitimze Web releases and its compatibilities" + description: "Tables of all the Ontimize Web releases and its compatibilities" - url: "/migrations/" title: "Migration guides" description: "Download page of our version migration guides" diff --git a/docs/aditional-information/19-migrations.md b/docs/aditional-information/19-migrations.md index dc3178448..c166fc492 100644 --- a/docs/aditional-information/19-migrations.md +++ b/docs/aditional-information/19-migrations.md @@ -1,7 +1,9 @@ --- layout: default -title: "Migration guides" +title: "Migration guide to version 15" permalink: /migration-8-to-15/ +parent: Migration guides +grandParent: Aditional information nav_exclude: true --- {% include base_path %} diff --git a/docs/aditional-information/20-migrations-to-15.6.0.md b/docs/aditional-information/20-migrations-to-15.6.0.md new file mode 100644 index 000000000..e8f482b40 --- /dev/null +++ b/docs/aditional-information/20-migrations-to-15.6.0.md @@ -0,0 +1,97 @@ +--- +layout: default +title: "Migration Guide: Upgrading from 15.x.x to 15.6.0" +permalink: /migration-15.x.x-to-15.6.0/ +parent: Migration guides +grandParent: Aditional information +nav_exclude: true +--- +{% include base_path %} +{% include toc %} + +## **Proceso de Migración de Ontimize Web 15.x.x a la versión 15.6.0** + +Este proceso cubre **exclusivamente los cambios incompatibles** (*breaking changes*) introducidos en la versión 15.6.0 de Ontimize Web. Úsalo para asegurar una migración completa y segura. + +**Importante:** Al migrar a `ontimize-web-ngx@15.6.0`, los siguientes addons oficiales **también deben actualizarse** para mantener la compatibilidad: + - `ontimize-web-ngx-chart@15.1.0` + - `ontimize-web-ngx-report@15.2.0` + - `ontimize-web-ngx-filemanager@15.1.0` + + +### 1. Cambio de tipo en `servicesConfiguration` en app.config.ts + +* Cambiar la declaración de: + + ```ts + servicesConfiguration?: Object; + ``` + + a: + + ```ts + servicesConfiguration?: OntimizeServiceConfig | JSONAPIServiceConfig; + ``` +* Importar `OntimizeServiceConfig` o `JSONAPIServiceConfig` desde `ontimize-web-ngx`. +* Incluir el tipo de servicio explícitamente si es necesario: + + +### 2. Reemplazo de `OntimizeBaseService` + +* Buscar todas las clases que extienden `OntimizeBaseService` y reemplazarlas por uno de los siguientes servicios, según el caso: + - `OntimizeService` (uso estándar) + - `OntimizeEEService` (para Enterprise Edition) + - `JSONApiService` (para backends JSON:API) + +* Verificar que el constructor use `super(injector)`. + + +### 3. Cambio en el método `getQueryArguments` + +* Actualizar la firma en llamadas al método: + + * `ovrrArgs` ahora es de tipo `OQueryDataArgs`. + * El método ahora devuelve un `OQueryParams`, no un `any[]`. + +* Antes: + +```ts +getQueryArguments(filter: object, ovrrArgs?: any): any[] +``` + +* Después: + +```ts +getQueryArguments(filter: object, ovrrArgs?: OQueryDataArgs): OQueryParams +``` + +### 4. Cambio de nombre OntimizeQueryArgumentsAdapter + +* Renombrar `OntimizeQueryArgumentsAdapter` por `OntimizeRequestArgumentsAdapter` + +### 5. Cambio de interfaz en adaptadores de respuesta + +* Buscar clases que implementan `ServiceResponseAdapter`. + * Reemplazar por `IServiceResponseAdapter`. + * Verificar que implementen el método `adaptResponse()` correctamente. + +* Antes: + +```ts +export class MyAdapter implements ServiceResponseAdapter { + adaptResponse(resp: any): BaseServiceResponse { ... } +} +``` + +* Después: + +```ts +export class MyAdapter implements IServiceResponseAdapter { + adaptResponse(resp: any): BaseServiceResponse { ... } +} +``` + + + + + diff --git a/docs/aditional-information/migration-page.md b/docs/aditional-information/migration-page.md index d7c6f8227..8257ad742 100644 --- a/docs/aditional-information/migration-page.md +++ b/docs/aditional-information/migration-page.md @@ -12,4 +12,5 @@ nav_order: 3 In this page you can view migration guides for specific versions where additional steps are need. -* Migration guide from ontimize web 8 to ontimize web 15 \ No newline at end of file +* Migration guide from ontimize web 8 to ontimize web 15 +* Migration guide from ontimize web 15.x.x to ontimize web 15.6.0 \ No newline at end of file From a4a7250fc8be79d66fca422d7be62ecc5edc99d5 Mon Sep 17 00:00:00 2001 From: Patricia Martinez <32088627+patricia-martinez-imatia@users.noreply.github.com> Date: Mon, 18 Aug 2025 10:05:37 +0200 Subject: [PATCH 3/3] Updating doc with JSON:API adapters (#671) * Updating doc with JSON:API adapters * Added nameConvention * New input configure-service-args * Updated breaking change about type SERVICE_CONFIG * Updated gemfile * Added new section jsonapi services * Updated injection token information * Updated service section * Updated ruby version to 3.2 --- .github/workflows/ci.yml | 2 +- Gemfile.lock | 128 ++++- _data/components/common/attributes.yml | 11 +- _data/components/form.yml | 3 +- _data/components/grid.yml | 2 +- _data/components/list.yml | 2 +- _data/components/ocomboData/00combo.yml | 2 +- .../olistpickerData/00listPicker.yml | 2 +- _data/components/otableData/00table.yml | 2 +- .../09tableColumnRendererService.yml | 2 + _data/components/overviewService.yml | 2 + _data/components/overviewchart.yml | 2 +- _data/components/radio.yml | 2 +- _data/components/service.yml | 2 +- _data/components/serviceBase.yml | 2 + _data/menu_descriptions.yml | 8 + _includes/nav_cards.html | 2 - ...napi_service_request_example_response.json | 128 +++++ assets/images/jsonapi-request.png | Bin 0 -> 16997 bytes assets/images/jsonapi-response.png | Bin 0 -> 53340 bytes assets/images/menus/services/jsonapi.svg | 1 + assets/images/menus/services/jsonapi_dark.svg | 9 + assets/images/menus/services/ontimize.svg | 6 + .../images/menus/services/ontimize_dark.svg | 6 + .../components/jsonapi.md | 37 ++ .../components/report-store.md | 34 +- docs/guide/10-structure.md | 2 +- docs/guide/11-app-config.md | 32 +- docs/guide/15-service.md | 494 ++++++++++-------- docs/guide/services/15d-ontimize.md | 159 ++++++ docs/guide/services/15e-jsonapi.md | 389 ++++++++++++++ 31 files changed, 1205 insertions(+), 268 deletions(-) create mode 100644 assets/examples/jsonapi_service_request_example_response.json create mode 100644 assets/images/jsonapi-request.png create mode 100644 assets/images/jsonapi-response.png create mode 100644 assets/images/menus/services/jsonapi.svg create mode 100644 assets/images/menus/services/jsonapi_dark.svg create mode 100644 assets/images/menus/services/ontimize.svg create mode 100644 assets/images/menus/services/ontimize_dark.svg create mode 100644 docs/addons/ontimize_web_ngx_report/components/jsonapi.md create mode 100644 docs/guide/services/15d-ontimize.md create mode 100644 docs/guide/services/15e-jsonapi.md diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a7b5e9b64..bdf987edc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: '3.1' # Not needed with a .ruby-version file + ruby-version: '3.2' # Not needed with a .ruby-version file bundler-cache: true # runs 'bundle install' and caches installed gems automatically cache-version: 0 # Increment this number if you need to re-download cached gems - name: Build with Jekyll diff --git a/Gemfile.lock b/Gemfile.lock index 2b5f3c5f4..6b14d89c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,21 +1,58 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.2.2) colorator (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) - ffi (1.16.3) + ffi (1.17.2) + ffi (1.17.2-aarch64-linux-gnu) + ffi (1.17.2-aarch64-linux-musl) + ffi (1.17.2-arm-linux-gnu) + ffi (1.17.2-arm-linux-musl) + ffi (1.17.2-arm64-darwin) + ffi (1.17.2-x86-linux-gnu) + ffi (1.17.2-x86-linux-musl) + ffi (1.17.2-x86_64-darwin) + ffi (1.17.2-x86_64-linux-gnu) + ffi (1.17.2-x86_64-linux-musl) forwardable-extended (2.6.0) - google-protobuf (3.25.3-x86_64-linux) + google-protobuf (4.31.1) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-aarch64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-aarch64-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-arm64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-x86-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-x86-linux-musl) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-x86_64-darwin) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-x86_64-linux-gnu) + bigdecimal + rake (>= 13) + google-protobuf (4.31.1-x86_64-linux-musl) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) - i18n (1.14.4) + i18n (1.14.7) concurrent-ruby (~> 1.0) - jekyll (4.3.3) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -33,8 +70,8 @@ GEM webrick (~> 1.7) jekyll-include-cache (0.2.1) jekyll (>= 3.7, < 5.0) - jekyll-sass-converter (3.0.0) - sass-embedded (~> 1.54) + jekyll-sass-converter (3.1.0) + sass-embedded (~> 1.75) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-watch (2.2.1) @@ -44,8 +81,8 @@ GEM jekyll-include-cache jekyll-seo-tag (>= 2.0) rake (>= 12.3.1) - kramdown (2.4.0) - rexml + kramdown (2.5.1) + rexml (>= 3.3.9) kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) liquid (4.0.4) @@ -55,27 +92,74 @@ GEM mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) - public_suffix (5.0.5) - rake (13.2.1) + public_suffix (6.0.2) + rake (13.3.0) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.2.6) - rouge (4.2.1) + rexml (3.4.1) + rouge (4.5.2) safe_yaml (1.0.5) - sass-embedded (1.63.6-x86_64-linux-gnu) - google-protobuf (~> 3.23) + sass-embedded (1.89.2) + google-protobuf (~> 4.31) + rake (>= 13) + sass-embedded (1.89.2-aarch64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-aarch64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-aarch64-linux-musl) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-arm-linux-androideabi) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-arm-linux-gnueabihf) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-arm-linux-musleabihf) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-arm64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-riscv64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-riscv64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-riscv64-linux-musl) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-x86_64-darwin) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-x86_64-linux-android) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-x86_64-linux-gnu) + google-protobuf (~> 4.31) + sass-embedded (1.89.2-x86_64-linux-musl) + google-protobuf (~> 4.31) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - unicode-display_width (2.5.0) - webrick (1.8.1) + unicode-display_width (2.6.0) + webrick (1.9.1) PLATFORMS - x86_64-linux + aarch64-linux-android + aarch64-linux-gnu + aarch64-linux-musl + arm-linux-androideabi + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin + riscv64-linux-android + riscv64-linux-gnu + riscv64-linux-musl + ruby + x86-linux-gnu + x86-linux-musl + x86_64-darwin + x86_64-linux-android + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES jekyll (~> 4.3.3) just-the-docs (= 0.8.2) BUNDLED WITH - 2.4.20 + 2.6.9 diff --git a/_data/components/common/attributes.yml b/_data/components/common/attributes.yml index 8fc45faad..68c15e189 100644 --- a/_data/components/common/attributes.yml +++ b/_data/components/common/attributes.yml @@ -465,5 +465,14 @@ default: "[10, 25, 50, 100]", required: "", description: "Page size options separated by ';'." - } + }, + "configure-service-args": { + name: "configure-service-args", + type: "OConfigureServiceArgs", + since: "15.6.0", + default: "no", + required: "", + description: "Allows configure service" + } + } diff --git a/_data/components/form.yml b/_data/components/form.yml index c386946e5..f40a197b1 100644 --- a/_data/components/form.yml +++ b/_data/components/form.yml @@ -185,7 +185,8 @@ attributes: [ type: "(data: any) => OFormValidation", since: "15.4.2", description: "Executes the before-save validation callback for insert and update operations." - +},{ + name: "configure-service-args" }] outputs: [{ diff --git a/_data/components/grid.yml b/_data/components/grid.yml index 758410447..faa0eb343 100644 --- a/_data/components/grid.yml +++ b/_data/components/grid.yml @@ -6,7 +6,7 @@ apiTitle: "OGridComponent" inheritedAttributes: [{ component: "OServiceBaseComponent", path: "components/service/service-base/api", - attributes: ["attr", "service", "service-type", "entity", "query-on-init", "query-fallback-function", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "store-state", "query-with-null-parent-keys"] + attributes: ["attr", "service", "service-type", "entity", "query-on-init", "query-fallback-function", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "store-state", "query-with-null-parent-keys", "configure-service-args"] },{ component: "OServiceComponent", path: "components/service/service/api", diff --git a/_data/components/list.yml b/_data/components/list.yml index ceafb6b86..768826842 100644 --- a/_data/components/list.yml +++ b/_data/components/list.yml @@ -5,7 +5,7 @@ apiTitle: "OListComponent" inheritedAttributes: [{ component: "OServiceBaseComponent", path: "components/service/service-base/api", - attributes: ["attr", "service", "service-type", "entity","query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "insert-method", "update-method", "delete-method", "store-state", "query-with-null-parent-keys"] + attributes: ["attr", "service", "service-type", "entity","query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "insert-method", "update-method", "delete-method", "store-state", "query-with-null-parent-keys", "configure-service-args"] },{ component: "OServiceComponent", path: "components/service/service/api", diff --git a/_data/components/ocomboData/00combo.yml b/_data/components/ocomboData/00combo.yml index e59e09853..3bb86ab7b 100644 --- a/_data/components/ocomboData/00combo.yml +++ b/_data/components/ocomboData/00combo.yml @@ -7,7 +7,7 @@ inheritedAttributes: [{ },{ component: "OFormServiceComponent", path: "components/input/overviewservice/api", - attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "description-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort"] + attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "description-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort", "configure-service-args"] }] inheritedOutputs: [{ diff --git a/_data/components/olistpickerData/00listPicker.yml b/_data/components/olistpickerData/00listPicker.yml index 82ce273cd..9cd1e8a93 100644 --- a/_data/components/olistpickerData/00listPicker.yml +++ b/_data/components/olistpickerData/00listPicker.yml @@ -7,7 +7,7 @@ inheritedAttributes: [{ },{ component: "OFormServiceComponent", path: "components/input/overviewservice/api", - attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "description-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort"] + attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "description-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort", "configure-service-args"] }] attributes: [{ diff --git a/_data/components/otableData/00table.yml b/_data/components/otableData/00table.yml index 6a12ac583..bd7fa1c0f 100644 --- a/_data/components/otableData/00table.yml +++ b/_data/components/otableData/00table.yml @@ -5,7 +5,7 @@ directive: "o-table" inheritedAttributes: [{ component: "OServiceBaseComponent", path: "components/service/service-base/api", - attributes: ["attr", "service", "service-type", "entity", "query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys *", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "insert-method", "update-method", "delete-method", "store-state", "query-with-null-parent-keys"] + attributes: ["attr", "service", "service-type", "entity", "query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys *", "parent-keys", "static-data", "query-method", "paginated-query-method", "query-rows", "insert-method", "update-method", "delete-method", "store-state", "query-with-null-parent-keys", "configure-service-args"] },{ component: "OServiceComponent", path: "components/service/service/api", diff --git a/_data/components/otableData/renderers/09tableColumnRendererService.yml b/_data/components/otableData/renderers/09tableColumnRendererService.yml index 08f2a0bdc..0769fa160 100644 --- a/_data/components/otableData/renderers/09tableColumnRendererService.yml +++ b/_data/components/otableData/renderers/09tableColumnRendererService.yml @@ -22,6 +22,8 @@ attributes: [{ name: "query-method" },{ name: "service-type" +},{ + name: "configure-service-args" }] inherit_properties: [{ diff --git a/_data/components/overviewService.yml b/_data/components/overviewService.yml index 1ba0bd127..75159bfef 100644 --- a/_data/components/overviewService.yml +++ b/_data/components/overviewService.yml @@ -79,6 +79,8 @@ attributes: [{ default: "", required: "", description: "Indicates the order ascending or descending of the option values" +},{ + name: "configure-service-args" }] outputs: [{ diff --git a/_data/components/overviewchart.yml b/_data/components/overviewchart.yml index 07e257e0e..5cf40ef63 100644 --- a/_data/components/overviewchart.yml +++ b/_data/components/overviewchart.yml @@ -5,7 +5,7 @@ apiTitle: "OChartComponent" inheritedAttributes: [{ component: "OServiceBaseComponent", path: "components/service/service-base/api", - attributes: ["attr", "service", "service-type", "entity", "query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "query-rows", "store-state", "query-with-null-parent-keys"] + attributes: ["attr", "service", "service-type", "entity", "query-fallback-function", "query-on-init", "query-on-bind", "pageable", "columns", "keys", "parent-keys", "static-data", "query-method", "query-rows", "store-state", "query-with-null-parent-keys", "configure-service-args"] }] attributes: [{ diff --git a/_data/components/radio.yml b/_data/components/radio.yml index afe9f8c95..2dcad1e32 100644 --- a/_data/components/radio.yml +++ b/_data/components/radio.yml @@ -9,7 +9,7 @@ inheritedAttributes: [{ },{ component: "OFormServiceComponent", path: "components/input/overviewservice/api", - attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "visible-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort"] + attributes: ["static-data", "entity", "service", "columns", "value-column", "value-column-type", "parent-keys", "visible-columns", "separator", "query-on-init", "query-on-bind", "query-on-event", "query-method", "service-type", "query-with-null-parent-keys", "set-value-on-value-change", "translate", "sort", "configure-service-args"] }] inheritedOutputs: [{ diff --git a/_data/components/service.yml b/_data/components/service.yml index 1afa5b450..42021a388 100644 --- a/_data/components/service.yml +++ b/_data/components/service.yml @@ -5,7 +5,7 @@ propertiesColumns: ["Name", "Type", "Required", "Description"] inheritedAttributes: [{ component: "OServiceBaseComponent", path: "components/service/service-base/api", - attributes: ["attr", "static-data", "service", "service-type","query-fallback-function", "query-method", "entity", "keys", "parent-keys", "columns", "query-on-init", "query-on-bind", "query-rows", "insert-method", "update-method", "paginated-query-method", "delete-method", "pageable", "store-state", "query-with-null-parent-keys"] + attributes: ["attr", "static-data", "service", "service-type","query-fallback-function", "query-method", "entity", "keys", "parent-keys", "columns", "query-on-init", "query-on-bind", "query-rows", "insert-method", "update-method", "paginated-query-method", "delete-method", "pageable", "store-state", "query-with-null-parent-keys", "configure-service-args"] }] attributes: [{ diff --git a/_data/components/serviceBase.yml b/_data/components/serviceBase.yml index 990701f8b..4583fc1c1 100644 --- a/_data/components/serviceBase.yml +++ b/_data/components/serviceBase.yml @@ -55,6 +55,8 @@ attributes: [{ description: "Function to execute on query error", type: "Function", default: "No value" +},{ + name: "configure-service-args" } ] diff --git a/_data/menu_descriptions.yml b/_data/menu_descriptions.yml index 8c8e09c92..edbf9d29e 100644 --- a/_data/menu_descriptions.yml +++ b/_data/menu_descriptions.yml @@ -418,3 +418,11 @@ sections: - url: "/addons/report/" title: "Report" imagepath: "/assets/images/menus/addons/report" + "services": + - url: "/guide/service/jsonapi" + title: "JSON:API " + imagepath: "/assets/images/menus/services/jsonapi" + - url: "/guide/service/ontimize" + title: "Ontimize" + imagepath: "/assets/images/menus/services/ontimize" + diff --git a/_includes/nav_cards.html b/_includes/nav_cards.html index fbbef5fa4..696626b64 100644 --- a/_includes/nav_cards.html +++ b/_includes/nav_cards.html @@ -20,8 +20,6 @@ - -
diff --git a/assets/examples/jsonapi_service_request_example_response.json b/assets/examples/jsonapi_service_request_example_response.json new file mode 100644 index 000000000..d45ff3680 --- /dev/null +++ b/assets/examples/jsonapi_service_request_example_response.json @@ -0,0 +1,128 @@ +{ + "data": [ + { + "attributes": { + "CategoryName": "Beverages", + "Client_id": 1, + "Description": "Soft drinks, coffees, teas, beers, and ales", + "Id": 1 + }, + "id": "1", + "links": { + "self": "/api/Category/1/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Condiments", + "Client_id": 2, + "Description": "Sweet and savory sauces, relishes, spreads, and seasonings", + "Id": 2 + }, + "id": "2", + "links": { + "self": "/api/Category/2/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Confections", + "Client_id": 2, + "Description": "Desserts, candies, and sweet breads", + "Id": 3 + }, + "id": "3", + "links": { + "self": "/api/Category/3/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Dairy Products", + "Client_id": 2, + "Description": "Cheeses", + "Id": 4 + }, + "id": "4", + "links": { + "self": "/api/Category/4/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Grains/Cereals", + "Client_id": 3, + "Description": "Breads, crackers, pasta, and cereal", + "Id": 5 + }, + "id": "5", + "links": { + "self": "/api/Category/5/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Meat/Poultry", + "Client_id": 3, + "Description": "Prepared meats", + "Id": 6 + }, + "id": "6", + "links": { + "self": "/api/Category/6/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Produce", + "Client_id": 3, + "Description": "Dried fruit and bean curd", + "Id": 7 + }, + "id": "7", + "links": { + "self": "/api/Category/7/" + }, + "relationships": {}, + "type": "Category" + }, + { + "attributes": { + "CategoryName": "Seafood", + "Client_id": 3, + "Description": "Seaweed and fish", + "Id": 8 + }, + "id": "8", + "links": { + "self": "/api/Category/8/" + }, + "relationships": {}, + "type": "Category" + } + ], + "included": [], + "jsonapi": { + "version": "1.0" + }, + "links": { + "self": "/api/Category/?fields[Category]=CategoryName,Description,Client_id,Id&sort=CategoryName&page[offset]=0&page[limit]=20" + }, + "meta": { + "count": 8, + "limit": 20, + "total": 8 + } +} \ No newline at end of file diff --git a/assets/images/jsonapi-request.png b/assets/images/jsonapi-request.png new file mode 100644 index 0000000000000000000000000000000000000000..bb0f9a6e5b25a662100083cd9255419db70da362 GIT binary patch literal 16997 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 literal 0 HcmV?d00001 diff --git a/assets/images/jsonapi-response.png b/assets/images/jsonapi-response.png new file mode 100644 index 0000000000000000000000000000000000000000..e84620f1ffb1da9720e3f94ab0bad7d2c74f7f86 GIT binary patch literal 53340 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

P$UgPY%OeZ9A5yb&w4|3e18qoq1GV~ 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

eNH8`3 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 literal 0 HcmV?d00001 diff --git a/assets/images/menus/services/jsonapi.svg b/assets/images/menus/services/jsonapi.svg new file mode 100644 index 000000000..86010d9db --- /dev/null +++ b/assets/images/menus/services/jsonapi.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/menus/services/jsonapi_dark.svg b/assets/images/menus/services/jsonapi_dark.svg new file mode 100644 index 000000000..abc168223 --- /dev/null +++ b/assets/images/menus/services/jsonapi_dark.svg @@ -0,0 +1,9 @@ + + + \ No newline at end of file diff --git a/assets/images/menus/services/ontimize.svg b/assets/images/menus/services/ontimize.svg new file mode 100644 index 000000000..42be207c5 --- /dev/null +++ b/assets/images/menus/services/ontimize.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/assets/images/menus/services/ontimize_dark.svg b/assets/images/menus/services/ontimize_dark.svg new file mode 100644 index 000000000..f50b024e3 --- /dev/null +++ b/assets/images/menus/services/ontimize_dark.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/docs/addons/ontimize_web_ngx_report/components/jsonapi.md b/docs/addons/ontimize_web_ngx_report/components/jsonapi.md new file mode 100644 index 000000000..729a1f2f6 --- /dev/null +++ b/docs/addons/ontimize_web_ngx_report/components/jsonapi.md @@ -0,0 +1,37 @@ +--- +title: "Report store" +permalink: /addons/report/components/report-store/jsonapi +layout: default +parent: Report store +grand_parent: Report +nav_order: 4 +--- +# Introduction +The *Report Store** system will allow you to store, manage and export all kinds of reports designed and implemented via the JasperReports API. This module will let you use your Ontimize application data as data sources for your reports, allowing you to fully customize its layout with tables, charts, graphs… and also visualize, export, print and download your reports. + + +# Previous concepts +* Report: It is the generic representation of a report. One report can have one or multiple custom report parameters, or have none. +* Main report file: The file containing all the information regarding the report layout, along with the data sources, connections and other configuration directives. Written in .jrxml format. +* Report parameter: It is the generic representation of a custom report parameter. They are used for defining filters, implementing pagination, or even specifying the report data source. + +# Steps +```ts + { + "REPORTUUID": string + "REPORTNAME": string + "REPORTTYPE": string + "REPORTDESCRIPTION": string + "REPORTFILENAME":string + + }; + { + REPORTPARAMETERID:number, INTEGER PRIMARY KEY AUTOINCREMENT, + REPORTPARAMETERNAME:string, + REPORTPARAMETERDESCRIPTION: string, + REPORTPARAMETERNESTEDTYPE: string, + REPORTPARAMETERVALUECLASS: string, + REPORTUUID:string + } + + diff --git a/docs/addons/ontimize_web_ngx_report/components/report-store.md b/docs/addons/ontimize_web_ngx_report/components/report-store.md index 6f3fe05a2..d3e0ec648 100644 --- a/docs/addons/ontimize_web_ngx_report/components/report-store.md +++ b/docs/addons/ontimize_web_ngx_report/components/report-store.md @@ -7,13 +7,35 @@ grand_parent: Addons nav_order: 3 --- +Report store supports **OntimizeEE** and **JSON:API** standards. + +{: .note} +>Remember, if you are implementing **OntimizeEE**, to complete the steps you need to perform on your backend server to complete the report store configuration following this [link](https://ontimize.github.io/ontimize-boot/basics/reports/report-store){:target="_blank"} + {: .note} ->Remember to complete the steps you need to perform on your backend server to complete the report store configuration following this [link](https://ontimize.github.io/ontimize-boot/basics/reports/report-store){:target="_blank"} +>Additionally, if you are implementing **JSON:API**, ensure your backend is configured accordingly by following the guidelines provided [here]({{ base_path }}/jsonapi){:target="_blank"} To add that in your application run a reports with jasper template you have to follow the following steps +1. To configure the report store service, you can configure the path in `servicesConfiguration`. +The default path for requests to +* **OntimizeEE** is `/reportstore` , +* **JSON:API** is `/Report` . + +```ts +export const SERVICE_CONFIG = +{ + 'reportoarameter': { + 'path': '/ReportParameter' + }, + 'reportstore': { + 'path': '/Report' + }, + ... +} +``` -1. To add new menu option `Reports` in `src/app/shared/app.menu.config.ts` +2. To add new menu option `Reports` in `src/app/shared/app.menu.config.ts` ```ts .. @@ -32,7 +54,7 @@ To add that in your application run a reports with jasper template you have to f } ``` -2. In `src/app/main/main-routing.module.ts`, add a route for new report management module p.e with `path` of `reports` +3. In `src/app/main/main-routing.module.ts`, add a route for new report management module p.e with `path` of `reports` ```ts import { NgModule } from '@angular/core'; @@ -58,7 +80,7 @@ To add that in your application run a reports with jasper template you have to f export class MainRoutingModule { } ``` -3. Create the new report management module `ReportModule` and import `OReportRoutingModule` module +4. Create the new report management module `ReportModule` and import `OReportRoutingModule` module ```ts import { NgModule } from '@angular/core'; @@ -78,7 +100,7 @@ To add that in your application run a reports with jasper template you have to f export class ReportModule{} ``` -4. To add/remove/update report +5. To add/remove/update report Now you should a new option similar to where you can management the reports @@ -92,7 +114,7 @@ To add that in your application run a reports with jasper template you have to f ![Detail report ]({{ "/assets/images/report/reportDetailStore.png" | absolute_url }}){: .comp-example-img} -5. Add a button and on its click event generate the PDF document. The method `openFillReport` takes as parameter the `UUID`, the parameters values and the filter of the report. +6. Add a button and on its click event generate the PDF document. The method `openFillReport` takes as parameter the `UUID`, the parameters values and the filter of the report. ```html diff --git a/docs/guide/10-structure.md b/docs/guide/10-structure.md index ccd83964b..018fbfdc5 100644 --- a/docs/guide/10-structure.md +++ b/docs/guide/10-structure.md @@ -57,7 +57,7 @@ ontimize-web-ngx-quickstart | | | ├── movement-types-renderer/ # Custom component (cell renderer) definition | | | |── style-manager/ # Class for managing stylesheets | | | |── app.menu.config.ts # Application menu definition -| | | |── app.services.config.ts # Ontimize JEE services path configuration file +| | | |── app.services.config.ts # Ontimize JEE or JSON:API services path configuration file | | | |── constant.ts # File used to store constant variables on the app like the primary color code | | | └── shared.modules.ts # Shared module definition | | | diff --git a/docs/guide/11-app-config.md b/docs/guide/11-app-config.md index 330b88c0b..378c010e9 100644 --- a/docs/guide/11-app-config.md +++ b/docs/guide/11-app-config.md @@ -29,7 +29,7 @@ export const CONFIG: Config = { uuid: 'com.ontimize.web.quickstart', title: 'Ontimize Web QuickStart', locale: 'es', /* Optional */ - serviceType: 'Ontimize' | 'OntimizeEE',/* Optional */ + serviceType: 'Ontimize' | 'OntimizeEE' | 'JSONAPI',/* Optional, by default is OntimizeEE */ servicesConfiguration: SERVICE_CONFIG, appMenuConfiguration: MENU_CONFIG, applicationLocales: ['es', 'en'], @@ -55,7 +55,8 @@ export const CONFIG: Config = { }, exportConfiguration: { path:'/export' - } + }, + nameConvention: 'upper' | 'lower' | 'database' /* Optional */ }; ``` {: .no-scroll} @@ -66,11 +67,12 @@ The noteworthy parameters here are: - **uuid:** The application identifier, this is the unique package identifier of the application. It is used when storing or managing temporal data related with the application. By default is set as `ontimize-web-uuid`. - **title:** The title of the application. - **locale:** The language of the application specified by the country code (e.g. 'es' for Spanish, 'en' for English, etc.). -- **serviceType:** The service type used in the app by framework components that request data from server. You can specify Ontimize REST standard, Ontimize REST JEE or a custom implementation. - - **Not configured (by default):** if you do not configure or specify this parameter, the framework configures Ontimize REST standard services. - - **'Ontimize'(default):** string that configures Ontimize REST services. - - **'OntimizeEE':** string that configures Ontimize REST JEE services and is the default value. - - **Custom class:** a service class reference that extends `OntimizeService` or `OntimizeEEService` or implements the `IDataService` interface. More information [here]({{ base_path }}/guide/service/#extending-ontimize-web-services){:target="_blank"}. +- **serviceType:** The service type used in the app by framework components that request data from server. You can specify Ontimize REST standard, Ontimize REST JEE, JSON:API standard or a custom implementation. + - **Not configured (by default):** if you do not configure or specify this parameter, the framework configures OntimizeEE REST standard services. + - **'Ontimize'** string that configures Ontimize REST services. + - **'OntimizeEE'(default)::** string that configures Ontimize REST JEE services and is the default value. + - **'JSONAPI':** string that configures JSON:API REST services + - **Custom class:** a service class reference that extends `OntimizeService`, `OntimizeEEService`, `JSONAPI` or implements the `IDataService` interface. More information [here]({{ base_path }}/guide/service/#extending-ontimize-web-services){:target="_blank"}. - **servicesConfiguration:** Object that contains the services configuration parameters. Learn more [here](#services-configuration). - **appMenuConfiguration:** Object defining application menu structure. Learn more [here](#menu-configuration). - **applicationLocales:** Set of available locales for the application. @@ -94,6 +96,11 @@ The noteworthy parameters here are: - **permissionsConfiguration:** permissions service configuration object. - **exportConfiguration**: export configuration object required only with `Ontimize Boot version 3.9.0 or above` - **path**: the export path used in the remote package query compatible. +- **nameConvention**: Indicates the naming format to which database column names will be transformed when exposed through REST API requests. + Column names will be converted to `upper`,`lower` or `database` + - `upper`: All letters in column names will be converted to uppercase (e.g., `USER_ID`). + - `lower`: All letters in column names will be converted to lowercase (e.g., `user_id`). + - `database`: Column names will be used as defined in the component configuration, without any transformation (e.g., `UserId` or `USER_ID`, depending on how they are stored). # Package.json configuration @@ -311,12 +318,15 @@ You have to replace the references of "ontimize-web-ngx-jee-seed" by the name of # Services configuration -If you indicate in the application configuration that the application should use **OntimizeEE** services (check `serviceType` attribute in the [previous section](#application-configuration-file) of this page), you have to configure the service paths. For doing this **OntimizeWeb** uses the `servicesConfiguration` property from the app configuration file that must point to an object defined as in the example below. +Ontimize Web supports **OntimizeEE** and **JSON:API**, to configure this standards you need to specify it in the `servicesConfiguration` (check `serviceType` attribute in the [previous section](#application-configuration-file). + of this page). + + If you indicate in the application configuration that the application should use **OntimizeEE** or **JSON:API** services, you have to configure the service paths. For doing this **OntimizeWeb** uses the `servicesConfiguration` property from the app configuration file which should reference an object structured as shown in the example below. -In this object, the keys represents the different services names used in the application. Every service needs a `path` property where you must set the path of the service, excluding the URL configured in the `apiEndpoint` attribute of the application configuration. +In this object, each key represents a different service used in the application. Each service must include a `path` property, where you define the service's path—excluding the base URL specified in the apiEndpoint attribute of the application configuration. ```javascript -export const SERVICE_CONFIG: Object = { +export const SERVICE_CONFIG = { 'users': { 'path': '/users' }, @@ -338,7 +348,7 @@ export const SERVICE_CONFIG: Object = { }; ``` -For clarification, if your `apiEndpoint` is the one in the [application configuration](#application-configuration-file) example, **OntimizeWeb** will concat the `apiEndpoint` and the `path` of the service to build the URL for sending requests. For example : https://try.ontimize.com/QSAllComponents-jee/services/rest/customers. +For clarification, if your `apiEndpoint` is the one in the [application configuration](#application-configuration-file) example, **OntimizeWeb** and **JSON:API** will concat the `apiEndpoint` and the `path` of the service to build the URL for sending requests. For example : https://try.ontimize.com/QSAllComponents-jee/services/rest/customers. # Internationalization (i18) configuration diff --git a/docs/guide/15-service.md b/docs/guide/15-service.md index 95a63a92f..f46250c1d 100644 --- a/docs/guide/15-service.md +++ b/docs/guide/15-service.md @@ -1,279 +1,333 @@ --- layout: default -title: "Services" +title: Services +has_children: true permalink: /guide/service/ parent: Guide -nav_order: 6 +nav_order: 3 +has_toc: false --- {% include base_path %} {% include toc %} -This section describes the **OntimizeWeb** services an how to extend them to add or modify its functionality. +OntimizeWeb provides a powerful and flexible way to interact with backend services, supporting both **standard APIs using the JSON:API** and **Ontimize-based backends** . This allows developers to integrate data sources seamlessly using a standardized interface while maintaining the reactive and component-driven architecture of Angular. -## Ontimize services +This guide describes how services work in OntimizeWeb, how to extend them, and how to integrate third-party APIs using the JSON:API specification. Whether you're working with an Ontimize server or a modern RESTful API, this documentation will help you implement consistent data access across your application. -OntimizeWeb services are used for fetching and saving data from servers based on [Ontimize](https://github.com/ontimize){:target="_blank"}. There is two types of Ontimize services depending on the server technology used: `OntimizeService` and `OntimizeEEService`. You must indicate which type of service the application will use by configuring the `serviceType` attribute in the [application configuration]({{ base_path }}/guide/appconfig/#application-configuration-file){:target="_blank"}. -You can also use your own service and adapt its response to OntimizeWeb's standard response. This will be explained later in this section. +{% include nav_cards.html folder="services" %} -### Ontimize services methods -Both services `OntimizeService` and `OntimizeEEService` have the same methods for configuring and sending request to the server. This methods are the following: +## Extending Ontimize Web services -```javascript -/* Configuration methods */ -getDefaultServiceConfiguration(serviceName?: string): Object; -configureService(config: any): void; - -/* CRUD methods */ -query(kv?: Object, av?: Array, entity?: string, sqltypes?: Object): Observable; -advancedQuery(kv?: Object, av?: Array, entity?: string, sqltypes?: object, - offset?: number, pagesize?: number, orderby?: Array): Observable -insert(av: Object = {}, entity: string, sqltypes?: object): Observable -update(kv: Object = {}, av: object = {}, entity?: string, sqltypes?: object): Observable -delete(kv: Object = {}, entity?: string, sqltypes?: Object): Observable - -/** -* Successful response parsers, there is one parser for each CRUD method which calls to the common parser. -* User can overwrite the chosen methods parsers or the common parser -*/ -protected parseSuccessfulResponse(resp: any, _innerObserver: any); -protected parseSuccessfulQueryResponse(resp: any, _innerObserver: any); -protected parseSuccessfulAdvancedQueryResponse(resp: any, _innerObserver: any); -protected parseSuccessfulInsertResponse(resp: any, _innerObserver: any); -protected parseSuccessfulUpdateResponse(resp: any, _innerObserver: any); -protected parseSuccessfulDeleteResponse(resp: any, _innerObserver: any); - -/** -* Unsuccessful response parsers, there is one parser for each CRUD method which calls to the common parser. -* User can overwrite the chosen methods parsers or the common parser -*/ -protected parseUnsuccessfulResponse(error: any, _innerObserver: any); -protected parseUnsuccessfulQueryResponse(resp: any, _innerObserver: any); -protected parseUnsuccessfulAdvancedQueryResponse(resp: any, _innerObserver: any); -protected parseUnsuccessfulInsertResponse(resp: any, _innerObserver: any); -protected parseUnsuccessfulUpdateResponse(resp: any, _innerObserver: any); -protected parseUnsuccessfulDeleteResponse(resp: any, _innerObserver: any); - -/* Authentication methods */ -startsession(user: string, password: string): Observable; -endsession(user: string, sessionId: number): Observable; -redirectLogin?(sessionExpired?: boolean); -``` +You can override or extend the functionality of the services defined in **OntimizeWeb**. You should know that some services are used internally and they cannot be extended. The prepared-to-extend services are the following: +| Service | Injection token | Description | +| ----------------------------------------------------------------------------- | ------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `OntimizeService`, `OntimizeEEService` or `JSONAPIService`(since *ontimize-web-ngx@15.6.0*) | `O_DATA_SERVICE` | Service used for making CRUD operation and authentication | +| `OTranslateService` | `O_TRANSLATE_SERVICE` | Service for translating the information shown in the application | +| `OntimizeFileService` | `O_FILE_SERVICE` | Service for uploading files, used by the [`o-file-input`]({{ base_path }}/components/input/file/overview){:target="\_blank"} component | +| `OntimizeExportService` and `OntimizeExportService3X` | `O_EXPORT_SERVICE` | Service used by the [`o-table`]({{ base_path }}/components/data/table/overview){:target="\_blank"} component for exporting its data | +| `OntimizePermissionsService` and `OntimizeEEPermissionsService` | `O_PERMISSION_SERVICE` | Service used for loading the application permissions | +| `AuthService` | `O_AUTH_SERVICE` | Service used for authentication (since *ontimize-web-ngx@8.3.0*) | +| `OReportService` or `JSONAPIReportService` (since *ontimize-web-ngx-report@15.2.0) | `O_REPORT_SERVICE` | Service used to generate reports (since *ontimize-web-ngx@8.7.0*) | +| `OntimizeExportDataProviderService` and `OntimizeExportDataProviderService3X` | `O_EXPORT_DATA_SERVICE` | Service used to provide data and styles to table exports (since *ontimize-web-ngx@8.8.0*) | +| `OTableGlobalConfig` | `O_TABLE_GLOBAL_CONFIG` | Service used to set some [`o-table`]({{ base_path }}/components/data/table/overview){:target="\_blank"} global options (since *ontimize-web-ngx@8.7.3*) | +| `LocalStorageService` | `O_LOCALSTORAGE_SERVICE` | Service used to save in application data in local storage (since *ontimize-web-ngx@15.2.0*) | -### CRUD methods -The *CRUD* (Create, Read, Update and Delete) methods are used to perform standard Ontimize operations: - -* **query**: performs a request to get data from the server. - * **kv**: indicates the filtering values. An empty object means that no filter will be applied into the request. - * **av**: indicates the columns that you want to request. - * **entity**: indicates the entity to perform the request. - * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). -* **advancedQuery**: performs a request to get **paginated** data from the server. - * **kv**: indicates the filtering values. An empty object means that no filter will be applied into the request. - * **av**: indicates the columns that you want to request. - * **entity**: indicates the entity to perform the request. - * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). - * **offset**: the index of the first item requested in the collection. - * **pagesize**: the number of items requested. - * **orderby**: object with the sorting that will be applied to the request result. -* **insert**: performs a insert operation request to the server. - * **av**: indicates the values to insert. - * **entity**: indicates the entity to perform the request. - * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). -* **update**: performs an update operation request to the server. - * **kv**: indicates the filtering values for performing the update. - * **av**: indicates the values to update. - * **entity**: indicates the entity to perform the request. - * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). -* **delete**: performs an delete operation request to the server. - * **kv**: indicates the filtering values for performing the deletion. - * **entity**: indicates the entity to perform the request. - * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). - -### Server response interface -The standard response of the requests made to Ontimize based servers always follows the following structure: +For extending a service you should create your own service that extends a service from **OntimizeWeb** and provide it in your application using the corresponding injection token from the table above. -```javascript -{ - code: number; - data: Array; - message: ''; - sqlTypes?: Object; - startRecordIndex?: number; - totalQueryRecordsNumber?: number; -} + +### Create and extend a service new + +In Ontimize Web, services act as the bridge between UI components and backend APIs or external data sources. Creating and extending a service allows you to customize how data is requested, filtered, and processed to suit your specific backend requirements or third-party APIs. + +To implement a service, you typically define: + +* How query parameters from UI filters are adapted to the backend’s expected format (**Request Arguments Adapter**). +* How the backend’s response is converted into a structure that Ontimize can work with (**Response Adapter**). +* The main service class that manages data operations (query, insert, update, delete) using the above adapters (**Custom Service**). + + +| Component | Purpose | +| ----------------------------- | --------------------------------------------------------------------------------------- | +| **Custom Service** | Extends `BaseDataService`; manages data requests and responses. | +| **Request Arguments Adapter** | Converts Ontimize filters and query parameters to backend format. | +| **Response Adapter** | Transforms backend API responses into Ontimize-compatible format. | +| **Service Response Class** | Defines the structure of the response, mapping backend fields to Ontimize expectations. | + + +#### Component Interaction Diagram + +```plaintext + ┌─────────────────────────────┐ + │ Ontimize UI Components │ + │ (o-table, o-form, etc.) │ + └─────────────┬───────────────┘ + │ + ▼ + ┌─────────────────────────────┐ + │ Custom Data Service │ + │ (extends BaseDataService) │ + │ - Coordinates request │ + │ - Uses Request Arguments │ + │ Adapter to prepare params │ + │ - Uses Response Adapter │ + └─────┬────────────┬──────────┘ + │ │ + ▼ ▼ + ┌─────────────┐ ┌───────────────────────────┐ + │ RequestArgs │ │ Response Adapter │ + │ Adapter │ │ - Converts API responses │ + │ - Transforms│ │ to Ontimize format │ + │ filters │ └───────────────────────────┘ + └─────────────┘ + │ + ▼ + ┌─────────────────────────┐ + │ Backend / External API │ + │ (RESTful service) │ + └─────────────────────────┘ ``` -Where the attributes indicates the following: +**How it works:** -* **code**: indicates the result of the operation: 0 for successful operations, 1 for unsuccessful operations, 3 for session expired. -* **data**: the data requested. -* **message**: a message in case the response was not successful. -* **sqlTypes**: indicates the data type according to Java standard. See [SQL Types](https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html){:target='_blank'}. -* **startRecordIndex**: in paginated queries, indicates the position of the first retrieved record in the collection. -* **totalQueryRecordsNumber**: in paginated queries, indicates the total number of record of the collection. +1. UI components trigger data operations through the custom service. +2. The service adapts Ontimize filters into backend query parameters using the Request Arguments Adapter. +3. It sends the HTTP request to the backend API. +4. Upon response, the Response Adapter transforms the raw data into Ontimize-compatible responses. +5. The processed data is returned to UI components. -You can see an example of a Ontimize service request response in the image below. You can see the complete response [here]({{ base_path }}/assets/examples/ontimize_service_request_example_response.json){:target='_blank'}. -![Ontimize service response example]({{ base_path }}/assets/images/request.png){: .align-center} +#### Example: Rick and Morty API Integration -### Use OntimizeService in your application +Below is an example of how these components come together for integrating with the Rick and Morty API. The custom service handles queries, uses adapters for requests and responses, and manages data transformation seamlessly. -Check the example below about how to configure and use the `OntimizeService` for querying data in your application. -```javascript -protected service: OntimizeService; +##### 1. Create a Custom Service -constructor(protected injector: Injector) { - this.service = this.injector.get(OntimizeService); -} +To create a custom service in Ontimize Web, extend the BaseDataService class, specifying the type of data your service will handle. This service will manage how data operations such as querying or updating are performed against your backend or external API. -ngOnInit() { - this.configureService(); -} +Within your service: -protected configureService() { - // Configure the service using the configuration defined in the `app.services.config.ts` file - const conf = this.service.getDefaultServiceConfiguration('movements'); - this.service.configureService(conf); -} +- Use the constructor to inject dependencies and set up any adapters needed to transform requests and responses. -getMovements(data) { - if (data.hasOwnProperty('ACCOUNTID') && this.service !== null) { - const filter = { - 'ACCOUNTID': data['ACCOUNTID'] - }; - const columns = [this.yAxis, this.xAxis, 'DATE_']; - this.service.query(filter, columns, 'movement').subscribe(resp => { - if (resp.code === 0) { +- Override configuration methods like configureService and configureAdapter to define API paths and specify the adapters your service uses. - // resp.data contains the data retrieved from the server +- Implement or override data operation methods like query to customize how requests are constructed and sent. - } else { - alert('Impossible to query data!'); - } - }); +- Optionally, implement other CRUD methods (insert, update, delete) depending on your backend capabilities. + +```ts +@Injectable() +export class RickAndMortyService extends BaseDataService { + + constructor(injector: Injector) { + super(injector); + this.requestArgumentAdapter = this.injector.get(RickAndMortyRequestArgumentsAdapter); } -``` -## Extending Ontimize Web services + public configureService(config: any): void { + super.configureService(config); + this.path = config.path; + } -You can override or extend the functionality of the services defined in **OntimizeWeb**. You should know that some services are used internally and they cannot be extended. The prepared-to-extend services are the following: + public configureAdapter() { + this.adapter = this.injector.get(RickAndMortyResponseAdapter); + } -| Service | Injection token | Description | -| ------- | ------- | ------- | -| `OntimizeService` and `OntimizeEEService` | `O_DATA_SERVICE` | Service used for making CRUD operation and authentication | -| `OTranslateService` | `O_TRANSLATE_SERVICE` | Service for translating the information shown in the application | -| `OntimizeFileService` | `O_FILE_SERVICE` | Service for uploading files, used by the [`o-file-input`]({{ base_path }}/components/input/file/overview){:target="_blank"} component | -| `OntimizeExportService` and `OntimizeExportService3X` | `O_EXPORT_SERVICE` | Service used by the [`o-table`]({{ base_path }}/components/data/table/overview){:target="_blank"} component for exporting its data | -| `OntimizePermissionsService` and `OntimizeEEPermissionsService` | `O_PERMISSION_SERVICE` | Service used for loading the application permissions | -| `AuthService` | `O_AUTH_SERVICE` | Service used for authentication (since *ontimize-web-ngx@8.3.0*) | -| `OReportService` | `O_REPORT_SERVICE` | Service used to generate reports (since *ontimize-web-ngx@8.7.0*) | -| `OntimizeExportDataProviderService` and `OntimizeExportDataProviderService3X` | `O_EXPORT_DATA_SERVICE` | Service used to provide data and styles to table exports (since *ontimize-web-ngx@8.8.0*) | -| `OTableGlobalConfig` | `O_TABLE_GLOBAL_CONFIG` | Service used to set some [`o-table`]({{ base_path }}/components/data/table/overview){:target="_blank"} global options (since *ontimize-web-ngx@8.7.3*) | -| `LocalStorageService` | `O_LOCALSTORAGE_SERVICE` | Service used to save in application data in local storage (since *ontimize-web-ngx@15.2.0*) | + query(...args: [any, ...any[]]): Observable { + const [filter] = args[0]; + const page = this.getPaginationContext().pageNumber ?? 0; + const queryParams = this.toQueryParams(filter); + const url = `${this.urlBase}${this.path}${queryParams}&page=${page}`; + return this.doRequest({ + method: 'GET', + url: url, + options: {} // optional: can include headers or credentials if needed + }); + } -For extending a service you should create your own service that extends a service from **OntimizeWeb** and provide it in your application using the corresponding injection token from the table above. + advancedQuery(...args: [any, ...any[]]): Observable { + return this.query(args); + } -### Create and extend a service + // You can implement insert/update/delete if needed + insert(): Observable { + throw new Error('Method not implemented.'); + } -Create a new service class that extends a service from **OntimizeWeb**. In the following example we are creating a service called `StarWarsService` that extends the class `OntimizeBaseService` (`OntimizeBaseService` is the super class for different services in **OntimizeWeb**). + update(): Observable { + throw new Error('Method not implemented.'); + } -```javascript -import { Injectable, Injector } from '@angular/core'; + delete(): Observable { + throw new Error('Method not implemented.'); + } -import { OntimizeBaseService } from 'ontimize-web-ngx'; + /** + * Converts a filter object into a query parameter string. + */ + public toQueryParams(obj: Record): string { + const params = Object.entries(obj) + .filter(([_, value]) => !!value) + .map(([key, value]) => { + const cleanValue = value.replace(/%/g, ''); + return `${encodeURIComponent(key)}=${encodeURIComponent(cleanValue)}`; + }) + .join('&'); + return `?${params}`; + } +} +``` + +--- +##### 2. Create a Request Adapter + +This adapter is responsible for converting Ontimize filter expressions into key-value pairs that can be used as query parameters in your API. + +```ts @Injectable() -export class StarWarsService extends OntimizeBaseService { +export class RickAndMortyRequestArgumentsAdapter extends BaseRequestArgument { + parseQueryParameters(params: any) { + const { filter, columns } = params; + const parsedFilter = this.deCompose(filter, columns, {}); + return [parsedFilter, columns, params.entity, params.sqlTypes]; + } - constructor(protected injector: Injector) { - super(injector); + deCompose(expression, columns: Array, kv: Object) { + const basic = expression[FilterExpressionUtils.BASIC_EXPRESSION_KEY]; + const filter = expression[FilterExpressionUtils.FILTER_EXPRESSION_KEY]; + + if (Util.isDefined(basic)) { + kv = this.deComposeExpresion(basic, columns, kv); + } + + if (Util.isDefined(filter)) { + kv = this.deComposeExpresion(filter, columns, kv); + } + + return kv; } + deComposeExpresion(expr: any, columns: Array, kv: Object) { + if (FilterExpressionUtils.instanceofExpression(expr)) { + if (typeof expr.lop !== 'string') { + kv = this.deComposeExpresion(expr.lop, columns, kv); + return this.deComposeExpresion(expr.rop, columns, kv); + } else { + return { ...kv, [expr.lop]: expr.rop }; + } + } + } } ``` -Once your service is created you can [override the Ontimize CRUD methods](#override-crud-methods-using-a-third-party-api) and/or [define new methods](#define-your-own-crud-methods). After that you must decide if the service will be used [in the whole application](#use-your-service-in-the-whole-application) or only in [specific components](#use-your-service-in-a-specific-component). +--- -### Override CRUD methods using a third party API +##### 3. Create a Response Adapter -You can use your service to retrieve or send data to a third party API. The following example shows the service from the previous step consuming the [Star Wars API](https://swapi.dev/){:target="_blank"} for querying different entities. We have overridden the `query` and `advancedQuery` methods for making simple and paginated request to the API. Note that you must [adapt the API response](#adapt-your-service-response) to the ontimize service response for using the retrieved data with the **OntimizeWeb** components. - -```javascript -import { Injectable, Injector } from '@angular/core'; -import { Observable, OntimizeBaseService, Util } from 'ontimize-web-ngx'; +This adapter transforms the API response into a structure compatible with Ontimize’s expectations. +```ts @Injectable() -export class StarWarsService extends OntimizeBaseService { - - constructor(protected injector: Injector) { - super(injector); +export class RickAndMortyResponseAdapter implements IServiceResponseAdapter { + adapt(resp: HttpResponse): RickAndMortyServiceResponse { + return new RickAndMortyServiceResponse( + resp.status, + resp.statusText, + resp.headers, + resp.ok, + resp.body + ); } - public query(kv?: Object, av?: Array, entity?: string, sqltypes?: Object): Observable { - const url = 'https://swapi.dev/api/' + entity + '/?format=json'; - - return this.doRequest({ - method: 'GET', - url: url, - options: {} // This overrides the default http headers. Remove it if you are using an ontimize based API in the backend - }); + adaptError(httpError: HttpErrorResponse) { + return httpError.error.error; } +} +``` - public advancedQuery(kv?: Object, av?: Array, entity?: string, sqltypes?: Object, offset?: number, pagesize?: number, orderby?: Array): Observable { - offset = (Util.isDefined(offset)) ? offset : this.offset; +--- - // Calculate page - let page = 0; - if (Util.isDefined(offset)) { - page = Math.trunc(offset / 10) + 1; - } +##### 4. Create a Custom Service Response + +This class maps the external API's structure to Ontimize's expected `ServiceResponse` format. + +```ts +export class RickAndMortyServiceResponse implements ServiceResponse { + public code: number; + public message: string; + public data: any; + public totalQueryRecordsNumber: number; + public startRecordIndex: number = 0; + + constructor( + public status: number, + public statusText: string, + public headers: HttpHeaders, + public ok: boolean, + public body: any + ) { + this.data = body.results || []; + this.totalQueryRecordsNumber = body.info?.count || this.data.length; + + this.code = (status >= 200 && status < 300) ? 0 : (status === 404 ? 3 : 1); + this.message = statusText; + } - let url = 'https://swapi.dev/api/' + entity + '/?format=json' + '&page=' + page; + isSuccessful(): boolean { + return this.status >= 200 && this.status < 300; + } - return this.doRequest({ - method: 'GET', - url: url, - options: {} // This overrides the default http headers. Remove it if you are using an ontimize based API in the backend - }); + isFailed(): boolean { + return this.status > 300; } + isUnauthorized(): boolean { + return this.status === 403; + } } ``` -#### doRequest method -This `doRequest` method is used to retrieve data from a URL. You can use this method with parameters to configurate the request. -You can check the options available in this example: +--- + +#### 5. Final Integration + +Once your service and adapters are ready: + +* Register the service and adapters in your Angular module's `providers` array. +```ts +@NgModule({ + declarations: [ + AppComponent, + ], + imports: [ + BrowserModule, + BrowserAnimationsModule, + OntimizeWebModule, + AppRoutingModule + ], + providers: [ + ... + { provide: 'rickandmorty', useValue: RickAndMortyService }, + RickAndMortyResponseAdapter, + RickAndMortyRequestArgumentsAdapter, + ... + ], + bootstrap: [AppComponent] +}) +* Use the service in your components or link it to a data component (like `o-table`, `o-form`, etc.) via the `serviceType` and `entity` attributes. + -```javascript -export type ServiceRequestParam = { - method: 'GET' | 'POST' | 'PUT' | 'DELETE', - url: string, - body?: any, - options?: HttpRequestOptions, - successCallback?: (resp: ServiceResponse, observer: Subscriber) => void, - errorCallBack?: (resp: ServiceResponse, observer: Subscriber) => void -}; - -// this.doRequest(ServiceRequestParam) -return this.doRequest({ - method: 'GET', - url: url, - options: {} // This overrides the default http headers. Remove it if you are using an ontimize based API in the backend -}); -``` -{: .note } ->In most cases the third party API won't offer the same response as OntimizeWeb components need so you have to [adapt the response](#adapt-your-service-response). ### Define your own CRUD methods -All the **OntimizeWeb** components that use services for retrieving data have the attributes `query-method`, `paginated-query-method`, `insert-method`, `update-method` and `deleted-method`. The purpose of these attributes is allowing the component to use your own CRUD methods defined in your service. With this you can define, for example, as many *query* methods as you want. +All the **OntimizeWeb** components that use services for retrieving data have the attributes `query-method`, `paginated-query-method`, `insert-method`, `update-method` and `deleted-method`. The purpose of these attributes is allowing the component to use your own CRUD methods defined in your service. With this you can define, for example, as many _query_ methods as you want. In the example below we have defined the `getSkywalker` method that retrieves information from the API. @@ -299,9 +353,10 @@ export class StarWarsService extends OntimizeBaseService { } ``` -Now you can configure a component from **OntimizeWeb** to use your method. Read more about this in the section [*Use your service in a specific component*](#use-your-service-in-a-specific-component). +Now you can configure a component from **OntimizeWeb** to use your method. Read more about this in the section [_Use your service in a specific component_](#use-your-service-in-a-specific-component). {: .note } + > In most cases the third party API won't offer the same response as OntimizeWeb components need so you have to [addapt the response](#adapt-your-service-response). ### Adapt your service response @@ -382,6 +437,7 @@ export class StarWarsService extends OntimizeBaseService { After this, your adapter will be called every time your service receives a response. You can also extend the `BaseServiceResponse` according to your needs. Just remember to respect this three methods that are used internally in **OntimizeWeb**: + - isSuccessful() - isFailed() - isUnauthorized() @@ -404,11 +460,12 @@ export class AppModule { } At this point every **OntimizeWeb** component will use your recently created `StarWarsService` service for communicating with the backend. {: .note } -> `OntimizeService`, `OntimizeEEService`, `OntimizeExportService`, `OntimizePermissionsService` and `OntimizeEEPermissionsService` can be extended and used in the whole application by indicating the class in the [application configuration]({{ base_path }}/guide/appconfig/#application-configuration-file){:target="_blank"}. There is one attribute for each type of service. + +> `OntimizeService`, `OntimizeEEService`, `OntimizeExportService`, `OntimizePermissionsService` and `OntimizeEEPermissionsService` can be extended and used in the whole application by indicating the class in the [application configuration]({{ base_path }}/guide/appconfig/#application-configuration-file){:target="\_blank"}. There is one attribute for each type of service. ### Use your service in a specific component -If you want to use your service in a specific component instead of using it in the whole application, you have to create a provide method that returns a new instance of your service and add a provider to your module indicating the factory method like in the example below. +If you want to use your service in a specific component instead of using it in the whole application, you have to create a provide method that returns a new instance of your service and add a provider to your module indicating the factory method like in the example below. ```javascript import { StarWarsService } from '../../shared/star-wars.service'; @@ -428,14 +485,19 @@ export class MyModule { } Once the service is included in the providers of your module, it will be created an instance of the service for each component. For this, configure the `service-type` attribute in the component with the value of the `provide` attribute indicated in the previous step. Check the example below. - ```html - - + ... - ``` @@ -443,4 +505,6 @@ Once the service is included in the providers of your module, it will be created **OntimizeWeb** defines a successful and unsuccessful request callbacks for each CRUD method, this methods are called when the service receives the response from the API. You can override this methods in order to modify its behaviour. This methods are: `parseSuccessfulMETHODResponse` and `parseUnsuccessfulMETHODResponse` where `METHOD` is `query`, `advancedQuery`, `update`, `insert` or `delete`. -Both services `OntimizeService` and `OntimizeEEService` also have a generic succesful and unsuccessful request callback which are `parseSuccessfulResponse` and `parseUnsuccessfulResponse`. This callbacks are called from the previous explained CRUD method callbacks so user can choose whether to override a particular or the generic method. +The service `JSONAPIService` has a generic succesful and unsuccessful request callback which are `parseSuccessfulResponse` and `parseUnsuccessfulResponse`. This callbacks are called from the previous explained CRUD method callbacks so user can choose whether to override a particular or the generic method. + + diff --git a/docs/guide/services/15d-ontimize.md b/docs/guide/services/15d-ontimize.md new file mode 100644 index 000000000..23e964de3 --- /dev/null +++ b/docs/guide/services/15d-ontimize.md @@ -0,0 +1,159 @@ +--- +layout: default +title: "Ontimize Web" +permalink: /guide/service/ontimize +parent: Services +grand_parent: Guide +nav_order: 2 +--- + +{% include base_path %} +{% include toc %} + +This section describes the **OntimizeWeb** services an how to extend them to add or modify its functionality. + +OntimizeWeb services are used for fetching and saving data from servers based on [Ontimize](https://github.com/ontimize){:target="_blank"}. There is two types of Ontimize services depending on the server technology used: `OntimizeService` and `OntimizeEEService`. You must indicate which type of service the application will use by configuring the `serviceType` attribute in the [application configuration]({{ base_path }}/guide/appconfig/#application-configuration-file){:target="_blank"}. + +You can also use your own service and adapt its response to OntimizeWeb's standard response. This will be explained later in this section. + +### Ontimize services methods + +Both services `OntimizeService` and `OntimizeEEService` have the same methods for configuring and sending request to the server. This methods are the following: + +```javascript +/* Configuration methods */ +getDefaultServiceConfiguration(serviceName?: string): Object; +configureService(config: any): void; + +/* CRUD methods */ +query(kv?: Object, av?: Array, entity?: string, sqltypes?: Object): Observable; +advancedQuery(kv?: Object, av?: Array, entity?: string, sqltypes?: object, + offset?: number, pagesize?: number, orderby?: Array): Observable +insert(av: Object = {}, entity: string, sqltypes?: object): Observable +update(kv: Object = {}, av: object = {}, entity?: string, sqltypes?: object): Observable +delete(kv: Object = {}, entity?: string, sqltypes?: Object): Observable + +/** +* Successful response parsers, there is one parser for each CRUD method which calls to the common parser. +* User can overwrite the chosen methods parsers or the common parser +*/ +protected parseSuccessfulResponse(resp: any, _innerObserver: any); +protected parseSuccessfulQueryResponse(resp: any, _innerObserver: any); +protected parseSuccessfulAdvancedQueryResponse(resp: any, _innerObserver: any); +protected parseSuccessfulInsertResponse(resp: any, _innerObserver: any); +protected parseSuccessfulUpdateResponse(resp: any, _innerObserver: any); +protected parseSuccessfulDeleteResponse(resp: any, _innerObserver: any); + +/** +* Unsuccessful response parsers, there is one parser for each CRUD method which calls to the common parser. +* User can overwrite the chosen methods parsers or the common parser +*/ +protected parseUnsuccessfulResponse(error: any, _innerObserver: any); +protected parseUnsuccessfulQueryResponse(resp: any, _innerObserver: any); +protected parseUnsuccessfulAdvancedQueryResponse(resp: any, _innerObserver: any); +protected parseUnsuccessfulInsertResponse(resp: any, _innerObserver: any); +protected parseUnsuccessfulUpdateResponse(resp: any, _innerObserver: any); +protected parseUnsuccessfulDeleteResponse(resp: any, _innerObserver: any); + +/* Authentication methods */ +startsession(user: string, password: string): Observable; +endsession(user: string, sessionId: number): Observable; +redirectLogin?(sessionExpired?: boolean); +``` + + +### CRUD methods +The *CRUD* (Create, Read, Update and Delete) methods are used to perform standard Ontimize operations: + +* **query**: performs a request to get data from the server. + * **kv**: indicates the filtering values. An empty object means that no filter will be applied into the request. + * **av**: indicates the columns that you want to request. + * **entity**: indicates the entity to perform the request. + * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). +* **advancedQuery**: performs a request to get **paginated** data from the server. + * **kv**: indicates the filtering values. An empty object means that no filter will be applied into the request. + * **av**: indicates the columns that you want to request. + * **entity**: indicates the entity to perform the request. + * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). + * **offset**: the index of the first item requested in the collection. + * **pagesize**: the number of items requested. + * **orderby**: object with the sorting that will be applied to the request result. +* **insert**: performs a insert operation request to the server. + * **av**: indicates the values to insert. + * **entity**: indicates the entity to perform the request. + * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). +* **update**: performs an update operation request to the server. + * **kv**: indicates the filtering values for performing the update. + * **av**: indicates the values to update. + * **entity**: indicates the entity to perform the request. + * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). +* **delete**: performs an delete operation request to the server. + * **kv**: indicates the filtering values for performing the deletion. + * **entity**: indicates the entity to perform the request. + * **sqltypes**: object with the data types for each colum that participates in the request according to Java standard (see [SQLType](https://github.com/OntimizeWeb/ontimize-web-ngx/blob/15.x.x/projects/ontimize-web-ngx/src/lib/util/sqltypes.ts){:target='_blank'}). + +### Server response interface +The standard response of the requests made to Ontimize based servers always follows the following structure: + +```javascript +{ + code: number; + data: Array; + message: ''; + sqlTypes?: Object; + startRecordIndex?: number; + totalQueryRecordsNumber?: number; +} +``` + +Where the attributes indicates the following: + +* **code**: indicates the result of the operation: 0 for successful operations, 1 for unsuccessful operations, 3 for session expired. +* **data**: the data requested. +* **message**: a message in case the response was not successful. +* **sqlTypes**: indicates the data type according to Java standard. See [SQL Types](https://docs.oracle.com/javase/8/docs/api/java/sql/Types.html){:target='_blank'}. +* **startRecordIndex**: in paginated queries, indicates the position of the first retrieved record in the collection. +* **totalQueryRecordsNumber**: in paginated queries, indicates the total number of record of the collection. + +You can see an example of a Ontimize service request response in the image below. You can see the complete response [here]({{ base_path }}/assets/examples/ontimize_service_request_example_response.json){:target='_blank'}. + +![Ontimize service response example]({{ base_path }}/assets/images/request.png){: .align-center} + +### Use OntimizeService in your application + +Check the example below about how to configure and use the `OntimizeService` for querying data in your application. + +```javascript +protected service: OntimizeService; + +constructor(protected injector: Injector) { + this.service = this.injector.get(OntimizeService); +} + +ngOnInit() { + this.configureService(); +} + +protected configureService() { + // Configure the service using the configuration defined in the `app.services.config.ts` file + const conf = this.service.getDefaultServiceConfiguration('movements'); + this.service.configureService(conf); +} + +getMovements(data) { + if (data.hasOwnProperty('ACCOUNTID') && this.service !== null) { + const filter = { + 'ACCOUNTID': data['ACCOUNTID'] + }; + const columns = [this.yAxis, this.xAxis, 'DATE_']; + this.service.query(filter, columns, 'movement').subscribe(resp => { + if (resp.code === 0) { + + // resp.data contains the data retrieved from the server + + } else { + alert('Impossible to query data!'); + } + }); + } +``` diff --git a/docs/guide/services/15e-jsonapi.md b/docs/guide/services/15e-jsonapi.md new file mode 100644 index 000000000..0898d0c8a --- /dev/null +++ b/docs/guide/services/15e-jsonapi.md @@ -0,0 +1,389 @@ +--- +layout: default +title: "JSON API" +permalink: /guide/service/jsonapi +parent: Services +grand_parent: Guide +nav_order: 1 +--- + +{% include base_path %} +{% include toc %} + +> ⚠️ **Note:** This feature is available starting from version **15.6.0** of OntimizeWeb. +> Make sure your project is using this version or higher to take advantage of this functionality. + +In addition to Ontimize-based services, OntimizeWeb allows integration with third-party APIs using the **JSON:API** specification. This allows standardized communication with external systems and services. + +## Overview + +To use [**JSON:API**](https://jsonapi.org/){:target="\_blank"}, OntimizeWeb provides an `BaseDataService`, an abstract class that allows developers to implement full CRUD operations aligned with JSON:API conventions. + +OntimizeWeb is compatible with servers that implement the **JSON:API specification** for standardized data exchange. By default, OntimizeWeb doesnot use the JSONAPIService to perform CRUD operations according to this standard. If needed, you can also configure the application to use services that extend `JSONAPIService` by setting the `serviceType` attribute in the [application configuration]({{ base_path }}/guide/appconfig/#application-configuration-file){:target="_blank"} or in the component's `service-type` input or provides this service using the `O_DATA_SERVICE` injection token in your application module. + +### JSON:API services methods + +Service `JSONAPIService` has the same methods for configuring and sending request to the server. This methods are the following: + +```javascript +/* Configuration methods */ +getDefaultServiceConfiguration(serviceName?: string): Object; +configureService(config: any): void; +buildHeaders():void; + +/* CRUD methods */ +queryById(queryParams: JSONAPIQueryParameter): Observable ; +query(queryParams: JSONAPIQueryParameter): Observable; + +insert(attributes: object, type: string): Observable; +update(id: string | object, attributes: object, type: string): Observable; +delete(id: object): Observable; + + +/** +* Successful response parsers, there is one parser for each CRUD method which calls to the common parser. +* User can overwrite the chosen methods parsers or the common parser +*/ +protected parseSuccessfulResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); +protected parseSuccessfulQueryResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); +protected parseSuccessfulAdvancedQueryResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); +protected parseSuccessfulInsertResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); +protected parseSuccessfulUpdateResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); +protected parseSuccessfulDeleteResponse(resp: JSONAPIResponse, _innerObserver: Subscriber); + +/** +* Unsuccessful response parsers, there is one parser for each CRUD method which calls to the common parser. +* User can overwrite the chosen methods parsers or the common parser +*/ + +protected parseUnsuccessfulResponse(error: HttpErrorResponse, _innerObserver: Subscriber); +protected parseUnsuccessfulQueryResponse(error: HttpErrorResponse, _innerObserver: Subscriber); +protected parseUnsuccessfulAdvancedQueryResponse(error: HttpErrorResponse, _innerObserver: Subscriber); +protected parseUnsuccessfulInsertResponse(error: HttpErrorResponse, _innerObserver: Subscriber); +protected parseUnsuccessfulUpdateResponse(error: HttpErrorResponse, _innerObserver: Subscriber); +protected parseUnsuccessfulDeleteResponse(error: HttpErrorResponse, _innerObserver: Subscriber); + +/* Authentication methods */ +startsession(user: string, password: string): Observable +endsession(user: string, sessionId: number): Observable; +hassession(user: string, sessionId: any): Observable; +``` + +### CRUD methods + +The *CRUD* (Create, Read, Update and Delete) methods are used to perform standard [**JSON:API**](https://jsonapi.org/){:target="\_blank"} operations: + +#### Common Query Parameter + +All data retrieval methods use a shared parameter type called **JSONAPIQueryParameter**, which allows filtering, sorting, pagination, and other options when querying resources. + +- **`JSONAPIQueryParameter`**: Object used to define filtering and query parameters when requesting resources. + If the object is empty, no filters or query options will be applied. + + - **`id`**: Unique identifier of the resource. + - **`type`**: Resource type (e.g., `"articles"`, `"users"`). + - **`attributes`**: Object containing resource-specific data fields. + - **`relationships`**: Object that defines relationships between the resource and other JSON:API resources. + - **`links`**: Object containing hyperlinks related to the resource. + - **`meta`**: Object for non-standard meta-information that cannot be expressed as attributes or relationships. + - **`page`**: Object used for pagination parameters (e.g., `number`, `size`). + - **`include`**: Comma-separated list of related resources to include by default. + - **`fields`**: Sparse fieldsets. Limits the attributes and relationships returned per resource type. + - **`filter`**: Object used to apply filtering conditions to the request. + > **Note**: JSON:API is agnostic about filtering strategies; server-specific implementations may vary. + - **`sort`**: Comma-separated list of fields used to sort the results. Use `-` prefix for descending order (e.g., `-created,title`). + +#### Method Definitions +- **query**: performs a request to get data from the server. + - **JSONAPIQueryParameter** + +- **advancedQuery**: performs a request to get **paginated** data from the server. + - **JSONAPIQueryParameter** + +- **insert**: performs a insert operation request to the server. + - **attributes**: indicates the values to insert. + - **type**: indicates the type to perform the request. + +- **update**: performs an update operation request to the server. + - **ids**: indicates the keys values for performing the update. + - **attributes**: indicates the values to update. + - **type**: indicates the type to perform the request. + +- **delete**: performs an delete operation request to the server. + - **ids**: indicates the keys values for performing the deletion. + - **type**: Resource type. + + +### Server response interface + +The standard response from requests made to JSON:API-based servers always follows this structure: + +```javascript +import { BaseResponse } from './base-response.interface'; +// Interface for describing errors +interface JSONAPIError { + id?: string; // Unique identifier for this particular error occurrence + status?: string; // HTTP status code applicable to this problem + code?: string; // Application-specific error code + title?: string; // Short, human-readable summary of the problem + detail?: string; // Detailed explanation of the error + source?: { + pointer?: string; // JSON Pointer to the offending part of the document + parameter?: string; + header?: string // a string indicating the name of a single request header which caused the error + }; + links?: { + about?: string; // A link that leads to further details about this error + type?: string; // Optional additional links + }; + meta?: Record; // Optional additional information +} + +type JsonApiLinkValue = + | string // Simple URI string + | JsonApiLinkObject // Full link object with metadata + | null; + +// Interface for links (can be extended as needed) +interface JSONAPILinks { + + [linkName: string]: JsonApiLinkValue; // Dynamic keys: "self", "related", etc. +} + +interface JsonApiLinkObject { + href: string; // Required: The actual link URI + meta?: Record; // Optional metadata about the link + rel?: string; // Optional: Relation type (if not inferred) + type?: string; // Optional: Media type of the resource + title?: string; // Optional: Human-readable title +} + +// Interface for resources +interface JSONAPIResource { + type: string; // Resource type (e.g., "articles", "users") + id: string; // Unique identifier of the resource + attributes?: Record; // Attributes of the resource + relationships?: Record; // Relationships with other resources (optional) + links?: JSONAPILinks; // Links related to the resource (optional) + meta?: Record; // Metadata (optional) +} + +// Interface for successful responses +interface JSONAPISuccessfulResponse { + data?: JSONAPIResource | JSONAPIResource[]; // Can be a single resource or a collection + included?: JSONAPIResource[]; // Related resources (optional) + meta?: Record; // Metadata (optional) + links?: JSONAPILinks; // Links (optional) +} + +// Interface for error responses +interface JSONAPIErrorResponse { + errors?: JSONAPIError[]; // A list of errors +} + +// Generic interface that can be used for any API response, either successful or error +export interface JSONAPIResponse extends JSONAPISuccessfulResponse, JSONAPIErrorResponse, BaseResponse { }; + + +``` + +You can see an example of a JSON:API service request/response in the images below. You can see the complete response [here]({{ base_path }}/assets/examples/jsonapi_service_request_example_response.json){:target='\_blank'}. + +![JSON:API service request example]({{ base_path }}/assets/images/jsonapi-request.png){: .align-center} + +![JSON:API service response example]({{ base_path }}/assets/images/jsonapi-response.png){: .align-center} + +### Request arguments interface + +In **OntimizeWeb**, services like **JSONAPIService** are responsible for constructing the request sent to the backend. To allow flexibility, the framework provides a **mechanism to intercept and transform request parameters** before they are serialized and sent — this is done using a service adapter. + +You can define a custom adapter by implementing the following interface: + +``` +export interface IBaseRequestArgument { + parseQueryParameters(params: any): any; +} +``` + + +### Use JSONAPIService in your application + +Check the example below about how to configure and use the `JSONAPIService` for querying data in your application. + +```javascript +protected service: JSONAPIService; + +constructor(protected injector: Injector) { + this.service = this.injector.get(JSONAPIService); +} + +ngOnInit() { + this.configureService(); +} + +protected configureService() { + // Configure the service using the configuration defined in the `app.services.config.ts` file + const conf = this.service.getDefaultServiceConfiguration('movements'); + this.service.configureService(conf); +} + +getMovements(data) { + if (data.hasOwnProperty('ACCOUNTID') && this.service !== null) { + const filter = { + 'ACCOUNTID': data['ACCOUNTID'] + }; + const columns = [this.yAxis, this.xAxis, 'DATE_']; + + //Note: JSON:API is agnostic about filtering strategies; server-specific implementations may vary. + this.service.query({fields: {movement:columns}, filter:filter}).subscribe(resp => { + if (resp.isSuccessful() === 0) { + + // resp.data contains the data retrieved from the server + + } else { + alert('Impossible to query data!'); + } + }); + } +``` + +### Create and extend a service + +> ⚠️ **Note:** Rick and Morty API does not support **JSON:API** specification + +Create a new service class that extends to `JSONAPIService` in **OntimizeWeb**. In the following example we are creating a service called `RickAndMortyService` that extends the class `JSONAPIService` + +```javascript +import { Injectable, Injector } from '@angular/core'; + +import { OntimizeBaseService } from 'ontimize-web-ngx'; + +@Injectable() + export class RickAndMortyService extends JSONAPIService { + + + constructor(protected injector: Injector) { + super(injector); + //Uses Request Arguments to Adapter to prepare params + this.requestArgumentAdapter = this.injector.get(RickAndMortyRequestArgumentsAdapter); + } + + public configureService(config: any): void { + super.configureService(config); + this.path = config.path; + } + + public configureAdapter() { + //Converts API responses to Ontimize format + this.adapter = this.injector.get(RickAndMortyResponseAdapter); + } + + } +``` + +Once your service is created you can [override the JSON:API CRUD methods](#override-crud-methods-using-a-third-party-api) and/or [define new methods](#define-your-own-crud-methods). After that you must decide if the service will be used [in the whole application](#use-your-service-in-the-whole-application) or only in [specific components](#use-your-service-in-a-specific-component). + +### Override CRUD methods using a third party API + +You can use your service to retrieve or send data to a third party API. The following example shows the service from the previous step consuming the [Rick and Morty API](https://rickandmortyapi.com/){:target="\_blank"} for querying different entities. We have overridden the `query` and `advancedQuery` methods for making simple and paginated request to the API. Note that you must [adapt the API response](#adapt-your-service-response) to the ontimize service response for using the retrieved data with the **OntimizeWeb** components. + +```javascript +import { Observable } from 'rxjs'; + +import { Injectable, Injector } from '@angular/core'; +import { JSONAPIQueryParameter, JSONAPIService, ServiceResponse, Util } from 'ontimize-web-ngx'; +import { RickAndMortyResponseAdapter } from './rickandmorty-response-adapter'; +import { RickAndMortyRequestArgumentsAdapter } from './rickandmorty-request-adapter'; + + +@Injectable() +export class RickAndMortyService extends JSONAPIService { + constructor(protected injector: Injector) { + super(injector); + this.requestArgumentAdapter = this.injector.get(RickAndMortyRequestArgumentsAdapter); + } + + public configureService(config: any): void { + super.configureService(config); + this.path = config.path; + } + + public configureAdapter() { + this.adapter = this.injector.get(RickAndMortyResponseAdapter); + } + + query(queryParams: JSONAPIQueryParameter): Observable < ServiceResponse > { + const offset: number = (Util.isDefined(queryParams.page['offset'])) ? queryParams.page['offset'] : 0; + + // Calculate page + let page = 0; + if(Util.isDefined(offset)) { + page = Math.trunc(offset / queryParams.page['limit']) + 1; + } + + const queryParamsToString = this.toQueryParams(queryParams.filter); + const queryParamsString = ((Util.isDefined(queryParams.filter) && !Util.isObjectEmpty(queryParams.filter)) ? (queryParamsToString + '&') : '?') + 'page=' + page + + let url = `${this.urlBase}${this.path}${queryParamsString}`; + + return this.doRequest({ + method: 'GET', + url: url, + options: {} // This overrides the default http headers. Remove it if you are using an ontimize based API in the backend + }); + } + + queryById(args_0: any, ...args: any[]): Observable { + let url = `${this.urlBase}${this.path}`; + + return this.doRequest({ + method: 'GET', + url: url, + options: {} // This overrides the default http headers. Remove it if you are using an ontimize based API in the backend + }); + } + + + insert(args_0: any, ...args: any[]): Observable { + throw new Error('Method not implemented.'); + } + + update(args_0: any, ...args: any[]): Observable { + throw new Error('Method not implemented.'); + } + + delete(args_0: any, ...args: any[]): Observable { + throw new Error('Method not implemented.'); + } + + + + /** + * Converts a filter object into a query parameter string for a REST request, + * adapted to the Rick and Morty API. + * + * This method removes wildcard characters like `%` (e.g., from SQL-like search patterns), + * and properly encodes keys and values for safe use in a URL. + * + * It also filters out null, undefined, or empty values. + * + * @param obj An object with key-value pairs representing the search filters (e.g., { name: '%rick%' }) + * @returns A query string formatted for use in a URL (e.g., "?name=rick") + * + * @example + * toQueryParams({ name: '%morty%', gender: '%male%' }); + * // Returns: "?name=morty&gender=male" + */ + public toQueryParams(obj: Record): string { + const params = Object.entries(obj) + .filter(([_, value]) => !!value) // remove null/undefined/empty values + .map(([key, value]) => { + const cleanValue = value.replace(/%/g, ''); // remove wildcard % + return `${encodeURIComponent(key)}=${encodeURIComponent(cleanValue)}`; + }) + .join('&'); + return `?${params}`; + } +} + +```