From 9e4b5881f91d02b04653d63714fc67ac472b795d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:50:44 +0200 Subject: [PATCH 01/12] chore(deps-dev): bump puppeteer from 23.4.0 to 23.4.1 in /app/travel_analytics (#1222) Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 23.4.0 to 23.4.1.
Release notes

Sourced from puppeteer's releases.

puppeteer-core: v23.4.1

23.4.1 (2024-09-25)

Bug Fixes

puppeteer: v23.4.1

23.4.1 (2024-09-25)

Miscellaneous Chores

Dependencies

Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=puppeteer&package-manager=npm_and_yarn&previous-version=23.4.0&new-version=23.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/travel_analytics/package-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/travel_analytics/package-lock.json b/app/travel_analytics/package-lock.json index 1e701605..dc045786 100644 --- a/app/travel_analytics/package-lock.json +++ b/app/travel_analytics/package-lock.json @@ -7467,9 +7467,9 @@ } }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true }, "node_modules/balanced-match": { @@ -7479,9 +7479,9 @@ "dev": true }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "dev": true, "optional": true }, @@ -11241,9 +11241,9 @@ } }, "node_modules/puppeteer": { - "version": "23.4.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.0.tgz", - "integrity": "sha512-FxgFFJI7NAsX8uebiEDSjS86vufz9TaqERQHShQT0lCbSRI3jUPEcz/0HdwLiYvfYNsc1zGjqY3NsGZya4PvUA==", + "version": "23.4.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.1.tgz", + "integrity": "sha512-+wWfWTkQ8L9IB/3OVGSUp37c0eQ5za/85KdX+LAq2wTZkMdocgYGMCs+/91e2f/RXIYzve4x/uGxN8zG2sj8+w==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -11251,7 +11251,7 @@ "chromium-bidi": "0.6.5", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1342118", - "puppeteer-core": "23.4.0", + "puppeteer-core": "23.4.1", "typed-query-selector": "^2.12.0" }, "bin": { @@ -11262,9 +11262,9 @@ } }, "node_modules/puppeteer-core": { - "version": "23.4.0", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.0.tgz", - "integrity": "sha512-fqkIP5FOcb38jfBj/OcBz1wFaI9nk40uQKSORvnXws6wCbep2dg8yxZ3ddJxBIfQsxoiEOvnrykFinUScrB/ew==", + "version": "23.4.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.1.tgz", + "integrity": "sha512-uCxGtn8VE9PlKhdFJX/zZySi9K3Ufr3qUZe28jxJoZUqiMJOi+SFh2zhiFDSjWqZIDkc0FtnaCC+rewW3MYXmg==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.4.0", From 9f6e557d6d5c4bad6ad99d29f0fbe43fd6ef45ac Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 06:47:32 +0000 Subject: [PATCH 02/12] chore(deps-dev): bump puppeteer from 23.4.0 to 23.4.1 in /app/travel_processor (#1221) Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 23.4.0 to 23.4.1.
Release notes

Sourced from puppeteer's releases.

puppeteer-core: v23.4.1

23.4.1 (2024-09-25)

Bug Fixes

puppeteer: v23.4.1

23.4.1 (2024-09-25)

Miscellaneous Chores

  • puppeteer: Synchronize puppeteer versions

Dependencies

  • The following workspace dependencies were updated
    • dependencies
      • puppeteer-core bumped from 23.4.0 to 23.4.1
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=puppeteer&package-manager=npm_and_yarn&previous-version=23.4.0&new-version=23.4.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/travel_processor/package-lock.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/travel_processor/package-lock.json b/app/travel_processor/package-lock.json index 16c7f7d3..7ded4629 100644 --- a/app/travel_processor/package-lock.json +++ b/app/travel_processor/package-lock.json @@ -7541,9 +7541,9 @@ } }, "node_modules/b4a": { - "version": "1.6.6", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.6.tgz", - "integrity": "sha512-5Tk1HLk6b6ctmjIkAcU/Ujv/1WqiDl0F0JdRCR80VsOcUlHcu7pWeWRlOqQLHfDEsVx9YH/aif5AG4ehoCtTmg==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.6.7.tgz", + "integrity": "sha512-OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==", "dev": true }, "node_modules/balanced-match": { @@ -7553,9 +7553,9 @@ "dev": true }, "node_modules/bare-events": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz", - "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.5.0.tgz", + "integrity": "sha512-/E8dDe9dsbLyh2qrZ64PEPadOQ0F4gbl1sUJOrmph7xOiIxfY8vwab/4bFLh4Y88/Hk/ujKcrQKc+ps0mv873A==", "dev": true, "optional": true }, @@ -11398,9 +11398,9 @@ } }, "node_modules/puppeteer": { - "version": "23.4.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.0.tgz", - "integrity": "sha512-FxgFFJI7NAsX8uebiEDSjS86vufz9TaqERQHShQT0lCbSRI3jUPEcz/0HdwLiYvfYNsc1zGjqY3NsGZya4PvUA==", + "version": "23.4.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.1.tgz", + "integrity": "sha512-+wWfWTkQ8L9IB/3OVGSUp37c0eQ5za/85KdX+LAq2wTZkMdocgYGMCs+/91e2f/RXIYzve4x/uGxN8zG2sj8+w==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -11408,7 +11408,7 @@ "chromium-bidi": "0.6.5", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1342118", - "puppeteer-core": "23.4.0", + "puppeteer-core": "23.4.1", "typed-query-selector": "^2.12.0" }, "bin": { @@ -11419,9 +11419,9 @@ } }, "node_modules/puppeteer-core": { - "version": "23.4.0", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.0.tgz", - "integrity": "sha512-fqkIP5FOcb38jfBj/OcBz1wFaI9nk40uQKSORvnXws6wCbep2dg8yxZ3ddJxBIfQsxoiEOvnrykFinUScrB/ew==", + "version": "23.4.1", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.1.tgz", + "integrity": "sha512-uCxGtn8VE9PlKhdFJX/zZySi9K3Ufr3qUZe28jxJoZUqiMJOi+SFh2zhiFDSjWqZIDkc0FtnaCC+rewW3MYXmg==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.4.0", From 46d2f3ac3e3492c5e4cb7f574efcc49ce73e7588 Mon Sep 17 00:00:00 2001 From: Steffen Weinstock <79531202+stewsk@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:46:15 +0200 Subject: [PATCH 03/12] Rename Analytics -> ALP (#1223) --- .github/dependabot.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/node.js.yml | 2 +- README.md | 2 +- _i18n/i18n.properties | 4 +++- _i18n/i18n_de.properties | 4 +++- _i18n/i18n_en.properties | 4 +++- _i18n/i18n_fr.properties | 6 ++++-- app/labels.cds | 12 ++++++++++++ app/services.cds | 2 +- app/{travel_analytics => travel_alp}/annotations.cds | 4 ++-- app/{travel_analytics => travel_alp}/karma.conf.js | 0 .../package-lock.json | 4 ++-- app/{travel_analytics => travel_alp}/package.json | 2 +- app/{travel_analytics => travel_alp}/ui5.yaml | 8 ++++---- .../webapp/Component.js | 2 +- .../webapp/i18n/i18n.properties | 0 .../webapp/i18n/i18n_de.properties | 0 .../webapp/i18n/i18n_en.properties | 0 .../webapp/i18n/i18n_fr.properties | 0 .../webapp/index.html | 6 +++--- .../webapp/manifest.json | 8 ++++---- .../webapp/test/flpSandbox.html | 8 ++++---- .../webapp/test/integration/Opa.qunit.html | 2 +- .../webapp/test/integration/Opa.qunit.js | 8 ++++---- .../webapp/test/integration/OpaJourney.js | 2 +- .../webapp/test/integration/pages/BookingsList.js | 2 +- .../test/integration/pages/BookingsObjectPage.js | 2 +- .../webapp/test/testsuite.qunit.html | 0 .../webapp/test/testsuite.qunit.js | 0 app/{travel_analytics => travel_alp}/xs-app.json | 4 ++-- .../xs-security.json | 0 mta-java.yaml | 12 ++++++------ mta.yaml | 10 +++++----- package.json | 4 ++-- srv/{analytics-service.cds => alp-service.cds} | 5 ++--- .../java/com/sap/cap/sflight/ui/RedirectFilter.java | 2 +- 37 files changed, 77 insertions(+), 58 deletions(-) rename app/{travel_analytics => travel_alp}/annotations.cds (98%) rename app/{travel_analytics => travel_alp}/karma.conf.js (100%) rename app/{travel_analytics => travel_alp}/package-lock.json (99%) rename app/{travel_analytics => travel_alp}/package.json (96%) rename app/{travel_analytics => travel_alp}/ui5.yaml (82%) rename app/{travel_analytics => travel_alp}/webapp/Component.js (65%) rename app/{travel_analytics => travel_alp}/webapp/i18n/i18n.properties (100%) rename app/{travel_analytics => travel_alp}/webapp/i18n/i18n_de.properties (100%) rename app/{travel_analytics => travel_alp}/webapp/i18n/i18n_en.properties (100%) rename app/{travel_analytics => travel_alp}/webapp/i18n/i18n_fr.properties (100%) rename app/{travel_analytics => travel_alp}/webapp/index.html (85%) rename app/{travel_analytics => travel_alp}/webapp/manifest.json (97%) rename app/{travel_analytics => travel_alp}/webapp/test/flpSandbox.html (92%) rename app/{travel_analytics => travel_alp}/webapp/test/integration/Opa.qunit.html (95%) rename app/{travel_analytics => travel_alp}/webapp/test/integration/Opa.qunit.js (61%) rename app/{travel_analytics => travel_alp}/webapp/test/integration/OpaJourney.js (90%) rename app/{travel_analytics => travel_alp}/webapp/test/integration/pages/BookingsList.js (87%) rename app/{travel_analytics => travel_alp}/webapp/test/integration/pages/BookingsObjectPage.js (87%) rename app/{travel_analytics => travel_alp}/webapp/test/testsuite.qunit.html (100%) rename app/{travel_analytics => travel_alp}/webapp/test/testsuite.qunit.js (100%) rename app/{travel_analytics => travel_alp}/xs-app.json (82%) rename app/{travel_analytics => travel_alp}/xs-security.json (100%) rename srv/{analytics-service.cds => alp-service.cds} (93%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 650fa673..ecda5d2b 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,7 +15,7 @@ updates: interval: weekly - package-ecosystem: npm - directory: /app/travel_analytics + directory: /app/travel_alp versioning-strategy: increase-if-necessary schedule: interval: weekly diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 26bd4c12..01d1e689 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -37,7 +37,7 @@ jobs: npm run test:java -- --ci - name: Run integration tests - Analyze Bookings - working-directory: ./app/travel_analytics + working-directory: ./app/travel_alp run: | npm ci npm run test:java -- --ci diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 7da202b4..95823af0 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -39,7 +39,7 @@ jobs: npm run test:node -- --ci - name: Run integration tests - Analyze Bookings - working-directory: ./app/travel_analytics + working-directory: ./app/travel_alp run: | npm ci npm run test:node -- --ci diff --git a/README.md b/README.md index a8168630..4d82334e 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ mvn spring-boot:run Open these links in your browser: * http://localhost:4004/travel_processor/webapp/index.html for processing the travel data -* http://localhost:4004/travel_analytics/webapp/index.html for the [Analytical List Page](https://ui5.sap.com/#/topic/3d33684b08ca4490b26a844b6ce19b83) (ALP) +* http://localhost:4004/travel_alp/webapp/index.html for the [Analytical List Page](https://ui5.sap.com/#/topic/3d33684b08ca4490b26a844b6ce19b83) (ALP) Log in with user `amy` and empty password. diff --git a/_i18n/i18n.properties b/_i18n/i18n.properties index 69eb85b6..eb910ad1 100644 --- a/_i18n/i18n.properties +++ b/_i18n/i18n.properties @@ -39,8 +39,10 @@ Name=Name AirlineNumber=Airline Number Status=Status DepartureAirport=Departure Airport -ArrivalAirport=Arrival Airport +DestinationAirport=Destination Airport Distance=Distance +Airport=Airport +AirportID=Airport BookingSupplement=Booking Supplement BookingSupplements=Booking Supplements diff --git a/_i18n/i18n_de.properties b/_i18n/i18n_de.properties index 0f93f6ea..8d2dee03 100644 --- a/_i18n/i18n_de.properties +++ b/_i18n/i18n_de.properties @@ -39,8 +39,10 @@ Name=Name AirlineNumber=Fluggesellschaftsnummer Status=Status DepartureAirport=Abflughafen -ArrivalAirport=Zielflughafen +DestinationAirport=Zielflughafen Distance=Distanz +Airport=Flughafen +AirportID=Flughafen BookingSupplement=Buchungszusatz BookingSupplements=Buchungszusätze diff --git a/_i18n/i18n_en.properties b/_i18n/i18n_en.properties index 05120651..20d8ffba 100644 --- a/_i18n/i18n_en.properties +++ b/_i18n/i18n_en.properties @@ -39,8 +39,10 @@ Name=Name AirlineNumber=Airline Number Status=Status DepartureAirport=Departure Airport -ArrivalAirport=Arrival Airport +DestinationAirport=Destination Airport Distance=Distance +Airport=Airport +AirportID=Airport BookingSupplement=Booking Supplement BookingSupplements=Booking Supplements diff --git a/_i18n/i18n_fr.properties b/_i18n/i18n_fr.properties index 0d422eec..11ccb581 100644 --- a/_i18n/i18n_fr.properties +++ b/_i18n/i18n_fr.properties @@ -39,8 +39,10 @@ Name=Nom AirlineNumber=Numéro de compagnie aérienne Status=Statut DepartureAirport=Aéroport de départ -ArrivalAirport=Aéroport de destination +DestinationAirport=Aéroport de destination Distance=Distance +Airport=Aéroport +AirportID=Aéroport BookingSupplement=Supplément de réservation BookingSupplements=Réservation de suppléments @@ -52,7 +54,7 @@ SupplementType=Type de supplément Passenger=Passager LastName=Last Name -PlaneType=Type d'avion +PlaneType=Type D'avion MaximumSeats=Nombre maximal de places OccupiedSeats=Places occup. diff --git a/app/labels.cds b/app/labels.cds index 887e94d2..2eb1ab96 100644 --- a/app/labels.cds +++ b/app/labels.cds @@ -80,6 +80,11 @@ annotate schema.Airline with @title: '{i18n>Airline}' { CurrencyCode @title: '{i18n>CurrencyCode}'; } +annotate schema.Airport with @title: '{i18n>Airport}' { + AirportID @title: '{i18n>AirportID}' @Common.Text: Name; + Name @title: '{i18n>Name}'; +} + annotate schema.Flight with @title: '{i18n>Flight}' { AirlineID @title: '{i18n>AirlineID}'; FlightDate @title: '{i18n>FlightDate}'; @@ -91,6 +96,13 @@ annotate schema.Flight with @title: '{i18n>Flight}' { OccupiedSeats @title: '{i18n>OccupiedSeats}'; } +annotate schema.FlightConnection with { + @Common.Label: '{i18n>DepartureAirport}' + DepartureAirport; + @Common.Label: '{i18n>DestinationAirport}' + DestinationAirport; +} + annotate schema.Supplement with @title: '{i18n>Supplement}' { SupplementID @title: '{i18n>SupplementID}' @Common.Text: Description; Price @title: '{i18n>Price}' @Measures.ISOCurrency: CurrencyCode_code; diff --git a/app/services.cds b/app/services.cds index 1ac75d69..7e7d6d57 100644 --- a/app/services.cds +++ b/app/services.cds @@ -2,4 +2,4 @@ using from './travel_processor/capabilities'; using from './travel_processor/field-control'; using from './travel_processor/layouts'; -using from './travel_analytics/annotations'; +using from './travel_alp/annotations'; diff --git a/app/travel_analytics/annotations.cds b/app/travel_alp/annotations.cds similarity index 98% rename from app/travel_analytics/annotations.cds rename to app/travel_alp/annotations.cds index c98ad3c9..36bf89c1 100644 --- a/app/travel_analytics/annotations.cds +++ b/app/travel_alp/annotations.cds @@ -1,4 +1,4 @@ -using AnalyticsService as service from '../../srv/analytics-service'; +using ALPService as service from '../../srv/alp-service'; annotate service.Bookings with @( Aggregation.CustomAggregate #FlightPrice : 'Edm.Decimal', @@ -385,7 +385,7 @@ annotate service.Bookings with @UI : { // { Value : to_Flight.to_Connection.DepartureAirport.AirportID, // Label: '{i18n>DepartureAirport}' }, // { Value : to_Flight.to_Connection.DestinationAirport.AirportID, - // Label: '{i18n>ArrivalAirport}' }, + // Label: '{i18n>DestinationAirport}' }, // { Value : to_Flight.to_Connection.Distance, }, // Workaround: diff --git a/app/travel_analytics/karma.conf.js b/app/travel_alp/karma.conf.js similarity index 100% rename from app/travel_analytics/karma.conf.js rename to app/travel_alp/karma.conf.js diff --git a/app/travel_analytics/package-lock.json b/app/travel_alp/package-lock.json similarity index 99% rename from app/travel_analytics/package-lock.json rename to app/travel_alp/package-lock.json index dc045786..12989a76 100644 --- a/app/travel_analytics/package-lock.json +++ b/app/travel_alp/package-lock.json @@ -1,11 +1,11 @@ { - "name": "travel-analytics", + "name": "travel-alp", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "travel-analytics", + "name": "travel-alp", "version": "1.0.0", "devDependencies": { "@ui5/cli": "^4.0.0", diff --git a/app/travel_analytics/package.json b/app/travel_alp/package.json similarity index 96% rename from app/travel_analytics/package.json rename to app/travel_alp/package.json index ba82025d..cdead207 100644 --- a/app/travel_analytics/package.json +++ b/app/travel_alp/package.json @@ -1,5 +1,5 @@ { - "name": "travel-analytics", + "name": "travel-alp", "version": "1.0.0", "private": true, "description": "SFlight ALP", diff --git a/app/travel_analytics/ui5.yaml b/app/travel_alp/ui5.yaml similarity index 82% rename from app/travel_analytics/ui5.yaml rename to app/travel_alp/ui5.yaml index 854a2e57..8fe417d2 100644 --- a/app/travel_analytics/ui5.yaml +++ b/app/travel_alp/ui5.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json specVersion: "3.0" metadata: - name: sap.fe.cap.travel_analytics + name: sap.fe.cap.travel_alp type: application resources: @@ -17,16 +17,16 @@ builder: - name: ui5-task-zipper afterTask: generateCachebusterInfo configuration: - archiveName: travel-analytics + archiveName: travel-alp additionalFiles: - xs-app.json server: customMiddleware: - name: ui5-middleware-simpleproxy - mountPath: /analytics + mountPath: /alp afterMiddleware: compression configuration: - baseUri: http://localhost:4004/analytics + baseUri: http://localhost:4004/alp username: admin # dummy credentials for local testing password: admin # dummy credentials for local testing diff --git a/app/travel_analytics/webapp/Component.js b/app/travel_alp/webapp/Component.js similarity index 65% rename from app/travel_analytics/webapp/Component.js rename to app/travel_alp/webapp/Component.js index 50db4d4e..08decfc6 100644 --- a/app/travel_analytics/webapp/Component.js +++ b/app/travel_alp/webapp/Component.js @@ -1,6 +1,6 @@ sap.ui.define(["sap/fe/core/AppComponent"], function (Component) { "use strict"; - return Component.extend("sap.fe.cap.travel_analytics.Component", { + return Component.extend("sap.fe.cap.travel_alp.Component", { metadata: { manifest: "json" }, }); }); diff --git a/app/travel_analytics/webapp/i18n/i18n.properties b/app/travel_alp/webapp/i18n/i18n.properties similarity index 100% rename from app/travel_analytics/webapp/i18n/i18n.properties rename to app/travel_alp/webapp/i18n/i18n.properties diff --git a/app/travel_analytics/webapp/i18n/i18n_de.properties b/app/travel_alp/webapp/i18n/i18n_de.properties similarity index 100% rename from app/travel_analytics/webapp/i18n/i18n_de.properties rename to app/travel_alp/webapp/i18n/i18n_de.properties diff --git a/app/travel_analytics/webapp/i18n/i18n_en.properties b/app/travel_alp/webapp/i18n/i18n_en.properties similarity index 100% rename from app/travel_analytics/webapp/i18n/i18n_en.properties rename to app/travel_alp/webapp/i18n/i18n_en.properties diff --git a/app/travel_analytics/webapp/i18n/i18n_fr.properties b/app/travel_alp/webapp/i18n/i18n_fr.properties similarity index 100% rename from app/travel_analytics/webapp/i18n/i18n_fr.properties rename to app/travel_alp/webapp/i18n/i18n_fr.properties diff --git a/app/travel_analytics/webapp/index.html b/app/travel_alp/webapp/index.html similarity index 85% rename from app/travel_analytics/webapp/index.html rename to app/travel_alp/webapp/index.html index 75f55b8d..e4cbc6e7 100644 --- a/app/travel_analytics/webapp/index.html +++ b/app/travel_alp/webapp/index.html @@ -19,7 +19,7 @@ src="https://ui5.sap.com/1.128.0/resources/sap-ui-core.js" data-sap-ui-theme="sap_horizon" data-sap-ui-oninit="module:sap/ui/core/ComponentSupport" - data-sap-ui-resourceroots='{ "sap.fe.cap.travel_analytics": "./" }' + data-sap-ui-resourceroots='{ "sap.fe.cap.travel_alp": "./" }' data-sap-ui-compatVersion="edge" data-sap-ui-async="true" data-sap-ui-preload="async" @@ -31,9 +31,9 @@
diff --git a/app/travel_analytics/webapp/manifest.json b/app/travel_alp/webapp/manifest.json similarity index 97% rename from app/travel_analytics/webapp/manifest.json rename to app/travel_alp/webapp/manifest.json index 91a893c1..567e8fc8 100644 --- a/app/travel_analytics/webapp/manifest.json +++ b/app/travel_alp/webapp/manifest.json @@ -1,12 +1,12 @@ { "_version": "1.42.0", "sap.app": { - "id": "sap.fe.cap.travel_analytics", + "id": "sap.fe.cap.travel_alp", "type": "application", "title": "{{title}}", "description": "{{description}}", "i18n": { - "bundleName": "sap.fe.cap.travel_analytics.i18n.i18n", + "bundleName": "sap.fe.cap.travel_alp.i18n.i18n", "supportedLocales": [ "en", "de", @@ -19,7 +19,7 @@ }, "dataSources": { "mainService": { - "uri": "analytics/", + "uri": "alp/", "type": "OData", "settings": { "odataVersion": "4.0" @@ -83,7 +83,7 @@ "i18n": { "type": "sap.ui.model.resource.ResourceModel", "settings": { - "bundleName": "sap.fe.cap.travel_analytics.i18n.i18n", + "bundleName": "sap.fe.cap.travel_alp.i18n.i18n", "supportedLocales": [ "en", "de", diff --git a/app/travel_analytics/webapp/test/flpSandbox.html b/app/travel_alp/webapp/test/flpSandbox.html similarity index 92% rename from app/travel_analytics/webapp/test/flpSandbox.html rename to app/travel_alp/webapp/test/flpSandbox.html index a0bc62ab..e572fbb1 100644 --- a/app/travel_analytics/webapp/test/flpSandbox.html +++ b/app/travel_alp/webapp/test/flpSandbox.html @@ -43,11 +43,11 @@ }, }, applications: { - "sapfecapsflightsflightanalytics-tile": { - title: "SFlight Analytics", + "sapfecapsflightsflightalp-tile": { + title: "SFlight ALP", description: "SFlight ALP", additionalInformation: - "SAPUI5.Component=sap.fe.cap.travel_analytics", + "SAPUI5.Component=sap.fe.cap.travel_alp", applicationType: "URL", url: "../", }, @@ -69,7 +69,7 @@ data-sap-ui-theme="sap_horizon" data-sap-ui-compatVersion="edge" data-sap-ui-language="en" - data-sap-ui-resourceroots='{"sap.fe.cap.travel_analytics": "../"}' + data-sap-ui-resourceroots='{"sap.fe.cap.travel_alp": "../"}' data-sap-ui-frameOptions="allow" > // NON-SECURE setting for testing environment diff --git a/app/travel_analytics/webapp/test/integration/Opa.qunit.html b/app/travel_alp/webapp/test/integration/Opa.qunit.html similarity index 95% rename from app/travel_analytics/webapp/test/integration/Opa.qunit.html rename to app/travel_alp/webapp/test/integration/Opa.qunit.html index 85ff3f93..aaf3e2f1 100644 --- a/app/travel_analytics/webapp/test/integration/Opa.qunit.html +++ b/app/travel_alp/webapp/test/integration/Opa.qunit.html @@ -12,7 +12,7 @@ data-sap-ui-animation="false" data-sap-ui-compatVersion="edge" data-sap-ui-resourceroots='{ - "sap.fe.cap.travel_analytics": "../../" + "sap.fe.cap.travel_alp": "../../" }' data-sap-ui-theme="sap_horizon" data-sap-ui-libs="sap.m, sap.fe.core" diff --git a/app/travel_analytics/webapp/test/integration/Opa.qunit.js b/app/travel_alp/webapp/test/integration/Opa.qunit.js similarity index 61% rename from app/travel_analytics/webapp/test/integration/Opa.qunit.js rename to app/travel_alp/webapp/test/integration/Opa.qunit.js index c0cbafc1..493e7772 100644 --- a/app/travel_analytics/webapp/test/integration/Opa.qunit.js +++ b/app/travel_alp/webapp/test/integration/Opa.qunit.js @@ -1,9 +1,9 @@ sap.ui.require( [ "sap/fe/test/JourneyRunner", - "sap/fe/cap/travel_analytics/test/integration/OpaJourney", - "sap/fe/cap/travel_analytics/test/integration/pages/BookingsList", - "sap/fe/cap/travel_analytics/test/integration/pages/BookingsObjectPage", + "sap/fe/cap/travel_alp/test/integration/OpaJourney", + "sap/fe/cap/travel_alp/test/integration/pages/BookingsList", + "sap/fe/cap/travel_alp/test/integration/pages/BookingsObjectPage", ], function (JourneyRunner, opaJourney, BookingsList, BookingsObjectPage) { "use strict"; @@ -11,7 +11,7 @@ sap.ui.require( const runner = new JourneyRunner({ // start index.html in web folder launchUrl: - sap.ui.require.toUrl("sap/fe/cap/travel_analytics") + "/index.html", + sap.ui.require.toUrl("sap/fe/cap/travel_alp") + "/index.html", }); runner.run( diff --git a/app/travel_analytics/webapp/test/integration/OpaJourney.js b/app/travel_alp/webapp/test/integration/OpaJourney.js similarity index 90% rename from app/travel_analytics/webapp/test/integration/OpaJourney.js rename to app/travel_alp/webapp/test/integration/OpaJourney.js index b0ec08df..1a465878 100644 --- a/app/travel_analytics/webapp/test/integration/OpaJourney.js +++ b/app/travel_alp/webapp/test/integration/OpaJourney.js @@ -4,7 +4,7 @@ sap.ui.define(["sap/ui/test/opaQunit"], function (opaTest) { return { run: function () { - QUnit.module("Travel Analytics Tests"); + QUnit.module("Travel ALP Tests"); opaTest("Start application", function (Given, When, Then) { Given.iStartMyApp(); diff --git a/app/travel_analytics/webapp/test/integration/pages/BookingsList.js b/app/travel_alp/webapp/test/integration/pages/BookingsList.js similarity index 87% rename from app/travel_analytics/webapp/test/integration/pages/BookingsList.js rename to app/travel_alp/webapp/test/integration/pages/BookingsList.js index 8f641481..ccf90907 100644 --- a/app/travel_analytics/webapp/test/integration/pages/BookingsList.js +++ b/app/travel_alp/webapp/test/integration/pages/BookingsList.js @@ -8,7 +8,7 @@ sap.ui.define(["sap/fe/test/ListReport"], function (ListReport) { return new ListReport( { - appId: "sap.fe.cap.travel_analytics", + appId: "sap.fe.cap.travel_alp", componentId: "BookingsList", entitySet: "Bookings", }, diff --git a/app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js b/app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js similarity index 87% rename from app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js rename to app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js index 1d5782ff..4d493d1d 100644 --- a/app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js +++ b/app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js @@ -8,7 +8,7 @@ sap.ui.define(["sap/fe/test/ObjectPage"], function (ObjectPage) { return new ObjectPage( { - appId: "sap.fe.cap.travel_analytics", + appId: "sap.fe.cap.travel_alp", componentId: "BookingsObjectPage", entitySet: "Bookings", }, diff --git a/app/travel_analytics/webapp/test/testsuite.qunit.html b/app/travel_alp/webapp/test/testsuite.qunit.html similarity index 100% rename from app/travel_analytics/webapp/test/testsuite.qunit.html rename to app/travel_alp/webapp/test/testsuite.qunit.html diff --git a/app/travel_analytics/webapp/test/testsuite.qunit.js b/app/travel_alp/webapp/test/testsuite.qunit.js similarity index 100% rename from app/travel_analytics/webapp/test/testsuite.qunit.js rename to app/travel_alp/webapp/test/testsuite.qunit.js diff --git a/app/travel_analytics/xs-app.json b/app/travel_alp/xs-app.json similarity index 82% rename from app/travel_analytics/xs-app.json rename to app/travel_alp/xs-app.json index a3b8676a..8025ca10 100644 --- a/app/travel_analytics/xs-app.json +++ b/app/travel_alp/xs-app.json @@ -3,8 +3,8 @@ "authenticationMethod": "route", "routes": [ { - "source": "^/analytics/(.*)$", - "target": "/analytics/$1", + "source": "^/alp/(.*)$", + "target": "/alp/$1", "destination": "sflight-srv", "authenticationType": "xsuaa", "csrfProtection": false diff --git a/app/travel_analytics/xs-security.json b/app/travel_alp/xs-security.json similarity index 100% rename from app/travel_analytics/xs-security.json rename to app/travel_alp/xs-security.json diff --git a/mta-java.yaml b/mta-java.yaml index 825d7861..44929d0a 100644 --- a/mta-java.yaml +++ b/mta-java.yaml @@ -22,7 +22,7 @@ modules: properties: SPRING_PROFILES_ACTIVE: cloud JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" - JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }' + JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }' requires: - name: sflight-db - name: sflight-uaa @@ -67,9 +67,9 @@ modules: artifacts: - travel-processor.zip target-path: resources/ - - name: sflight-app-travel-analytics + - name: sflight-app-travel-alp artifacts: - - travel-analytics.zip + - travel-alp.zip target-path: resources/ # ------------- APPLICATION: TRAVEL PROCESSOR ---------------- @@ -85,11 +85,11 @@ modules: - npm run build supported-platforms: [] - # ------------- APPLICATION: TRAVEL ANALYTICS ---------------- - - name: sflight-app-travel-analytics + # ------------- APPLICATION: TRAVEL ALP ---------------------- + - name: sflight-app-travel-alp # ------------------------------------------------------------ type: html5 - path: app/travel_analytics + path: app/travel_alp build-parameters: build-result: dist builder: custom diff --git a/mta.yaml b/mta.yaml index e661cd91..09b1369b 100644 --- a/mta.yaml +++ b/mta.yaml @@ -60,9 +60,9 @@ modules: artifacts: - travel-processor.zip target-path: resources/ - - name: sflight-app-travel-analytics + - name: sflight-app-travel-alp artifacts: - - travel-analytics.zip + - travel-alp.zip target-path: resources/ # ------------- APPLICATION: TRAVEL PROCESSOR ---------------- @@ -78,11 +78,11 @@ modules: - npm run build supported-platforms: [] - # ------------- APPLICATION: TRAVEL ANALYTICS ---------------- - - name: sflight-app-travel-analytics + # ------------- APPLICATION: TRAVEL ALP ---------------------- + - name: sflight-app-travel-alp # ------------------------------------------------------------ type: html5 - path: app/travel_analytics + path: app/travel_alp build-parameters: build-result: dist builder: custom diff --git a/package.json b/package.json index d97b887c..5a4c6657 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "jest", "test:mocha": "npx mocha --timeout 20000", "travel-processor": "cds watch --open travel_processor/webapp/index.html?sap-ui-xx-viewCache=false", - "travel-analytics": "cds watch --open travel_analytics/webapp/index.html?sap-ui-xx-viewCache=false" + "travel-alp": "cds watch --open travel_alp/webapp/index.html?sap-ui-xx-viewCache=false" }, "dependencies": { "@cap-js/hana": "^1", @@ -120,6 +120,6 @@ }, "sapux": [ "app/travel_processor", - "app/travel_analytics" + "app/travel_alp" ] } \ No newline at end of file diff --git a/srv/analytics-service.cds b/srv/alp-service.cds similarity index 93% rename from srv/analytics-service.cds rename to srv/alp-service.cds index 4a2ab1d0..1f2f4195 100644 --- a/srv/analytics-service.cds +++ b/srv/alp-service.cds @@ -1,6 +1,6 @@ using { sap.fe.cap.travel as my } from '../db/schema'; -service AnalyticsService @(path:'/analytics') { +service ALPService @(path:'/alp') { // @(restrict: [ // { grant: 'READ', to: 'authenticated-user'}, @@ -51,7 +51,7 @@ service AnalyticsService @(path:'/analytics') { @Common.Text: DepCity to_Flight.to_Connection.DepartureAirport.AirportID as DepAirport, to_Flight.to_Connection.DepartureAirport.City as DepCity, - @Common.Label: '{i18n>ArrivalAirport}' + @Common.Label: '{i18n>DestinationAirport}' @Common.Text: DestCity to_Flight.to_Connection.DestinationAirport.AirportID as DestAirport, to_Flight.to_Connection.DestinationAirport.City as DestCity, @@ -73,7 +73,6 @@ service AnalyticsService @(path:'/analytics') { annotate Travels:TravelID with @Common.Text: null; - annotate my.Airport:AirportID @Common.Text: City; annotate my.FlightConnection:Distance @( Common.Label: '{i18n>Distance}', Measures.Unit : DistanceUnit diff --git a/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java b/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java index 735dd750..2209d97a 100644 --- a/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java +++ b/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java @@ -28,7 +28,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha String[] uiServicePaths = { "/travel_processor/webapp/processor", - "/travel_analytics/webapp/analytics" + "/travel_alp/webapp/alp" }; String path = req.getRequestURI(); From a4bbb5cb3b2436bd3bf185366d7c42bc6e760867 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:10:39 +0200 Subject: [PATCH 04/12] chore(deps): bump @sap/cds from 8.2.3 to 8.3.0 (#1229) Bumps [@sap/cds](https://cap.cloud.sap/) from 8.2.3 to 8.3.0. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@sap/cds&package-manager=npm_and_yarn&previous-version=8.2.3&new-version=8.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4bd351ab..9bab4fc3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1645,9 +1645,9 @@ } }, "node_modules/@sap/cds": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.2.3.tgz", - "integrity": "sha512-VZde7OvqMx2ehjwSIXfAqO20ROcn0G2H4ZBQA3FakQcFGz/7ay7fUsX+R/FWfQvDbwFUPqySHAWqoPPqkYJY+A==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-8.3.0.tgz", + "integrity": "sha512-XG/p8RORlRfRqMTXGJOoD8yrvNS8Iv0cNkJUS7F4l1W211Tg6iFgrO/izJ9sOEPYjeL5aU/UjQJ8GhCbZ0gv+Q==", "dependencies": { "@sap/cds-compiler": ">=5.1", "@sap/cds-fiori": "^1", From 8b871c7432d2c3c44f710fd3a1f87ade3136e2fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:24:28 +0000 Subject: [PATCH 05/12] chore(deps-dev): bump @sap/ux-specification from 1.124.1 to 1.124.2 (#1228) Bumps @sap/ux-specification from 1.124.1 to 1.124.2. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@sap/ux-specification&package-manager=npm_and_yarn&previous-version=1.124.1&new-version=1.124.2)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steffen Weinstock <79531202+stewsk@users.noreply.github.com> --- package-lock.json | 311 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 256 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9bab4fc3..48205ff4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -607,9 +607,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.25.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.6.tgz", - "integrity": "sha512-VBj9MYyDb9tuLq7yzqjgzt6Q+IBQLrGZfdjOekyEirZPHxXWoTSGUTMrpsfi58Up73d13NfYLv8HT9vmznjzhQ==", + "version": "7.25.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.25.7.tgz", + "integrity": "sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==", "dev": true, "dependencies": { "regenerator-runtime": "^0.14.0" @@ -728,6 +728,26 @@ "@sap/cds": ">=7.6" } }, + "node_modules/@colors/colors": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", + "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", + "dev": true, + "engines": { + "node": ">=0.1.90" + } + }, + "node_modules/@dabh/diagnostics": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz", + "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==", + "dev": true, + "dependencies": { + "colorspace": "1.1.x", + "enabled": "2.0.x", + "kuler": "^2.0.0" + } + }, "node_modules/@eslint-community/eslint-utils": { "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", @@ -1405,16 +1425,16 @@ } }, "node_modules/@sap-ux/cds-odata-annotation-converter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/@sap-ux/cds-odata-annotation-converter/-/cds-odata-annotation-converter-0.3.5.tgz", - "integrity": "sha512-7SROLejBHHPRzi9BMXE84scx8vgeFH0KtMBNsQKkmweFhOvD1NEXKv/jJ25Q9A7WzCdLByYsUueW8wCJAcrhHw==", + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@sap-ux/cds-odata-annotation-converter/-/cds-odata-annotation-converter-0.3.6.tgz", + "integrity": "sha512-45QozhF3JJgycpmDdodq8Pil3K1acCzvh03UN9xILEURIjKY8ZA4gGVQPCrUHftXqNSidL0XzBHkQt1epIlrAA==", "dev": true, "dependencies": { "@sap-ux/cds-annotation-parser": "0.2.2", "@sap-ux/odata-annotation-core": "0.2.1", "@sap-ux/odata-vocabularies": "0.4.2", "@sap-ux/text-document-utils": "0.2.0", - "@sap/ux-cds-compiler-facade": "1.14.1", + "@sap/ux-cds-compiler-facade": "1.15.0", "i18next": "20.6.1" } }, @@ -1428,14 +1448,14 @@ } }, "node_modules/@sap-ux/fe-fpm-writer": { - "version": "0.28.3", - "resolved": "https://registry.npmjs.org/@sap-ux/fe-fpm-writer/-/fe-fpm-writer-0.28.3.tgz", - "integrity": "sha512-vMoQyD51pmi1ueJ2QwWx5G5DVZQUv13xVzzVHmCEzuHtsgHSVubB4zX3BKn4cQLtgv0XGcAVpojUzQkrNeg17g==", + "version": "0.30.0", + "resolved": "https://registry.npmjs.org/@sap-ux/fe-fpm-writer/-/fe-fpm-writer-0.30.0.tgz", + "integrity": "sha512-jUBxeUYzqSydgWIebivU6VUTDwKpxu+n145+9ryeFfNUgfVPzCZF2i7D3aU3K0VXovD+mT4nbTmu85oIt8XSlw==", "dev": true, "dependencies": { "@sap-ux/annotation-converter": "0.8.0", - "@sap-ux/fiori-annotation-api": "0.1.40", - "@sap-ux/project-access": "1.27.1", + "@sap-ux/fiori-annotation-api": "0.2.2", + "@sap-ux/project-access": "1.27.2", "@sap-ux/vocabularies-types": "0.10.0", "@xmldom/xmldom": "0.8.10", "ejs": "3.1.10", @@ -1462,22 +1482,23 @@ } }, "node_modules/@sap-ux/fiori-annotation-api": { - "version": "0.1.40", - "resolved": "https://registry.npmjs.org/@sap-ux/fiori-annotation-api/-/fiori-annotation-api-0.1.40.tgz", - "integrity": "sha512-P9C2NwV1JVoSutJAA5qEomHLHedQQrMFvap7KUX1uAt3W5u+cj5JhVWhpLK/Slr5n+XMHnusAMSfHSS21yZDMg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/@sap-ux/fiori-annotation-api/-/fiori-annotation-api-0.2.2.tgz", + "integrity": "sha512-HV+yahwi77TZup1TQGJLQ0bl6gruzaKTvZqx0sGbB97ZKOtaw495rHFlQ/TvVCMcuC01Sm/Lvu4MbiQPfJVSmQ==", "dev": true, "dependencies": { "@sap-ux/annotation-converter": "0.8.0", "@sap-ux/cds-annotation-parser": "0.2.2", - "@sap-ux/cds-odata-annotation-converter": "0.3.5", + "@sap-ux/cds-odata-annotation-converter": "0.3.6", + "@sap-ux/logger": "0.6.0", "@sap-ux/odata-annotation-core": "0.2.1", "@sap-ux/odata-annotation-core-types": "0.4.1", "@sap-ux/odata-entity-model": "0.3.0", "@sap-ux/odata-vocabularies": "0.4.2", - "@sap-ux/project-access": "1.27.1", + "@sap-ux/project-access": "1.27.2", "@sap-ux/vocabularies-types": "0.10.0", "@sap-ux/xml-odata-annotation-converter": "0.3.1", - "@sap/ux-cds-compiler-facade": "1.14.1", + "@sap/ux-cds-compiler-facade": "1.15.0", "@xml-tools/ast": "5.0.5", "@xml-tools/parser": "1.0.11", "mem-fs": "2.1.0", @@ -1515,6 +1536,21 @@ "integrity": "sha512-bFJH7UQxlXT8kKeyiyu41r22jCZXG8kuuVVA33OEJn1diWOZK5n8zBSPZFHVBOu8kXZ6h0LIRhf5UnCo61J4Hg==", "dev": true }, + "node_modules/@sap-ux/logger": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@sap-ux/logger/-/logger-0.6.0.tgz", + "integrity": "sha512-/p9Lv3GXdASJbs5CLJy69t2OLRK6VG2zOL/jLRyOPEK1tcZYFF/LerBYDFfFxkvCpHz+cYvUJuhAmxqljLxmJw==", + "dev": true, + "dependencies": { + "chalk": "4.1.2", + "lodash": "4.17.21", + "winston": "3.11.0", + "winston-transport": "4.7.0" + }, + "engines": { + "node": ">=18.x" + } + }, "node_modules/@sap-ux/odata-annotation-core": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/@sap-ux/odata-annotation-core/-/odata-annotation-core-0.2.1.tgz", @@ -1550,9 +1586,9 @@ } }, "node_modules/@sap-ux/project-access": { - "version": "1.27.1", - "resolved": "https://registry.npmjs.org/@sap-ux/project-access/-/project-access-1.27.1.tgz", - "integrity": "sha512-WyPJGdakgv2TYvDgi1A00mU8mWMtFWokwGVd3cOgZttKRPrW/SN3BBtCo5p8+QmO/yLK88UWO1wmJYxxyNdrcA==", + "version": "1.27.2", + "resolved": "https://registry.npmjs.org/@sap-ux/project-access/-/project-access-1.27.2.tgz", + "integrity": "sha512-Myj41d/Y8p1tZxh+ZS9hnzehsOBmsn3vFukgFZqm2fsbWfaXdI22bmiSq3LU5ONKOJGIkJJa40hSClf15MXTGg==", "dev": true, "dependencies": { "@sap-ux/i18n": "0.2.0", @@ -1604,9 +1640,9 @@ } }, "node_modules/@sap-ux/vocabularies-types": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/@sap-ux/vocabularies-types/-/vocabularies-types-0.11.1.tgz", - "integrity": "sha512-2t1GLpuWCqe2lmi9bh4ATWJRm5DlHAaVhWXBXAt9FsSfuTUqqLv6d+JtV+5X99dgSfN+5wsPCW+cGRuQy0XioQ==", + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/@sap-ux/vocabularies-types/-/vocabularies-types-0.11.3.tgz", + "integrity": "sha512-bOQz8dk7I/VNtH50hUnfqtiYSMUh/t28nyrMFZcVBbVTwlnxHUTWEUKUGu1Dwllw1yQVHuArCKy+rWhb0v7h6A==", "dev": true, "engines": { "node": ">=18.0.0 < 19.0.0 || >=20.0.0 < 21.0.0", @@ -1713,47 +1749,27 @@ } }, "node_modules/@sap/ux-cds-compiler-facade": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/@sap/ux-cds-compiler-facade/-/ux-cds-compiler-facade-1.14.1.tgz", - "integrity": "sha512-smDdRTV+w1Knh0aLdPf38NuBVTKR2/Un8+6IcsVoXxJkmkr9C0fk8yBFHBDWunHIpOSLv4rQJ4Si78Qi559PEw==", + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/@sap/ux-cds-compiler-facade/-/ux-cds-compiler-facade-1.15.0.tgz", + "integrity": "sha512-WeA/wnF0NoHNod6H/Rcpgbh3ue4TVBSAlHQoupWzdu91yl+RZ4rKS4hARaRH+LV7gTXxJ5k6llJ/wyUN7sMDdw==", "dev": true, - "dependencies": { - "@sap/cds-compiler": "4.8.0" - }, "engines": { "node": ">=18.16.0" }, "peerDependencies": { - "@sap-ux/odata-annotation-core": ">=0.1.8", - "@sap-ux/odata-annotation-core-types": ">=0.3.1", - "@sap-ux/project-access": ">=1.26.3" - } - }, - "node_modules/@sap/ux-cds-compiler-facade/node_modules/@sap/cds-compiler": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@sap/cds-compiler/-/cds-compiler-4.8.0.tgz", - "integrity": "sha512-C8IkzNfdMIzG136K/VvOmG65d8UnR9lcZF5q/c//Jp2/RZIZvwFvO5HHPre19+YWhuwJXbIMb3kc5x9CW9ZLNw==", - "dev": true, - "dependencies": { - "antlr4": "4.9.3" - }, - "bin": { - "cdsc": "bin/cdsc.js", - "cdshi": "bin/cdshi.js", - "cdsse": "bin/cdsse.js" - }, - "engines": { - "node": ">=16" + "@sap-ux/odata-annotation-core": ">=0.2.1", + "@sap-ux/odata-annotation-core-types": ">=0.4.1", + "@sap-ux/project-access": ">=1.26.6" } }, "node_modules/@sap/ux-specification": { - "version": "1.124.1", - "resolved": "https://registry.npmjs.org/@sap/ux-specification/-/ux-specification-1.124.1.tgz", - "integrity": "sha512-aMuUACNToBhsX9GPllqbouRjdwDMo2CnVcg3xHuAvM+Mz0aHFfjPuN/x04pp4LdeLPE2aF+zU0GzXyVt5xXu1g==", + "version": "1.124.2", + "resolved": "https://registry.npmjs.org/@sap/ux-specification/-/ux-specification-1.124.2.tgz", + "integrity": "sha512-7tEpFsUN9RMqNq9w7E721q++MjQLwocovX8lZTchBTzOX7dLG0HSAD2x7GPz9nga8N+QzdeaOq6C3sGytXaXEg==", "dev": true, "dependencies": { - "@sap-ux/fe-fpm-writer": "0.28.3", - "@sap-ux/vocabularies-types": "0.11.1" + "@sap-ux/fe-fpm-writer": "0.30.0", + "@sap-ux/vocabularies-types": "0.11.3" }, "engines": { "node": ">= 18.0.0 < 19.0.0 || >= 20.0.0 < 21.0.0 || >= 22.0.0", @@ -1916,6 +1932,12 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/triple-beam": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.5.tgz", + "integrity": "sha512-6WaYesThRMCl19iryMYP7/x2OVgCtbIVflDGFpWnb9irXI3UjYE4AzmYuiUKY1AJstGijoY+MgUszMgRxIYTYw==", + "dev": true + }, "node_modules/@types/yargs": { "version": "17.0.32", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.32.tgz", @@ -2793,6 +2815,16 @@ "dev": true, "license": "MIT" }, + "node_modules/color": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz", + "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==", + "dev": true, + "dependencies": { + "color-convert": "^1.9.3", + "color-string": "^1.6.0" + } + }, "node_modules/color-convert": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", @@ -2813,6 +2845,41 @@ "dev": true, "license": "MIT" }, + "node_modules/color-string": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz", + "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==", + "dev": true, + "dependencies": { + "color-name": "^1.0.0", + "simple-swizzle": "^0.2.2" + } + }, + "node_modules/color/node_modules/color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/color/node_modules/color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true + }, + "node_modules/colorspace": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz", + "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==", + "dev": true, + "dependencies": { + "color": "^3.1.3", + "text-hex": "1.0.x" + } + }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", @@ -3154,6 +3221,12 @@ "dev": true, "license": "MIT" }, + "node_modules/enabled": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz", + "integrity": "sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ==", + "dev": true + }, "node_modules/encodeurl": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", @@ -3619,6 +3692,12 @@ "bser": "2.1.1" } }, + "node_modules/fecha": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz", + "integrity": "sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw==", + "dev": true + }, "node_modules/file-entry-cache": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", @@ -3801,6 +3880,12 @@ "dev": true, "license": "ISC" }, + "node_modules/fn.name": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz", + "integrity": "sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==", + "dev": true + }, "node_modules/follow-redirects": { "version": "1.15.6", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz", @@ -5256,6 +5341,12 @@ "node": ">=6" } }, + "node_modules/kuler": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz", + "integrity": "sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==", + "dev": true + }, "node_modules/leven": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", @@ -5316,6 +5407,23 @@ "dev": true, "license": "MIT" }, + "node_modules/logform": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz", + "integrity": "sha512-CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==", + "dev": true, + "dependencies": { + "@colors/colors": "1.6.0", + "@types/triple-beam": "^1.3.2", + "fecha": "^4.2.0", + "ms": "^2.1.1", + "safe-stable-stringify": "^2.3.1", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -5684,6 +5792,15 @@ "wrappy": "1" } }, + "node_modules/one-time": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz", + "integrity": "sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==", + "dev": true, + "dependencies": { + "fn.name": "1.x.x" + } + }, "node_modules/onetime": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", @@ -6394,6 +6511,15 @@ ], "license": "MIT" }, + "node_modules/safe-stable-stringify": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.5.0.tgz", + "integrity": "sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==", + "dev": true, + "engines": { + "node": ">=10" + } + }, "node_modules/safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", @@ -6614,6 +6740,21 @@ "simple-concat": "^1.0.0" } }, + "node_modules/simple-swizzle": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", + "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "dev": true, + "dependencies": { + "is-arrayish": "^0.3.1" + } + }, + "node_modules/simple-swizzle/node_modules/is-arrayish": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", + "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "dev": true + }, "node_modules/sisteransi": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", @@ -6659,6 +6800,15 @@ "dev": true, "license": "BSD-3-Clause" }, + "node_modules/stack-trace": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz", + "integrity": "sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==", + "dev": true, + "engines": { + "node": "*" + } + }, "node_modules/stack-utils": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", @@ -6889,6 +7039,12 @@ "node": ">=8" } }, + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", + "dev": true + }, "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", @@ -6957,6 +7113,15 @@ "node": ">=0.6" } }, + "node_modules/triple-beam": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", + "integrity": "sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==", + "dev": true, + "engines": { + "node": ">= 14.0.0" + } + }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -7185,6 +7350,42 @@ "node": ">= 8" } }, + "node_modules/winston": { + "version": "3.11.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.11.0.tgz", + "integrity": "sha512-L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==", + "dev": true, + "dependencies": { + "@colors/colors": "^1.6.0", + "@dabh/diagnostics": "^2.0.2", + "async": "^3.2.3", + "is-stream": "^2.0.0", + "logform": "^2.4.0", + "one-time": "^1.0.0", + "readable-stream": "^3.4.0", + "safe-stable-stringify": "^2.3.1", + "stack-trace": "0.0.x", + "triple-beam": "^1.3.0", + "winston-transport": "^4.5.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, + "node_modules/winston-transport": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz", + "integrity": "sha512-ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==", + "dev": true, + "dependencies": { + "logform": "^2.3.2", + "readable-stream": "^3.6.0", + "triple-beam": "^1.3.0" + }, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", From b6c8bd7411ab9b4fc14e54e8d4b11c21d538aff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:29:42 +0000 Subject: [PATCH 06/12] chore(deps-dev): bump puppeteer from 23.4.1 to 23.5.0 in /app/travel_processor (#1227) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 23.4.1 to 23.5.0.
Release notes

Sourced from puppeteer's releases.

puppeteer-core: v23.5.0

23.5.0 (2024-10-02)

Features

Bug Fixes

puppeteer: v23.5.0

23.5.0 (2024-10-02)

Miscellaneous Chores

  • puppeteer: Synchronize puppeteer versions

Dependencies

  • The following workspace dependencies were updated
    • dependencies
      • puppeteer-core bumped from 23.4.1 to 23.5.0
Commits
  • ce1ed7a chore: release main (#13138)
  • cab123e fix: roll to Chrome 129.0.6668.89 (#13150)
  • b5b8601 feat: roll to Firefox 131.0 (#13148)
  • 2eebc0d chore(deps-dev): Bump the dev-dependencies group with 3 updates (#13140)
  • 3853dde chore(deps): bump chromium-bidi to 0.8.0 (#13147)
  • 9aa7ee9 chore(deps): Bump @​docsearch/react from 3.6.1 to 3.6.2 in /website in the all...
  • bfae6d7 chore(deps): Bump the all group with 3 updates (#13142)
  • 199e36b chore: improve stacktraces when execution context gets destroyed (#13139)
  • 71d58ee chore(deps): Bump node from 48db4f6 to db5dd2f in /docker in the all grou...
  • 3ad2e45 fix: handle requestservedfromcache during interception (#13134)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=puppeteer&package-manager=npm_and_yarn&previous-version=23.4.1&new-version=23.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/travel_processor/package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/travel_processor/package-lock.json b/app/travel_processor/package-lock.json index 7ded4629..61d3f72a 100644 --- a/app/travel_processor/package-lock.json +++ b/app/travel_processor/package-lock.json @@ -7952,9 +7952,9 @@ } }, "node_modules/chromium-bidi": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz", - "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.8.0.tgz", + "integrity": "sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug==", "dev": true, "dependencies": { "mitt": "3.0.1", @@ -11398,17 +11398,17 @@ } }, "node_modules/puppeteer": { - "version": "23.4.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.1.tgz", - "integrity": "sha512-+wWfWTkQ8L9IB/3OVGSUp37c0eQ5za/85KdX+LAq2wTZkMdocgYGMCs+/91e2f/RXIYzve4x/uGxN8zG2sj8+w==", + "version": "23.5.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.5.0.tgz", + "integrity": "sha512-jnUx5M0YtFva7vXr39qqsxgB46JiwXJavuM1Hgsqbd9WWiGTEUt9klGpTxyHi+ZQf3NUgleDhNsnI10IK8Ebsg==", "dev": true, "hasInstallScript": true, "dependencies": { "@puppeteer/browsers": "2.4.0", - "chromium-bidi": "0.6.5", + "chromium-bidi": "0.8.0", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1342118", - "puppeteer-core": "23.4.1", + "puppeteer-core": "23.5.0", "typed-query-selector": "^2.12.0" }, "bin": { @@ -11419,13 +11419,13 @@ } }, "node_modules/puppeteer-core": { - "version": "23.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.1.tgz", - "integrity": "sha512-uCxGtn8VE9PlKhdFJX/zZySi9K3Ufr3qUZe28jxJoZUqiMJOi+SFh2zhiFDSjWqZIDkc0FtnaCC+rewW3MYXmg==", + "version": "23.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.5.0.tgz", + "integrity": "sha512-+5ed+625GuQ2emRHqYec8khT9LP14FWzv8hYl0HiM6hnnlNzdVU9uDJIPHeCPLIWxq15ost9MeF8kBk4R3eiFw==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.4.0", - "chromium-bidi": "0.6.5", + "chromium-bidi": "0.8.0", "debug": "^4.3.7", "devtools-protocol": "0.0.1342118", "typed-query-selector": "^2.12.0", From 236e998a72e7d3920d634fceb12d86d9aecf2223 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 15:53:23 +0000 Subject: [PATCH 07/12] chore(deps-dev): bump puppeteer from 23.4.1 to 23.5.0 in /app/travel_alp (#1226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 23.4.1 to 23.5.0.
Release notes

Sourced from puppeteer's releases.

puppeteer-core: v23.5.0

23.5.0 (2024-10-02)

Features

Bug Fixes

puppeteer: v23.5.0

23.5.0 (2024-10-02)

Miscellaneous Chores

  • puppeteer: Synchronize puppeteer versions

Dependencies

  • The following workspace dependencies were updated
    • dependencies
      • puppeteer-core bumped from 23.4.1 to 23.5.0
Commits
  • ce1ed7a chore: release main (#13138)
  • cab123e fix: roll to Chrome 129.0.6668.89 (#13150)
  • b5b8601 feat: roll to Firefox 131.0 (#13148)
  • 2eebc0d chore(deps-dev): Bump the dev-dependencies group with 3 updates (#13140)
  • 3853dde chore(deps): bump chromium-bidi to 0.8.0 (#13147)
  • 9aa7ee9 chore(deps): Bump @​docsearch/react from 3.6.1 to 3.6.2 in /website in the all...
  • bfae6d7 chore(deps): Bump the all group with 3 updates (#13142)
  • 199e36b chore: improve stacktraces when execution context gets destroyed (#13139)
  • 71d58ee chore(deps): Bump node from 48db4f6 to db5dd2f in /docker in the all grou...
  • 3ad2e45 fix: handle requestservedfromcache during interception (#13134)
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=puppeteer&package-manager=npm_and_yarn&previous-version=23.4.1&new-version=23.5.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- app/travel_alp/package-lock.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/travel_alp/package-lock.json b/app/travel_alp/package-lock.json index 12989a76..bbf32630 100644 --- a/app/travel_alp/package-lock.json +++ b/app/travel_alp/package-lock.json @@ -7883,9 +7883,9 @@ } }, "node_modules/chromium-bidi": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz", - "integrity": "sha512-RuLrmzYrxSb0s9SgpB+QN5jJucPduZQ/9SIe76MDxYJuecPW5mxMdacJ1f4EtgiV+R0p3sCkznTMvH0MPGFqjA==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.8.0.tgz", + "integrity": "sha512-uJydbGdTw0DEUjhoogGveneJVWX/9YuqkWePzMmkBYwtdAqo5d3J/ovNKFr+/2hWXYmYCr6it8mSSTIj6SS6Ug==", "dev": true, "dependencies": { "mitt": "3.0.1", @@ -11241,17 +11241,17 @@ } }, "node_modules/puppeteer": { - "version": "23.4.1", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.4.1.tgz", - "integrity": "sha512-+wWfWTkQ8L9IB/3OVGSUp37c0eQ5za/85KdX+LAq2wTZkMdocgYGMCs+/91e2f/RXIYzve4x/uGxN8zG2sj8+w==", + "version": "23.5.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-23.5.0.tgz", + "integrity": "sha512-jnUx5M0YtFva7vXr39qqsxgB46JiwXJavuM1Hgsqbd9WWiGTEUt9klGpTxyHi+ZQf3NUgleDhNsnI10IK8Ebsg==", "dev": true, "hasInstallScript": true, "dependencies": { "@puppeteer/browsers": "2.4.0", - "chromium-bidi": "0.6.5", + "chromium-bidi": "0.8.0", "cosmiconfig": "^9.0.0", "devtools-protocol": "0.0.1342118", - "puppeteer-core": "23.4.1", + "puppeteer-core": "23.5.0", "typed-query-selector": "^2.12.0" }, "bin": { @@ -11262,13 +11262,13 @@ } }, "node_modules/puppeteer-core": { - "version": "23.4.1", - "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.4.1.tgz", - "integrity": "sha512-uCxGtn8VE9PlKhdFJX/zZySi9K3Ufr3qUZe28jxJoZUqiMJOi+SFh2zhiFDSjWqZIDkc0FtnaCC+rewW3MYXmg==", + "version": "23.5.0", + "resolved": "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-23.5.0.tgz", + "integrity": "sha512-+5ed+625GuQ2emRHqYec8khT9LP14FWzv8hYl0HiM6hnnlNzdVU9uDJIPHeCPLIWxq15ost9MeF8kBk4R3eiFw==", "dev": true, "dependencies": { "@puppeteer/browsers": "2.4.0", - "chromium-bidi": "0.6.5", + "chromium-bidi": "0.8.0", "debug": "^4.3.7", "devtools-protocol": "0.0.1342118", "typed-query-selector": "^2.12.0", From 9ed77e10ed7a75fec13136ac36fbee9bb9500f57 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:32:42 +0000 Subject: [PATCH 08/12] chore(deps): bump @cap-js/hana from 1.2.0 to 1.3.0 (#1225) Bumps [@cap-js/hana](https://cap.cloud.sap/) from 1.2.0 to 1.3.0. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=@cap-js/hana&package-manager=npm_and_yarn&previous-version=1.2.0&new-version=1.3.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 48205ff4..7ee02d53 100644 --- a/package-lock.json +++ b/package-lock.json @@ -697,9 +697,9 @@ } }, "node_modules/@cap-js/hana": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@cap-js/hana/-/hana-1.2.0.tgz", - "integrity": "sha512-g4vj7ocBaT3+On22qQlCJDQcAEnlsDbMOfhuA0JfhKsyiRAxurJyUD06lkQZbbVhLY7dd5dlaZvHf1nuWzj+SQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@cap-js/hana/-/hana-1.3.0.tgz", + "integrity": "sha512-gIXWwqiKRkMhHkcOwXqiTsWOvQYu+gxStcD6OFQNL9KgB50H4RcFIJihr79S0e3e39EMj3FUtpYgzdscr3YHwg==", "dependencies": { "@cap-js/db-service": "^1.9.0", "hdb": "^0.19.5" From 111d7652554433d7c2973c6270aaff4b46b1c241 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:43:50 +0000 Subject: [PATCH 09/12] chore(deps): bump cds.services.version from 3.2.0 to 3.3.0 (#1224) Bumps `cds.services.version` from 3.2.0 to 3.3.0. Updates `com.sap.cds:cds-services-bom` from 3.2.0 to 3.3.0 Updates `com.sap.cds:cds-maven-plugin` from 3.2.0 to 3.3.0 Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d937cf0e..9d69b890 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 21 - 3.2.0 + 3.3.0 ^8 From be4a00a28b7334137a1373cfa6275f95775bb866 Mon Sep 17 00:00:00 2001 From: Daniel Hutzel Date: Fri, 4 Oct 2024 23:37:25 +0200 Subject: [PATCH 10/12] Revert "Rename Analytics -> ALP (#1223)" (#1230) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 46d2f3ac3e3492c5e4cb7f574efcc49ce73e7588. @stewsk I had to revert that as that broke tests based on sflight → let's revisit on Monday --- .github/dependabot.yml | 2 +- .github/workflows/maven.yml | 2 +- .github/workflows/node.js.yml | 2 +- README.md | 2 +- _i18n/i18n.properties | 4 +--- _i18n/i18n_de.properties | 4 +--- _i18n/i18n_en.properties | 4 +--- _i18n/i18n_fr.properties | 6 ++---- app/labels.cds | 12 ------------ app/services.cds | 2 +- app/{travel_alp => travel_analytics}/annotations.cds | 4 ++-- app/{travel_alp => travel_analytics}/karma.conf.js | 0 .../package-lock.json | 4 ++-- app/{travel_alp => travel_analytics}/package.json | 2 +- app/{travel_alp => travel_analytics}/ui5.yaml | 8 ++++---- .../webapp/Component.js | 2 +- .../webapp/i18n/i18n.properties | 0 .../webapp/i18n/i18n_de.properties | 0 .../webapp/i18n/i18n_en.properties | 0 .../webapp/i18n/i18n_fr.properties | 0 .../webapp/index.html | 6 +++--- .../webapp/manifest.json | 8 ++++---- .../webapp/test/flpSandbox.html | 8 ++++---- .../webapp/test/integration/Opa.qunit.html | 2 +- .../webapp/test/integration/Opa.qunit.js | 8 ++++---- .../webapp/test/integration/OpaJourney.js | 2 +- .../webapp/test/integration/pages/BookingsList.js | 2 +- .../test/integration/pages/BookingsObjectPage.js | 2 +- .../webapp/test/testsuite.qunit.html | 0 .../webapp/test/testsuite.qunit.js | 0 app/{travel_alp => travel_analytics}/xs-app.json | 4 ++-- .../xs-security.json | 0 mta-java.yaml | 12 ++++++------ mta.yaml | 10 +++++----- package.json | 4 ++-- srv/{alp-service.cds => analytics-service.cds} | 5 +++-- .../java/com/sap/cap/sflight/ui/RedirectFilter.java | 2 +- 37 files changed, 58 insertions(+), 77 deletions(-) rename app/{travel_alp => travel_analytics}/annotations.cds (98%) rename app/{travel_alp => travel_analytics}/karma.conf.js (100%) rename app/{travel_alp => travel_analytics}/package-lock.json (99%) rename app/{travel_alp => travel_analytics}/package.json (96%) rename app/{travel_alp => travel_analytics}/ui5.yaml (82%) rename app/{travel_alp => travel_analytics}/webapp/Component.js (65%) rename app/{travel_alp => travel_analytics}/webapp/i18n/i18n.properties (100%) rename app/{travel_alp => travel_analytics}/webapp/i18n/i18n_de.properties (100%) rename app/{travel_alp => travel_analytics}/webapp/i18n/i18n_en.properties (100%) rename app/{travel_alp => travel_analytics}/webapp/i18n/i18n_fr.properties (100%) rename app/{travel_alp => travel_analytics}/webapp/index.html (85%) rename app/{travel_alp => travel_analytics}/webapp/manifest.json (97%) rename app/{travel_alp => travel_analytics}/webapp/test/flpSandbox.html (92%) rename app/{travel_alp => travel_analytics}/webapp/test/integration/Opa.qunit.html (95%) rename app/{travel_alp => travel_analytics}/webapp/test/integration/Opa.qunit.js (61%) rename app/{travel_alp => travel_analytics}/webapp/test/integration/OpaJourney.js (90%) rename app/{travel_alp => travel_analytics}/webapp/test/integration/pages/BookingsList.js (87%) rename app/{travel_alp => travel_analytics}/webapp/test/integration/pages/BookingsObjectPage.js (87%) rename app/{travel_alp => travel_analytics}/webapp/test/testsuite.qunit.html (100%) rename app/{travel_alp => travel_analytics}/webapp/test/testsuite.qunit.js (100%) rename app/{travel_alp => travel_analytics}/xs-app.json (82%) rename app/{travel_alp => travel_analytics}/xs-security.json (100%) rename srv/{alp-service.cds => analytics-service.cds} (93%) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index ecda5d2b..650fa673 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -15,7 +15,7 @@ updates: interval: weekly - package-ecosystem: npm - directory: /app/travel_alp + directory: /app/travel_analytics versioning-strategy: increase-if-necessary schedule: interval: weekly diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 01d1e689..26bd4c12 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -37,7 +37,7 @@ jobs: npm run test:java -- --ci - name: Run integration tests - Analyze Bookings - working-directory: ./app/travel_alp + working-directory: ./app/travel_analytics run: | npm ci npm run test:java -- --ci diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 95823af0..7da202b4 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -39,7 +39,7 @@ jobs: npm run test:node -- --ci - name: Run integration tests - Analyze Bookings - working-directory: ./app/travel_alp + working-directory: ./app/travel_analytics run: | npm ci npm run test:node -- --ci diff --git a/README.md b/README.md index 4d82334e..a8168630 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,7 @@ mvn spring-boot:run Open these links in your browser: * http://localhost:4004/travel_processor/webapp/index.html for processing the travel data -* http://localhost:4004/travel_alp/webapp/index.html for the [Analytical List Page](https://ui5.sap.com/#/topic/3d33684b08ca4490b26a844b6ce19b83) (ALP) +* http://localhost:4004/travel_analytics/webapp/index.html for the [Analytical List Page](https://ui5.sap.com/#/topic/3d33684b08ca4490b26a844b6ce19b83) (ALP) Log in with user `amy` and empty password. diff --git a/_i18n/i18n.properties b/_i18n/i18n.properties index eb910ad1..69eb85b6 100644 --- a/_i18n/i18n.properties +++ b/_i18n/i18n.properties @@ -39,10 +39,8 @@ Name=Name AirlineNumber=Airline Number Status=Status DepartureAirport=Departure Airport -DestinationAirport=Destination Airport +ArrivalAirport=Arrival Airport Distance=Distance -Airport=Airport -AirportID=Airport BookingSupplement=Booking Supplement BookingSupplements=Booking Supplements diff --git a/_i18n/i18n_de.properties b/_i18n/i18n_de.properties index 8d2dee03..0f93f6ea 100644 --- a/_i18n/i18n_de.properties +++ b/_i18n/i18n_de.properties @@ -39,10 +39,8 @@ Name=Name AirlineNumber=Fluggesellschaftsnummer Status=Status DepartureAirport=Abflughafen -DestinationAirport=Zielflughafen +ArrivalAirport=Zielflughafen Distance=Distanz -Airport=Flughafen -AirportID=Flughafen BookingSupplement=Buchungszusatz BookingSupplements=Buchungszusätze diff --git a/_i18n/i18n_en.properties b/_i18n/i18n_en.properties index 20d8ffba..05120651 100644 --- a/_i18n/i18n_en.properties +++ b/_i18n/i18n_en.properties @@ -39,10 +39,8 @@ Name=Name AirlineNumber=Airline Number Status=Status DepartureAirport=Departure Airport -DestinationAirport=Destination Airport +ArrivalAirport=Arrival Airport Distance=Distance -Airport=Airport -AirportID=Airport BookingSupplement=Booking Supplement BookingSupplements=Booking Supplements diff --git a/_i18n/i18n_fr.properties b/_i18n/i18n_fr.properties index 11ccb581..0d422eec 100644 --- a/_i18n/i18n_fr.properties +++ b/_i18n/i18n_fr.properties @@ -39,10 +39,8 @@ Name=Nom AirlineNumber=Numéro de compagnie aérienne Status=Statut DepartureAirport=Aéroport de départ -DestinationAirport=Aéroport de destination +ArrivalAirport=Aéroport de destination Distance=Distance -Airport=Aéroport -AirportID=Aéroport BookingSupplement=Supplément de réservation BookingSupplements=Réservation de suppléments @@ -54,7 +52,7 @@ SupplementType=Type de supplément Passenger=Passager LastName=Last Name -PlaneType=Type D'avion +PlaneType=Type d'avion MaximumSeats=Nombre maximal de places OccupiedSeats=Places occup. diff --git a/app/labels.cds b/app/labels.cds index 2eb1ab96..887e94d2 100644 --- a/app/labels.cds +++ b/app/labels.cds @@ -80,11 +80,6 @@ annotate schema.Airline with @title: '{i18n>Airline}' { CurrencyCode @title: '{i18n>CurrencyCode}'; } -annotate schema.Airport with @title: '{i18n>Airport}' { - AirportID @title: '{i18n>AirportID}' @Common.Text: Name; - Name @title: '{i18n>Name}'; -} - annotate schema.Flight with @title: '{i18n>Flight}' { AirlineID @title: '{i18n>AirlineID}'; FlightDate @title: '{i18n>FlightDate}'; @@ -96,13 +91,6 @@ annotate schema.Flight with @title: '{i18n>Flight}' { OccupiedSeats @title: '{i18n>OccupiedSeats}'; } -annotate schema.FlightConnection with { - @Common.Label: '{i18n>DepartureAirport}' - DepartureAirport; - @Common.Label: '{i18n>DestinationAirport}' - DestinationAirport; -} - annotate schema.Supplement with @title: '{i18n>Supplement}' { SupplementID @title: '{i18n>SupplementID}' @Common.Text: Description; Price @title: '{i18n>Price}' @Measures.ISOCurrency: CurrencyCode_code; diff --git a/app/services.cds b/app/services.cds index 7e7d6d57..1ac75d69 100644 --- a/app/services.cds +++ b/app/services.cds @@ -2,4 +2,4 @@ using from './travel_processor/capabilities'; using from './travel_processor/field-control'; using from './travel_processor/layouts'; -using from './travel_alp/annotations'; +using from './travel_analytics/annotations'; diff --git a/app/travel_alp/annotations.cds b/app/travel_analytics/annotations.cds similarity index 98% rename from app/travel_alp/annotations.cds rename to app/travel_analytics/annotations.cds index 36bf89c1..c98ad3c9 100644 --- a/app/travel_alp/annotations.cds +++ b/app/travel_analytics/annotations.cds @@ -1,4 +1,4 @@ -using ALPService as service from '../../srv/alp-service'; +using AnalyticsService as service from '../../srv/analytics-service'; annotate service.Bookings with @( Aggregation.CustomAggregate #FlightPrice : 'Edm.Decimal', @@ -385,7 +385,7 @@ annotate service.Bookings with @UI : { // { Value : to_Flight.to_Connection.DepartureAirport.AirportID, // Label: '{i18n>DepartureAirport}' }, // { Value : to_Flight.to_Connection.DestinationAirport.AirportID, - // Label: '{i18n>DestinationAirport}' }, + // Label: '{i18n>ArrivalAirport}' }, // { Value : to_Flight.to_Connection.Distance, }, // Workaround: diff --git a/app/travel_alp/karma.conf.js b/app/travel_analytics/karma.conf.js similarity index 100% rename from app/travel_alp/karma.conf.js rename to app/travel_analytics/karma.conf.js diff --git a/app/travel_alp/package-lock.json b/app/travel_analytics/package-lock.json similarity index 99% rename from app/travel_alp/package-lock.json rename to app/travel_analytics/package-lock.json index bbf32630..c99966be 100644 --- a/app/travel_alp/package-lock.json +++ b/app/travel_analytics/package-lock.json @@ -1,11 +1,11 @@ { - "name": "travel-alp", + "name": "travel-analytics", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "travel-alp", + "name": "travel-analytics", "version": "1.0.0", "devDependencies": { "@ui5/cli": "^4.0.0", diff --git a/app/travel_alp/package.json b/app/travel_analytics/package.json similarity index 96% rename from app/travel_alp/package.json rename to app/travel_analytics/package.json index cdead207..ba82025d 100644 --- a/app/travel_alp/package.json +++ b/app/travel_analytics/package.json @@ -1,5 +1,5 @@ { - "name": "travel-alp", + "name": "travel-analytics", "version": "1.0.0", "private": true, "description": "SFlight ALP", diff --git a/app/travel_alp/ui5.yaml b/app/travel_analytics/ui5.yaml similarity index 82% rename from app/travel_alp/ui5.yaml rename to app/travel_analytics/ui5.yaml index 8fe417d2..854a2e57 100644 --- a/app/travel_alp/ui5.yaml +++ b/app/travel_analytics/ui5.yaml @@ -1,7 +1,7 @@ # yaml-language-server: $schema=https://sap.github.io/ui5-tooling/schema/ui5.yaml.json specVersion: "3.0" metadata: - name: sap.fe.cap.travel_alp + name: sap.fe.cap.travel_analytics type: application resources: @@ -17,16 +17,16 @@ builder: - name: ui5-task-zipper afterTask: generateCachebusterInfo configuration: - archiveName: travel-alp + archiveName: travel-analytics additionalFiles: - xs-app.json server: customMiddleware: - name: ui5-middleware-simpleproxy - mountPath: /alp + mountPath: /analytics afterMiddleware: compression configuration: - baseUri: http://localhost:4004/alp + baseUri: http://localhost:4004/analytics username: admin # dummy credentials for local testing password: admin # dummy credentials for local testing diff --git a/app/travel_alp/webapp/Component.js b/app/travel_analytics/webapp/Component.js similarity index 65% rename from app/travel_alp/webapp/Component.js rename to app/travel_analytics/webapp/Component.js index 08decfc6..50db4d4e 100644 --- a/app/travel_alp/webapp/Component.js +++ b/app/travel_analytics/webapp/Component.js @@ -1,6 +1,6 @@ sap.ui.define(["sap/fe/core/AppComponent"], function (Component) { "use strict"; - return Component.extend("sap.fe.cap.travel_alp.Component", { + return Component.extend("sap.fe.cap.travel_analytics.Component", { metadata: { manifest: "json" }, }); }); diff --git a/app/travel_alp/webapp/i18n/i18n.properties b/app/travel_analytics/webapp/i18n/i18n.properties similarity index 100% rename from app/travel_alp/webapp/i18n/i18n.properties rename to app/travel_analytics/webapp/i18n/i18n.properties diff --git a/app/travel_alp/webapp/i18n/i18n_de.properties b/app/travel_analytics/webapp/i18n/i18n_de.properties similarity index 100% rename from app/travel_alp/webapp/i18n/i18n_de.properties rename to app/travel_analytics/webapp/i18n/i18n_de.properties diff --git a/app/travel_alp/webapp/i18n/i18n_en.properties b/app/travel_analytics/webapp/i18n/i18n_en.properties similarity index 100% rename from app/travel_alp/webapp/i18n/i18n_en.properties rename to app/travel_analytics/webapp/i18n/i18n_en.properties diff --git a/app/travel_alp/webapp/i18n/i18n_fr.properties b/app/travel_analytics/webapp/i18n/i18n_fr.properties similarity index 100% rename from app/travel_alp/webapp/i18n/i18n_fr.properties rename to app/travel_analytics/webapp/i18n/i18n_fr.properties diff --git a/app/travel_alp/webapp/index.html b/app/travel_analytics/webapp/index.html similarity index 85% rename from app/travel_alp/webapp/index.html rename to app/travel_analytics/webapp/index.html index e4cbc6e7..75f55b8d 100644 --- a/app/travel_alp/webapp/index.html +++ b/app/travel_analytics/webapp/index.html @@ -19,7 +19,7 @@ src="https://ui5.sap.com/1.128.0/resources/sap-ui-core.js" data-sap-ui-theme="sap_horizon" data-sap-ui-oninit="module:sap/ui/core/ComponentSupport" - data-sap-ui-resourceroots='{ "sap.fe.cap.travel_alp": "./" }' + data-sap-ui-resourceroots='{ "sap.fe.cap.travel_analytics": "./" }' data-sap-ui-compatVersion="edge" data-sap-ui-async="true" data-sap-ui-preload="async" @@ -31,9 +31,9 @@
diff --git a/app/travel_alp/webapp/manifest.json b/app/travel_analytics/webapp/manifest.json similarity index 97% rename from app/travel_alp/webapp/manifest.json rename to app/travel_analytics/webapp/manifest.json index 567e8fc8..91a893c1 100644 --- a/app/travel_alp/webapp/manifest.json +++ b/app/travel_analytics/webapp/manifest.json @@ -1,12 +1,12 @@ { "_version": "1.42.0", "sap.app": { - "id": "sap.fe.cap.travel_alp", + "id": "sap.fe.cap.travel_analytics", "type": "application", "title": "{{title}}", "description": "{{description}}", "i18n": { - "bundleName": "sap.fe.cap.travel_alp.i18n.i18n", + "bundleName": "sap.fe.cap.travel_analytics.i18n.i18n", "supportedLocales": [ "en", "de", @@ -19,7 +19,7 @@ }, "dataSources": { "mainService": { - "uri": "alp/", + "uri": "analytics/", "type": "OData", "settings": { "odataVersion": "4.0" @@ -83,7 +83,7 @@ "i18n": { "type": "sap.ui.model.resource.ResourceModel", "settings": { - "bundleName": "sap.fe.cap.travel_alp.i18n.i18n", + "bundleName": "sap.fe.cap.travel_analytics.i18n.i18n", "supportedLocales": [ "en", "de", diff --git a/app/travel_alp/webapp/test/flpSandbox.html b/app/travel_analytics/webapp/test/flpSandbox.html similarity index 92% rename from app/travel_alp/webapp/test/flpSandbox.html rename to app/travel_analytics/webapp/test/flpSandbox.html index e572fbb1..a0bc62ab 100644 --- a/app/travel_alp/webapp/test/flpSandbox.html +++ b/app/travel_analytics/webapp/test/flpSandbox.html @@ -43,11 +43,11 @@ }, }, applications: { - "sapfecapsflightsflightalp-tile": { - title: "SFlight ALP", + "sapfecapsflightsflightanalytics-tile": { + title: "SFlight Analytics", description: "SFlight ALP", additionalInformation: - "SAPUI5.Component=sap.fe.cap.travel_alp", + "SAPUI5.Component=sap.fe.cap.travel_analytics", applicationType: "URL", url: "../", }, @@ -69,7 +69,7 @@ data-sap-ui-theme="sap_horizon" data-sap-ui-compatVersion="edge" data-sap-ui-language="en" - data-sap-ui-resourceroots='{"sap.fe.cap.travel_alp": "../"}' + data-sap-ui-resourceroots='{"sap.fe.cap.travel_analytics": "../"}' data-sap-ui-frameOptions="allow" > // NON-SECURE setting for testing environment diff --git a/app/travel_alp/webapp/test/integration/Opa.qunit.html b/app/travel_analytics/webapp/test/integration/Opa.qunit.html similarity index 95% rename from app/travel_alp/webapp/test/integration/Opa.qunit.html rename to app/travel_analytics/webapp/test/integration/Opa.qunit.html index aaf3e2f1..85ff3f93 100644 --- a/app/travel_alp/webapp/test/integration/Opa.qunit.html +++ b/app/travel_analytics/webapp/test/integration/Opa.qunit.html @@ -12,7 +12,7 @@ data-sap-ui-animation="false" data-sap-ui-compatVersion="edge" data-sap-ui-resourceroots='{ - "sap.fe.cap.travel_alp": "../../" + "sap.fe.cap.travel_analytics": "../../" }' data-sap-ui-theme="sap_horizon" data-sap-ui-libs="sap.m, sap.fe.core" diff --git a/app/travel_alp/webapp/test/integration/Opa.qunit.js b/app/travel_analytics/webapp/test/integration/Opa.qunit.js similarity index 61% rename from app/travel_alp/webapp/test/integration/Opa.qunit.js rename to app/travel_analytics/webapp/test/integration/Opa.qunit.js index 493e7772..c0cbafc1 100644 --- a/app/travel_alp/webapp/test/integration/Opa.qunit.js +++ b/app/travel_analytics/webapp/test/integration/Opa.qunit.js @@ -1,9 +1,9 @@ sap.ui.require( [ "sap/fe/test/JourneyRunner", - "sap/fe/cap/travel_alp/test/integration/OpaJourney", - "sap/fe/cap/travel_alp/test/integration/pages/BookingsList", - "sap/fe/cap/travel_alp/test/integration/pages/BookingsObjectPage", + "sap/fe/cap/travel_analytics/test/integration/OpaJourney", + "sap/fe/cap/travel_analytics/test/integration/pages/BookingsList", + "sap/fe/cap/travel_analytics/test/integration/pages/BookingsObjectPage", ], function (JourneyRunner, opaJourney, BookingsList, BookingsObjectPage) { "use strict"; @@ -11,7 +11,7 @@ sap.ui.require( const runner = new JourneyRunner({ // start index.html in web folder launchUrl: - sap.ui.require.toUrl("sap/fe/cap/travel_alp") + "/index.html", + sap.ui.require.toUrl("sap/fe/cap/travel_analytics") + "/index.html", }); runner.run( diff --git a/app/travel_alp/webapp/test/integration/OpaJourney.js b/app/travel_analytics/webapp/test/integration/OpaJourney.js similarity index 90% rename from app/travel_alp/webapp/test/integration/OpaJourney.js rename to app/travel_analytics/webapp/test/integration/OpaJourney.js index 1a465878..b0ec08df 100644 --- a/app/travel_alp/webapp/test/integration/OpaJourney.js +++ b/app/travel_analytics/webapp/test/integration/OpaJourney.js @@ -4,7 +4,7 @@ sap.ui.define(["sap/ui/test/opaQunit"], function (opaTest) { return { run: function () { - QUnit.module("Travel ALP Tests"); + QUnit.module("Travel Analytics Tests"); opaTest("Start application", function (Given, When, Then) { Given.iStartMyApp(); diff --git a/app/travel_alp/webapp/test/integration/pages/BookingsList.js b/app/travel_analytics/webapp/test/integration/pages/BookingsList.js similarity index 87% rename from app/travel_alp/webapp/test/integration/pages/BookingsList.js rename to app/travel_analytics/webapp/test/integration/pages/BookingsList.js index ccf90907..8f641481 100644 --- a/app/travel_alp/webapp/test/integration/pages/BookingsList.js +++ b/app/travel_analytics/webapp/test/integration/pages/BookingsList.js @@ -8,7 +8,7 @@ sap.ui.define(["sap/fe/test/ListReport"], function (ListReport) { return new ListReport( { - appId: "sap.fe.cap.travel_alp", + appId: "sap.fe.cap.travel_analytics", componentId: "BookingsList", entitySet: "Bookings", }, diff --git a/app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js b/app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js similarity index 87% rename from app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js rename to app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js index 4d493d1d..1d5782ff 100644 --- a/app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js +++ b/app/travel_analytics/webapp/test/integration/pages/BookingsObjectPage.js @@ -8,7 +8,7 @@ sap.ui.define(["sap/fe/test/ObjectPage"], function (ObjectPage) { return new ObjectPage( { - appId: "sap.fe.cap.travel_alp", + appId: "sap.fe.cap.travel_analytics", componentId: "BookingsObjectPage", entitySet: "Bookings", }, diff --git a/app/travel_alp/webapp/test/testsuite.qunit.html b/app/travel_analytics/webapp/test/testsuite.qunit.html similarity index 100% rename from app/travel_alp/webapp/test/testsuite.qunit.html rename to app/travel_analytics/webapp/test/testsuite.qunit.html diff --git a/app/travel_alp/webapp/test/testsuite.qunit.js b/app/travel_analytics/webapp/test/testsuite.qunit.js similarity index 100% rename from app/travel_alp/webapp/test/testsuite.qunit.js rename to app/travel_analytics/webapp/test/testsuite.qunit.js diff --git a/app/travel_alp/xs-app.json b/app/travel_analytics/xs-app.json similarity index 82% rename from app/travel_alp/xs-app.json rename to app/travel_analytics/xs-app.json index 8025ca10..a3b8676a 100644 --- a/app/travel_alp/xs-app.json +++ b/app/travel_analytics/xs-app.json @@ -3,8 +3,8 @@ "authenticationMethod": "route", "routes": [ { - "source": "^/alp/(.*)$", - "target": "/alp/$1", + "source": "^/analytics/(.*)$", + "target": "/analytics/$1", "destination": "sflight-srv", "authenticationType": "xsuaa", "csrfProtection": false diff --git a/app/travel_alp/xs-security.json b/app/travel_analytics/xs-security.json similarity index 100% rename from app/travel_alp/xs-security.json rename to app/travel_analytics/xs-security.json diff --git a/mta-java.yaml b/mta-java.yaml index 44929d0a..825d7861 100644 --- a/mta-java.yaml +++ b/mta-java.yaml @@ -22,7 +22,7 @@ modules: properties: SPRING_PROFILES_ACTIVE: cloud JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" - JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }' + JBP_CONFIG_SAP_MACHINE_JRE: '{ use_offline_repository: false, version: 17.+ }' requires: - name: sflight-db - name: sflight-uaa @@ -67,9 +67,9 @@ modules: artifacts: - travel-processor.zip target-path: resources/ - - name: sflight-app-travel-alp + - name: sflight-app-travel-analytics artifacts: - - travel-alp.zip + - travel-analytics.zip target-path: resources/ # ------------- APPLICATION: TRAVEL PROCESSOR ---------------- @@ -85,11 +85,11 @@ modules: - npm run build supported-platforms: [] - # ------------- APPLICATION: TRAVEL ALP ---------------------- - - name: sflight-app-travel-alp + # ------------- APPLICATION: TRAVEL ANALYTICS ---------------- + - name: sflight-app-travel-analytics # ------------------------------------------------------------ type: html5 - path: app/travel_alp + path: app/travel_analytics build-parameters: build-result: dist builder: custom diff --git a/mta.yaml b/mta.yaml index 09b1369b..e661cd91 100644 --- a/mta.yaml +++ b/mta.yaml @@ -60,9 +60,9 @@ modules: artifacts: - travel-processor.zip target-path: resources/ - - name: sflight-app-travel-alp + - name: sflight-app-travel-analytics artifacts: - - travel-alp.zip + - travel-analytics.zip target-path: resources/ # ------------- APPLICATION: TRAVEL PROCESSOR ---------------- @@ -78,11 +78,11 @@ modules: - npm run build supported-platforms: [] - # ------------- APPLICATION: TRAVEL ALP ---------------------- - - name: sflight-app-travel-alp + # ------------- APPLICATION: TRAVEL ANALYTICS ---------------- + - name: sflight-app-travel-analytics # ------------------------------------------------------------ type: html5 - path: app/travel_alp + path: app/travel_analytics build-parameters: build-result: dist builder: custom diff --git a/package.json b/package.json index 5a4c6657..d97b887c 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test": "jest", "test:mocha": "npx mocha --timeout 20000", "travel-processor": "cds watch --open travel_processor/webapp/index.html?sap-ui-xx-viewCache=false", - "travel-alp": "cds watch --open travel_alp/webapp/index.html?sap-ui-xx-viewCache=false" + "travel-analytics": "cds watch --open travel_analytics/webapp/index.html?sap-ui-xx-viewCache=false" }, "dependencies": { "@cap-js/hana": "^1", @@ -120,6 +120,6 @@ }, "sapux": [ "app/travel_processor", - "app/travel_alp" + "app/travel_analytics" ] } \ No newline at end of file diff --git a/srv/alp-service.cds b/srv/analytics-service.cds similarity index 93% rename from srv/alp-service.cds rename to srv/analytics-service.cds index 1f2f4195..4a2ab1d0 100644 --- a/srv/alp-service.cds +++ b/srv/analytics-service.cds @@ -1,6 +1,6 @@ using { sap.fe.cap.travel as my } from '../db/schema'; -service ALPService @(path:'/alp') { +service AnalyticsService @(path:'/analytics') { // @(restrict: [ // { grant: 'READ', to: 'authenticated-user'}, @@ -51,7 +51,7 @@ service ALPService @(path:'/alp') { @Common.Text: DepCity to_Flight.to_Connection.DepartureAirport.AirportID as DepAirport, to_Flight.to_Connection.DepartureAirport.City as DepCity, - @Common.Label: '{i18n>DestinationAirport}' + @Common.Label: '{i18n>ArrivalAirport}' @Common.Text: DestCity to_Flight.to_Connection.DestinationAirport.AirportID as DestAirport, to_Flight.to_Connection.DestinationAirport.City as DestCity, @@ -73,6 +73,7 @@ service ALPService @(path:'/alp') { annotate Travels:TravelID with @Common.Text: null; + annotate my.Airport:AirportID @Common.Text: City; annotate my.FlightConnection:Distance @( Common.Label: '{i18n>Distance}', Measures.Unit : DistanceUnit diff --git a/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java b/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java index 2209d97a..735dd750 100644 --- a/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java +++ b/srv/src/main/java/com/sap/cap/sflight/ui/RedirectFilter.java @@ -28,7 +28,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha String[] uiServicePaths = { "/travel_processor/webapp/processor", - "/travel_alp/webapp/alp" + "/travel_analytics/webapp/analytics" }; String path = req.getRequestURI(); From 9091305b665c3e8e9d986a14940fdc416bb9d266 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 12:27:42 +0200 Subject: [PATCH 11/12] chore(deps-dev): bump eslint from 9.11.1 to 9.12.0 (#1231) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bumps [eslint](https://github.com/eslint/eslint) from 9.11.1 to 9.12.0.
Release notes

Sourced from eslint's releases.

v9.12.0

Features

  • 5a6a053 feat: update to jiti v2 (#18954) (Arya Emami)
  • 17a07fb feat: Hooks for test cases (RuleTester) (#18771) (Anna Bocharova)
  • 2ff0e51 feat: Implement alternate config lookup (#18742) (Nicholas C. Zakas)
  • 2d17453 feat: Implement modified cyclomatic complexity (#18896) (Dmitry Pashkevich)

Bug Fixes

  • ea380ca fix: Upgrade retry to avoid EMFILE errors (#18986) (Nicholas C. Zakas)
  • fdd6319 fix: Issues with type definitions (#18940) (Arya Emami)

Documentation

  • ecbd522 docs: Mention code explorer (#18978) (Nicholas C. Zakas)
  • 7ea4ecc docs: Clarifying the Use of Meta Objects (#18697) (Amaresh S M)
  • d3e4b2e docs: Clarify how to exclude .js files (#18976) (Milos Djermanovic)
  • 57232ff docs: Mention plugin-kit in language docs (#18973) (Nicholas C. Zakas)
  • b80ed00 docs: Update README (GitHub Actions Bot)
  • cb69ab3 docs: Update README (GitHub Actions Bot)
  • 7fb0d95 docs: Update README (GitHub Actions Bot)
  • 493348a docs: Update README (GitHub Actions Bot)
  • 87a582c docs: fix typo in id-match rule (#18944) (Jay)

Chores

  • 555aafd chore: upgrade to @eslint/js@9.12.0 (#18987) (Francesco Trotta)
  • 873ae60 chore: package.json update for @​eslint/js release (Jenkins)
  • d0a5414 refactor: replace strip-ansi with native module (#18982) (Cristopher)
  • b827029 chore: Enable JSON5 linting (#18979) (Milos Djermanovic)
  • 8f55ca2 chore: Upgrade espree, eslint-visitor-keys, eslint-scope (#18962) (Nicholas C. Zakas)
  • c1a2725 chore: update dependency mocha to ^10.7.3 (#18945) (Milos Djermanovic)
Changelog

Sourced from eslint's changelog.

v9.12.0 - October 4, 2024

  • 555aafd chore: upgrade to @eslint/js@9.12.0 (#18987) (Francesco Trotta)
  • 873ae60 chore: package.json update for @​eslint/js release (Jenkins)
  • ea380ca fix: Upgrade retry to avoid EMFILE errors (#18986) (Nicholas C. Zakas)
  • d0a5414 refactor: replace strip-ansi with native module (#18982) (Cristopher)
  • b827029 chore: Enable JSON5 linting (#18979) (Milos Djermanovic)
  • ecbd522 docs: Mention code explorer (#18978) (Nicholas C. Zakas)
  • 7ea4ecc docs: Clarifying the Use of Meta Objects (#18697) (Amaresh S M)
  • d3e4b2e docs: Clarify how to exclude .js files (#18976) (Milos Djermanovic)
  • 5a6a053 feat: update to jiti v2 (#18954) (Arya Emami)
  • 57232ff docs: Mention plugin-kit in language docs (#18973) (Nicholas C. Zakas)
  • b80ed00 docs: Update README (GitHub Actions Bot)
  • cb69ab3 docs: Update README (GitHub Actions Bot)
  • 7fb0d95 docs: Update README (GitHub Actions Bot)
  • fdd6319 fix: Issues with type definitions (#18940) (Arya Emami)
  • 8f55ca2 chore: Upgrade espree, eslint-visitor-keys, eslint-scope (#18962) (Nicholas C. Zakas)
  • 17a07fb feat: Hooks for test cases (RuleTester) (#18771) (Anna Bocharova)
  • 493348a docs: Update README (GitHub Actions Bot)
  • 87a582c docs: fix typo in id-match rule (#18944) (Jay)
  • 2ff0e51 feat: Implement alternate config lookup (#18742) (Nicholas C. Zakas)
  • 2d17453 feat: Implement modified cyclomatic complexity (#18896) (Dmitry Pashkevich)
  • c1a2725 chore: update dependency mocha to ^10.7.3 (#18945) (Milos Djermanovic)
Commits

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=eslint&package-manager=npm_and_yarn&previous-version=9.11.1&new-version=9.12.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 87 +++++++++++++++++++++++++---------------------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7ee02d53..56f7b927 100644 --- a/package-lock.json +++ b/package-lock.json @@ -835,9 +835,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.11.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.11.1.tgz", - "integrity": "sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.12.0.tgz", + "integrity": "sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==", "dev": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -864,6 +864,28 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, + "node_modules/@humanfs/core": { + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.0.tgz", + "integrity": "sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==", + "dev": true, + "engines": { + "node": ">=18.18.0" + } + }, + "node_modules/@humanfs/node": { + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.5.tgz", + "integrity": "sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==", + "dev": true, + "dependencies": { + "@humanfs/core": "^0.19.0", + "@humanwhocodes/retry": "^0.3.0" + }, + "engines": { + "node": ">=18.18.0" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -879,11 +901,10 @@ } }, "node_modules/@humanwhocodes/retry": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.0.tgz", - "integrity": "sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==", + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz", + "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=18.18" }, @@ -3303,9 +3324,9 @@ } }, "node_modules/eslint": { - "version": "9.11.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.11.1.tgz", - "integrity": "sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==", + "version": "9.12.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.12.0.tgz", + "integrity": "sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -3313,11 +3334,11 @@ "@eslint/config-array": "^0.18.0", "@eslint/core": "^0.6.0", "@eslint/eslintrc": "^3.1.0", - "@eslint/js": "9.11.1", + "@eslint/js": "9.12.0", "@eslint/plugin-kit": "^0.2.0", + "@humanfs/node": "^0.16.5", "@humanwhocodes/module-importer": "^1.0.1", - "@humanwhocodes/retry": "^0.3.0", - "@nodelib/fs.walk": "^1.2.8", + "@humanwhocodes/retry": "^0.3.1", "@types/estree": "^1.0.6", "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", @@ -3325,9 +3346,9 @@ "cross-spawn": "^7.0.2", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.0.2", - "eslint-visitor-keys": "^4.0.0", - "espree": "^10.1.0", + "eslint-scope": "^8.1.0", + "eslint-visitor-keys": "^4.1.0", + "espree": "^10.2.0", "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", @@ -3337,13 +3358,11 @@ "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", "json-stable-stringify-without-jsonify": "^1.0.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", "text-table": "^0.2.0" }, "bin": { @@ -3365,9 +3384,9 @@ } }, "node_modules/eslint-scope": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz", - "integrity": "sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.1.0.tgz", + "integrity": "sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==", "dev": true, "dependencies": { "esrecurse": "^4.3.0", @@ -3381,11 +3400,10 @@ } }, "node_modules/eslint-visitor-keys": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.0.0.tgz", - "integrity": "sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.1.0.tgz", + "integrity": "sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -3394,15 +3412,14 @@ } }, "node_modules/espree": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz", - "integrity": "sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.2.0.tgz", + "integrity": "sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.12.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.0.0" + "eslint-visitor-keys": "^4.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -4507,16 +4524,6 @@ "node": ">=0.12.0" } }, - "node_modules/is-path-inside": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/is-stream": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", From f468a08c7013e2b0ded37cbb5ff6118ea477fd63 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:31:28 +0000 Subject: [PATCH 12/12] chore(deps): bump org.apache.maven.plugins:maven-surefire-plugin from 3.5.0 to 3.5.1 (#1232) Bumps [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) from 3.5.0 to 3.5.1.
Commits
  • a69b0f8 [maven-release-plugin] prepare release surefire-3.5.1
  • ccc54d0 [SUREFIRE-2273] Bump org.hamcrest:hamcrest from 2.2 to 3.0 (#784)
  • ab77c35 [SUREFIRE-2272] Bump org.codehaus.plexus:plexus-java from 1.2.0 to 1.3.0 - JD...
  • 93317ff [SUREFIRE-2269] Allow fail during clean in surefire-its
  • d7f4dbb [SUREFIRE-2270] Use JUnit5 in surefire-shadefire
  • 7a98850 Drop comment from jira integration
  • b2aa8a6 [SUREFIRE-2267] Packages for commons-codec should be relocated in surefire-sh...
  • a928255 [SUREFIRE-1737] Fix disable in statelessTestsetReporter
  • 4584ebb [SUREFIRE-2226] Upgrade to Maven Verifier 2.0.0-M1
  • 5aa3515 [SUREFIRE-2266] Execute ITs in parallel
  • Additional commits viewable in compare view

[![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.apache.maven.plugins:maven-surefire-plugin&package-manager=maven&previous-version=3.5.0&new-version=3.5.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- srv/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srv/pom.xml b/srv/pom.xml index 9aeb9cc4..54778c29 100644 --- a/srv/pom.xml +++ b/srv/pom.xml @@ -181,7 +181,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.5.0 + 3.5.1 true