release v1.40.3 DEV to main promotion

.deploy/mta.yaml

@@ -10,7 +10,7 @@ ID: tutorials-ims
 # Bump this on each release you deploy — it's the version shown by `cf mtas`
 # and in the mtar filename (tutorials-ims_<version>.mtar). Deploy is manual:
 # `cd .deploy && mbt build && cf deploy mta_archives/tutorials-ims_<version>.mtar -e ../deploy/<env>.mtaext -f`.
-version: 1.40.2
+version: 1.40.3
 
 # Top-level parameters (overridable per-env via deploy/<env>.mtaext).
 parameters:

app/admin-annotations.cds

@@ -127,6 +127,8 @@ annotate AdminService.Missions with {
   missionType        @Common.Label: 'Type'  @Common.ValueListWithFixedValues;
   event              @Common.Label: 'Event';
   published          @Common.Label: 'Published';
+  temporarilyUnavailable @Common.Label: 'Temporarily Unavailable';
+  unavailableReason      @Common.Label: 'Unavailable Reason'  @UI.MultiLineText;
   status             @Common.Label: 'Status'  @Common.ValueListWithFixedValues;
   averageTimeToComplete @Common.Label: 'Avg Time (min)';
   qaPreviewUrl     @Common.Label: 'QA Preview'    @Common.FieldControl: #ReadOnly;
@@ -149,6 +151,7 @@ annotate AdminService.Missions with @UI: {
     { Value: experienceTag },
     { Value: primaryTagRef.name, Label: 'Primary Tag' },
     { Value: published, @UI.Importance: #High },
+    { Value: temporarilyUnavailable },
     { Value: status }
   ],
   Facets: [
@@ -166,6 +169,8 @@ annotate AdminService.Missions with @UI: {
     { Value: experienceTag },
     { Value: missionType },
     { Value: published, @UI.FieldControl: publishedFieldControl },
+    { Value: temporarilyUnavailable },
+    { Value: unavailableReason },
     { Value: status },
     { $Type: 'UI.DataFieldWithUrl', Value: qaPreviewLabel,   Url: qaPreviewUrl,   Label: 'QA Preview' },
     { $Type: 'UI.DataFieldWithUrl', Value: mainPreviewLabel, Url: mainPreviewUrl, Label: 'Live Mission' }

app/scanner/webapp/controller/App.controller.js

@@ -9,8 +9,8 @@ sap.ui.define([
 
     var CONTESTANT_DEFAULTS = {
         uid: null,
-        recordId: null,
-        status: null,
+        eventId: null,
+        claimedCount: 0,
         tutorialsCompleted: "",
         groupsCompleted: "",
         missionsCompleted: "",
@@ -33,18 +33,20 @@ sap.ui.define([
             this._oContestantModel.setData(Object.assign({}, CONTESTANT_DEFAULTS));
         },
 
-        _getContestant: async function (uid) {
+        _getContestant: async function (uid, eventId) {
             this._oContestantModel.setProperty("/loading", true);
             try {
                 var oModel = this.getView().getModel();
                 var oContext = oModel.bindContext("/getContestant(...)");
                 oContext.setParameter("accountNumber", uid);
+                oContext.setParameter("eventId", eventId);
                 await oContext.execute();
                 var result = oContext.getBoundContext().getObject();
                 this._oContestantModel.setProperty("/tutorialsCompleted", result.tutorialsCompleted || "");
                 this._oContestantModel.setProperty("/groupsCompleted", result.groupsCompleted || "");
                 this._oContestantModel.setProperty("/missionsCompleted", result.missionsCompleted || "");
                 this._oContestantModel.setProperty("/prizeRecords", result.prizeRecords || "");
+                this._oContestantModel.setProperty("/claimedCount", result.claimedCount || 0);
                 this._oContestantModel.setProperty("/loaded", true);
                 this._oContestantModel.setProperty("/loading", false);
             } catch (e) {
@@ -74,12 +76,14 @@ sap.ui.define([
 
             var payload = scanResult.payload || {};
             this._oContestantModel.setProperty("/uid", scanResult.uid || null);
-            this._oContestantModel.setProperty("/recordId", payload.recordId || null);
-            this._oContestantModel.setProperty("/status", payload.status || null);
+            this._oContestantModel.setProperty("/eventId", payload.eventId ? Number(payload.eventId) : null);
             this._oContestantModel.setProperty("/loaded", false);
 
             try {
-                await this._getContestant(this._oContestantModel.getProperty("/uid"));
+                await this._getContestant(
+                    this._oContestantModel.getProperty("/uid"),
+                    this._oContestantModel.getProperty("/eventId")
+                );
             } catch (e) {
                 MessageBox.error("Could not load contestant: " + (e.message || "Unknown error"));
                 this._resetContestantModel();
@@ -118,11 +122,12 @@ sap.ui.define([
 
         onClaimPrize: async function () {
             var oContestantModel = this._oContestantModel;
-            var recordId = oContestantModel.getProperty("/recordId");
             var uid = oContestantModel.getProperty("/uid");
+            var eventId = oContestantModel.getProperty("/eventId");
+            var claimedCount = oContestantModel.getProperty("/claimedCount");
 
-            if (!recordId) {
-                MessageBox.warning("No prize record found. Please re-scan.");
+            if (claimedCount >= 2) {
+                MessageBox.warning("Cap reached (2 of 2). No further prizes can be recorded.");
                 return;
             }
 
@@ -131,16 +136,15 @@ sap.ui.define([
 
             try {
                 var oModel = this.getView().getModel();
-                var oContext = oModel.bindContext("/claimPrize(...)");
-                oContext.setParameter("recordId", recordId);
-                // #889: accountNumber is required so the server can verify
-                // the prize belongs to the scanned contestant.
+                var oContext = oModel.bindContext("/claimPrizeForContestant(...)");
                 oContext.setParameter("accountNumber", uid);
+                oContext.setParameter("eventId", eventId);
                 await oContext.execute();
-                MessageToast.show("Prize claimed!", { duration: 2000 });
+                var result = oContext.getBoundContext().getObject();
+                MessageToast.show(result.message || "Prize recorded!", { duration: 2000 });
 
                 try {
-                    await this._getContestant(uid);
+                    await this._getContestant(uid, eventId);
                 } catch (e) {
                     MessageBox.error("Could not refresh contestant: " + (e.message || "Unknown error"));
                     oContestantModel.setProperty("/loading", false);

app/scanner/webapp/view/App.view.xml

@@ -44,10 +44,6 @@
                         <VBox id="vboxIdentity" class="sapUiSmallMarginBeginEnd sapUiSmallMarginTopBottom">
                             <Title id="resultUid" text="{contestant>uid}" level="H5"
                                 class="sapUiTinyMarginBottom" />
-                            <Text id="resultIdentitySub"
-                                text="{= ${contestant>recordId} + ' · ' + ${contestant>status} }"
-                                wrapping="false"
-                                class="sapUiTinyMarginBottom" />
                         </VBox>
 
                         <!-- Prizes Claimed — highlighted row -->
@@ -56,7 +52,7 @@
                             justifyContent="SpaceBetween"
                             alignItems="Center">
                             <Label id="lblPrizesClaimed" text="Prizes Claimed" design="Bold" />
-                            <Text id="prizeRecords" text="{contestant>prizeRecords}" />
+                            <Text id="prizeCount" text="{= ${contestant>claimedCount} + ' of 2' }" />
                         </HBox>
 
                         <!-- Remaining stats as a list -->
@@ -89,11 +85,11 @@
                     <ToolbarSpacer id="footerSpacer" />
                     <Button
                         id="btnClaimPrize"
-                        text="Claim Prize"
+                        text="Record prize handover"
                         icon="sap-icon://gift"
                         type="Emphasized"
                         press="onClaimPrize"
-                        enabled="{contestant>loaded}" />
+                        enabled="{= ${contestant>loaded} &amp;&amp; ${contestant>claimedCount} &lt; 2 }" />
                 </OverflowToolbar>
             </footer>
 

db/data/com.sap.developers.ims-LegacyRedirects.csv

@@ -16,7 +16,7 @@ ID;fromPath;toPath;statusCode;isPattern;isActive
 66333900-1eaa-0001-0001-000000000015;^/(de|es|zh)$;/;301;true;true
 66333900-1eaa-0001-0001-000000000016;^/(de|es|zh)/(.*)$;/$2;301;true;true
 66333900-1eaa-0001-0001-000000000017;/cloud-sdk;/topics/cloud-sdk.html;301;false;true
-66333900-1eaa-0001-0001-000000000018;/abap;/topics/abap-platform.html;301;false;true
+66333900-1eaa-0001-0001-000000000018;/abap;https://pages.community.sap.com/topics/abap;301;false;true
 66333900-1eaa-0001-0001-000000000019;/abapxml;/topics/abap-platform.html;301;false;true
 66333900-1eaa-0001-0001-000000000020;/datahub;/group.datahub-docker.html;301;false;true
 66333900-1eaa-0001-0001-000000000021;/tutorials/ml-fs-sapui5-series-changepoint-detection.html;/group.ml-fs-api-hub.html;301;false;true

db/last-dev/csn.json

@@ -481,6 +481,18 @@
           },
           "@cds.persistence.name": "PUBLISHED"
         },
+        "temporarilyUnavailable": {
+          "type": "cds.Boolean",
+          "default": {
+            "val": false
+          },
+          "@cds.persistence.name": "TEMPORARILYUNAVAILABLE"
+        },
+        "unavailableReason": {
+          "type": "cds.String",
+          "length": 500,
+          "@cds.persistence.name": "UNAVAILABLEREASON"
+        },
         "group_ID": {
           "type": "cds.String",
           "length": 36,

db/schema.cds

@@ -86,6 +86,8 @@ entity Missions : TaskBase, LinkHealth {
   // toggles published to true. Replaces AEM's role of curating which missions
   // surface on the website. Write-guard at admin-service.js:788. Issue #348.
   published                 : Boolean default false;
+  temporarilyUnavailable    : Boolean default false;
+  unavailableReason         : String(500);
   primaryTagRef             : Association to Tags;
   group                     : Association to Groups;
   event                     : Association to Events;

db/src/com.sap.developers.ims.Missions.hdbmigrationtable

@@ -1,4 +1,4 @@
-== version=8
+== version=9
 COLUMN TABLE com_sap_developers_ims_Missions (
   ID NVARCHAR(36) NOT NULL,
   createdAt TIMESTAMP,
@@ -23,12 +23,18 @@ COLUMN TABLE com_sap_developers_ims_Missions (
   sourceKgCommunityFingerprint NVARCHAR(64),
   missionType NVARCHAR(20),
   published BOOLEAN DEFAULT FALSE,
+  temporarilyUnavailable BOOLEAN DEFAULT FALSE,
+  unavailableReason NVARCHAR(500),
   group_ID NVARCHAR(36),
   event_ID NVARCHAR(36),
   groupOrder INTEGER DEFAULT 0,
   PRIMARY KEY(ID)
 )
 
+== migration=9
+-- generated by cds-compiler version 7.0.1
+ALTER TABLE com_sap_developers_ims_Missions ADD (temporarilyUnavailable BOOLEAN DEFAULT FALSE, unavailableReason NVARCHAR(500));
+
 == migration=8
 -- generated by cds-compiler version 7.0.1
 ALTER TABLE com_sap_developers_ims_Missions ADD (linkStatus NVARCHAR(8) DEFAULT 'UNKNOWN', lastChecked TIMESTAMP, linkStatusOverride NVARCHAR(8));

db/views.cds

@@ -92,7 +92,9 @@ view NavigatorCatalog as
     item.itemOrder,
     item.taskType
   }
-  where item.taskType = 'TUTORIAL' and tut.slug is not null and mission.published = true;
+  where item.taskType = 'TUTORIAL' and tut.slug is not null
+    and mission.published = true
+    and (mission.temporarilyUnavailable is null or mission.temporarilyUnavailable = false);
 
 view SearchableItems as
   SELECT from ims.Tutorials as t

docs/authors/writing-tutorials.md

@@ -78,7 +78,7 @@ author_profile: https://github.com/janedoe
 | `auto_validation` | No | Set `true` if the tutorial has quiz rules in the `-Contribution` repo. |
 | `author_name`, `author_profile` | Recommended | Shown on the tutorial page. |
 | `video` | No | Optional intro video shown as a styled player at the top of the steps. See [§3.3 Adding a video](#_3-3-adding-a-video). |
-| `variables` | No | Array of per-reader values (e.g. a workshop group number) the reader fills in once and the platform substitutes live throughout the tutorial. See [§3.7 Personalize with variables](#_3-7-personalize-with-variables). |
+| `variables` | No | Array of substituted values — either per-reader (e.g. a workshop group number the reader fills in) or author-fixed (`value:`, optionally `display: false` to hide). The platform substitutes them live throughout the tutorial. See [§3.7 Personalize with variables](#_3-7-personalize-with-variables). |
 
 A canonical taxonomy of allowed `primary_tag` and `tags` values is maintained in the platform's `Tags` entity. To add a new tag or category, see [Center Admin](center-admin.md) § "Import a new tag".
 
@@ -356,6 +356,22 @@ Optionally pre-fill the value from the reader's identity with a `default` regex
       pattern: 'da164-(\d+)@'      # capture group 1 → default value
 ```
 
+#### Author-fixed values and hidden variables
+
+Sometimes the value is the **same for every reader** but repeated throughout the tutorial — a product name, a release version, a service URL. Set it **once** with `value:` and reference `{{var:<name>}}` everywhere; change it in one place and it updates across the whole tutorial. Add `display: false` so the reader never sees an input for it:
+
+```yaml
+variables:
+  - name: productVersion
+    type: string
+    value: "MyApp 2.0"             # author-fixed literal — substituted everywhere
+    display: false                 # hidden: no input shown to the reader
+```
+
+- `display` is **optional and defaults to `true`** (shown). Only `display: false` hides the input. A hidden variable needs no `label`.
+- `value:` overrides a `default:` regex. Precedence for the substituted value is: **`value` → `default` (regex) → what the reader types → empty**.
+- A displayed variable (`display: true` or omitted) with a `value:` is **pre-filled** with that value but the reader can still edit it.
+
 Key behaviors:
 
 - **Build-enforced.** A malformed `variables:` block, an invalid `type`, a `default.from` off the allowlist `{email, id, givenName, familyName}`, an uncompilable `default.pattern`, or a `{{var:<name>}}` token referencing an undeclared name is a **hard build failure** — it can never reach readers. (A declared-but-unused variable is a soft warning.)