Revert "Rename Analytics -> ALP (#1223)" (#1230)

This reverts commit 46d2f3a.
@stewsk I had to revert that as that broke tests based on sflight →
let's revisit on Monday

.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

.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

.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

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.
 

_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

_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

_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

_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.
 

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;

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';

app/travel_alp/annotations.cds → 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:

app/travel_alp/package.json → app/travel_analytics/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "travel-alp",
+  "name": "travel-analytics",
   "version": "1.0.0",
   "private": true,
   "description": "SFlight ALP",

app/travel_alp/ui5.yaml → 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

app/travel_alp/webapp/Component.js → 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" },
   });
 });

app/travel_alp/webapp/index.html → 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 @@
   <body class="sapUiBody sapUiSizeCompact" id="content">
     <div
       data-sap-ui-component
-      data-name="sap.fe.cap.travel_alp"
+      data-name="sap.fe.cap.travel_analytics"
       data-id="container"
-      data-settings='{"id" : "sap.fe.cap.travel_alp"}'
+      data-settings='{"id" : "sap.fe.cap.travel_analytics"}'
       data-handle-validation="true"
     ></div>
   </body>

app/travel_alp/webapp/manifest.json → 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",

app/travel_alp/webapp/test/flpSandbox.html → 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

app/travel_alp/webapp/test/integration/Opa.qunit.html → 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"

app/travel_alp/webapp/test/integration/Opa.qunit.js → app/travel_analytics/webapp/test/integration/Opa.qunit.js

@@ -1,17 +1,17 @@
 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";
 
     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(

app/travel_alp/webapp/test/integration/OpaJourney.js → 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();

app/travel_alp/webapp/test/integration/pages/BookingsList.js → 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",
     },

app/travel_alp/webapp/test/integration/pages/BookingsObjectPage.js → 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",
     },

app/travel_alp/xs-app.json → 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

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