@openui5/sap.ui.documentation 1.141.2 → 1.143.0

package/src/sap/ui/documentation/sdk/controller/ReleaseNotes.controller.js

@@ -49,7 +49,7 @@ sap.ui.define([
 					return;
 				}
 
-				oVersion = Version(oAppInfo.version);
+				oVersion = new Version(oAppInfo.version);
 				iMajor = oVersion.getMajor();
 				iMinor = oVersion.getMinor();
 
@@ -85,7 +85,7 @@ sap.ui.define([
 
 				this.appendPageTitle(this.getModel("i18n").getProperty("RELEASE_NOTES_TITLE"));
 			},
-			_processLibInfo: function (aLibs, oLibInfos) {
+			_processLibInfo: function (aLibs, oLibInfos, oAppInfo) {
 				var iReleaseNotes,
 					aReturnLibs = [],
 					iLength = Array.isArray(aLibs) ? aLibs.length : 0,
@@ -93,26 +93,56 @@ sap.ui.define([
 					i;
 
 				fnProcessLib = function(sVersion, oValue) {
+					// Ensure notes array exists before processing
+					if (!oValue.notes || !Array.isArray(oValue.notes)) {
+						return;
+					}
+
 					iReleaseNotes += oValue.notes.length;
 
-					aLibs[i].versions.push({
-						version : sVersion,
-						notes : oValue.notes
+					// Enhance each note with version information
+					var aEnhancedNotes = oValue.notes.map(function(oNote) {
+						return {
+							type: oNote.type,
+							text: oNote.text,
+							version: sVersion
+						};
 					});
 
-					aLibs[i].versions.sort(function(a, b) {
-						return Version(b.version).compareTo(a.version);
+					// Check if version already exists
+					var oExistingVersion = aLibs[i].versions.find(function(v) {
+						return v.version === sVersion;
 					});
-				};
 
-				for (i = 0; i < iLength; i++) {
+					if (oExistingVersion) {
+						// Append notes to existing version
+						oExistingVersion.notes = oExistingVersion.notes.concat(aEnhancedNotes);
+					} else {
+						// Create new version entry
+						aLibs[i].versions.push({
+							version : sVersion,
+							notes : aEnhancedNotes,
+							distributionPatch: this._getDistributionPatch(oAppInfo, aLibs[i].library, sVersion)
+						});
+					}
+
+				}.bind(this);
 
+				for (i = 0; i < iLength; i++) {
+					var sLibraryName = aLibs[i]; // Preserve library name
 					aLibs[i] = oLibInfos[aLibs[i]];
+					aLibs[i].library = sLibraryName; // Store library name
 					aLibs[i].versions = [];
 
 					if (aLibs[i].relnotes) {
 						iReleaseNotes = 0;
 						jQuery.each(aLibs[i].relnotes, fnProcessLib);
+
+						// Sort versions after all have been processed
+						aLibs[i].versions.sort(function(a, b) {
+							return new Version(b.version).compareTo(a.version);
+						});
+
 						// We publish the library in the model only if there are release notes available
 						if (iReleaseNotes > 0) {
 							aReturnLibs.push(aLibs[i]);
@@ -147,11 +177,13 @@ sap.ui.define([
 			},
 			/**
 			 * Compares 2 UI5 version strings taking into account only major and minor version info
-			 * @returns {boolean}
+			 * @param {string} sVersionA First version string to compare
+			 * @param {string} sVersionB Second version string to compare
+			 * @returns {boolean} True if major.minor versions are equal, false otherwise
 			 */
 			_compareUI5Versions: function (sVersionA, sVersionB) {
-				var oVA = Version(sVersionA),
-					oVB = Version(sVersionB);
+				var oVA = new Version(sVersionA),
+					oVB = new Version(sVersionB);
 
 				return (oVA.getMajor() + "." + oVA.getMinor()) === (oVB.getMajor() + "." + oVB.getMinor());
 			},
@@ -196,6 +228,38 @@ sap.ui.define([
 					this._processLibInfo.bind(this));
 			},
 
+			/**
+			 * Simplified distribution patch mapping using already available version info
+			 * @param {object} oAppInfo - Version info already loaded by the system
+			 * @param {string} sLibraryName - Library name
+			 * @param {string} sLibraryVersion - Library version
+			 * @returns {string} Distribution patch version or library version if no mapping found
+			 * @private
+			 */
+			_getDistributionPatch: function(oAppInfo, sLibraryName, sLibraryVersion) {
+				if (!oAppInfo || !oAppInfo.libraries) {
+					return sLibraryVersion;
+				}
+
+				var oLibrary = oAppInfo.libraries.find(function(lib) {
+					return lib.name === sLibraryName;
+				});
+
+				if (!oLibrary || !oLibrary.patchHistory) {
+					return sLibraryVersion;
+				}
+
+				// Find the patch where this library version was first shipped
+				for (var patch in oLibrary.patchHistory) {
+					if (oLibrary.patchHistory[patch] === sLibraryVersion) {
+						var oVersion = new Version(oAppInfo.version);
+						return oVersion.getMajor() + "." + oVersion.getMinor() + "." + patch;
+					}
+				}
+
+				return sLibraryVersion;
+			},
+
 			_showBusyIndicator: function () {
 				this.byId("releaseNotesObjectPage").setBusy(true);
 			},

package/src/sap/ui/documentation/sdk/controller/util/ResourcesInfo.js

@@ -11,6 +11,12 @@ sap.ui.define([],
 
 		var aResources = [
 			// #1 Category: Featured
+			{
+				"id": "fioriDevPortal",
+				"text": "SAP Fiori Development Portal",
+				"href": "test-resources/sap/fe/core/fpmExplorer/index.html#/topic/introduction",
+				"isDistributionScope": true
+			},
 			{
 				"id": "iconExplorer",
 				"text": "Icon Explorer",
@@ -25,8 +31,8 @@ sap.ui.define([],
 			// #2 Category: Development Tools
 			{
 				"id": "tooling",
-				"text": "UI5 Tooling",
-				"href": "https://sap.github.io/ui5-tooling/"
+				"text": "UI5 CLI",
+				"href": "https://ui5.github.io/cli/"
 			},
 			{
 				"id": "fioriTools",
@@ -48,12 +54,6 @@ sap.ui.define([],
 				"text": "UI5 MCP server",
 				"href": "https://github.com/UI5/mcp-server"
 			},
-			{
-				"id": "fpmExplorer",
-				"text": "Flexible Programming Model Explorer",
-				"href": "test-resources/sap/fe/core/fpmExplorer/index.html#/overview/introduction",
-				"isDistributionScope": true
-			},
 			{
 				"id": "businessAppStudio",
 				"text": "SAP Business Application Studio",

package/src/sap/ui/documentation/sdk/controller/util/UsageTracker.js

@@ -31,7 +31,8 @@ sap.ui.define(
             this.section = sSectionTitle || "/";
             this.title = undefined;
             this.language = oUserLanguageTag.language;
-            this.country = oUserLanguageTag.region;
+            this.locale = oUserLanguageTag.toString();
+            this.country = "glo";
             this.referrer = document.referrer;
         };
 

package/src/sap/ui/documentation/sdk/css/style.css

@@ -146,6 +146,11 @@ pre.sapUiDocumentationAPICode,
 #teconsent > a {
 	display: none;
 }
+
+/* remove obsolete padding on the TrustArc consent bar that only causes a layout issue */
+#consent_blackbar {
+	padding: 0;
+}
 /************************************************* Custom control styles *********************************************/
 
 
@@ -1827,4 +1832,18 @@ table.cookieList {
 table.cookieList td {
 	padding: 1rem;
 	border-bottom: 2px solid var(--sapList_BorderColor);
+}
+
+.sapUiCommunityLinkLogo {
+	margin-top: 1rem;
+}
+
+.sapUiCommunityLinkTitle {
+	font-size: 2rem;
+}
+
+@media (max-width: 59.375em) {
+	.sapUiCommunityLinkTitle {
+		font-size: 1.325rem;
+	}
 }

package/src/sap/ui/documentation/sdk/thirdparty/highlight.js/highlight.js

@@ -998,10 +998,10 @@ var hljs = (function () {
    * @param {string} message
    */
   const deprecated = (version, message) => {
-    if (seenDeprecations[`1.141.2/${message}`]) return;
+    if (seenDeprecations[`1.143.0/${message}`]) return;
 
-    console.log(`Deprecated as of 1.141.2. ${message}`);
-    seenDeprecations[`1.141.2/${message}`] = true;
+    console.log(`Deprecated as of 1.143.0. ${message}`);
+    seenDeprecations[`1.143.0/${message}`] = true;
   };
 
   /* eslint-disable no-throw-literal */

package/src/sap/ui/documentation/sdk/view/FioriDevelopmentRowSAPUI5.fragment.xml

@@ -0,0 +1,87 @@
+<core:FragmentDefinition
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:custom="sap.ui.documentation"
+    xmlns:l="sap.ui.layout">
+    <Panel visible="{=!${versionData>/isOpenUI5}}"
+        accessibleRole="Region"
+        backgroundDesign="Transparent"
+        class="sapUiNoContentPadding">
+        <headerToolbar>
+            <Toolbar class="headlineCell">
+                <Title width="100%"
+                    text="{i18n>WELCOME_FIORI_DESIGN_DEVELOPMENT}"
+                    level="H1"
+                    titleStyle="H1"
+                    class="sapUiMediumMarginTopBottom" />
+            </Toolbar>
+        </headerToolbar>
+        <l:BlockLayout>
+            <l:BlockLayoutRow>
+                <l:BlockLayoutCell
+                    backgroundColorSet="ColorSet10"
+                    backgroundColorShade="ShadeA">
+                    <l:Grid
+                        defaultSpan="L6 M12 S12"
+                        hSpacing="0"
+                        vSpacing="0">
+                        <l:VerticalLayout width="100%">
+                            <custom:DivContainer class="sapUIDisclaimerLink sapUiSmallMarginBottom">
+                                <custom:TitleLink
+                                    href="https://experience.sap.com/fiori-design/"
+                                    text="{i18n>WELCOME_BLOCK_5_TITLE}"
+                                    titleStyle="H2"
+                                    target="_blank" />
+                                <Image
+                                    src="./resources/sap/ui/documentation/sdk/images/link-sap.png"
+                                    tooltip="{i18n>LEGAL_DISCLAIMER_EXTERNAL_TOOLTIP}"
+                                    width="1.25rem"
+                                    press="onDisclaimerLinkPress" />
+                            </custom:DivContainer>
+                            <Text
+                                text="{i18n>WELCOME_BLOCK_5_TEXT}"
+                                class="sapUiSmallMarginBottom" />
+                        </l:VerticalLayout>
+                        <Image
+                            src="./resources/sap/ui/documentation/sdk/images/Fiori_design_examples.png"
+                            alt="{i18n>WELCOME_BLOCK_5_IMG_ALT}"
+                            densityAware="false"
+                            width="100%">
+                            <layoutData>
+                                <l:GridData span="L6 M12 S12" />
+                            </layoutData>
+                        </Image>
+                    </l:Grid>
+                </l:BlockLayoutCell>
+
+                <l:BlockLayoutCell
+                    backgroundColorSet="ColorSet10"
+                    backgroundColorShade="ShadeA">
+                    <l:Grid
+                        defaultSpan="L6 M12 S12"
+                        hSpacing="0"
+                        vSpacing="0">
+                        <l:VerticalLayout
+                            width="100%">
+                            <custom:TitleLink
+                                href="test-resources/sap/fe/core/fpmExplorer/index.html#/topic/introduction"
+                                text="{i18n>WELCOME_BLOCK_14_TITLE}"
+                                titleStyle="H2"
+                                class="sapUiSmallMarginBottom" />
+                            <Text text="{i18n>WELCOME_BLOCK_14_TEXT}" class="sapUiSmallMarginBottom" />
+                        </l:VerticalLayout>
+                        <Image
+                            src="./resources/sap/ui/documentation/sdk/images/Fiori_dev_portal.png"
+                            alt="{i18n>WELCOME_BLOCK_14_IMG_ALT}"
+                            densityAware="false"
+                            width="100%">
+                            <layoutData>
+                                <l:GridData span="L6 M12 S12" />
+                            </layoutData>
+                        </Image>
+                    </l:Grid>
+                </l:BlockLayoutCell>
+            </l:BlockLayoutRow>
+        </l:BlockLayout>
+    </Panel>
+</core:FragmentDefinition>

package/src/sap/ui/documentation/sdk/view/ReleaseNotes.view.xml

@@ -21,7 +21,7 @@
 
 				<headerContent>
 					<layout:VerticalLayout>
-						<m:Text text="This log includes the library notes for the libraries listed below."/>
+						<m:Text text="This log includes the library notes for the libraries listed below. The distribution patch information shows when changes were delivered in SAPUI5. The version shown after each change indicates the library version where the change was first included."/>
 						<m:Select id="VersionSelect" items="{select>/items}" change="handleVersionChange" visible="false">
 							<core:Item text="{select>value}" key="{select>key}"/>
 						</m:Select>
@@ -34,13 +34,14 @@
 						<ObjectPageSubSection titleUppercase="false">
 							<layout:VerticalLayout content="{path: 'versions', templateShareable: false}" width="100%">
 								<m:Panel
-									headerText="{version}"
-									content="{path: 'notes', templateShareable: false}"
+									headerText="{distributionPatch}"
 									expandable="true"
 									expanded="true"
 									class="sapUxAPObjectPageSubSectionAlignContent"
 									width="auto">
-									<m:Text width="100%" text="[{type}] {text}"/>
+									<layout:VerticalLayout content="{path: 'notes', templateShareable: false}" width="100%">
+										<m:Text width="100%" text="[{type}] {text} (included in {version})"/>
+									</layout:VerticalLayout>
 								</m:Panel>
 							</layout:VerticalLayout>
 						</ObjectPageSubSection>

package/src/sap/ui/documentation/sdk/view/Resources.view.xml

@@ -89,6 +89,33 @@
 								</grid:GridResponsiveLayout>
 							</grid:customLayout>
 
+							<!-- SAP Fiori Development Portal -->
+							<f:Card class="sapUiDemoKitResourcesRegularCard"
+								visible="{
+									path: 'resources>/fioriDevPortal',
+									formatter: '.formatter.formatResourceCardVisibility'
+								}">
+								<f:header>
+									<card:Header title="{i18n>RESOURCES_CARD_TITLE_FIORI_DEV_PORTAL}" iconSrc="sap-icon://explorer" />
+								</f:header>
+								<f:content>
+									<VBox class="sapUiDemoKitResourcesCardContentSpacing" wrap="Wrap">
+										<Text text="{i18n>RESOURCES_CARD_DESC_FIORI_DEV_PORTAL}">
+											<layoutData>
+												<FlexItemData growFactor="1" />
+											</layoutData>
+										</Text>
+										<Link
+											class="sapUiDemoKitResourcesCardLink"
+											href="{resources>/fioriDevPortal/href}"
+											target="_blank"
+											text="{i18n>RESOURCES_CARD_LINK_FIORI_DEV_PORTAL}"
+											tooltip="{i18n>RESOURCES_CARD_LINK_TOOLTIP}"
+											wrapping="true" />
+									</VBox>
+								</f:content>
+							</f:Card>
+
 							<!-- Icon Explorer -->
 							<f:Card class="sapUiDemoKitResourcesRegularCard">
 								<f:header>
@@ -178,14 +205,14 @@
 								</grid:GridResponsiveLayout>
 							</grid:customLayout>
 
-							<!-- UI5 Tooling -->
+							<!-- UI5 CLI -->
 							<f:Card class="sapUiDemoKitResourcesRegularCard">
 								<f:header>
-									<card:Header title="{i18n>RESOURCES_CARD_TITLE_TOOLING}" iconSrc="sap-icon://hello-world" />
+									<card:Header title="{i18n>RESOURCES_CARD_TITLE_UI5_CLI}" iconSrc="sap-icon://hello-world" />
 								</f:header>
 								<f:content>
 									<VBox class="sapUiDemoKitResourcesCardContentSpacing" wrap="Wrap">
-										<Text text="{i18n>RESOURCES_CARD_DESC_TOOLING}">
+										<Text text="{i18n>RESOURCES_CARD_DESC_UI5_CLI}">
 											<layoutData>
 												<FlexItemData growFactor="1" />
 											</layoutData>
@@ -194,7 +221,7 @@
 											class="sapUiDemoKitResourcesCardLink"
 											href="{resources>/tooling/href}"
 											target="_blank"
-											text="{i18n>RESOURCES_CARD_LINK_TOOLING}"
+											text="{i18n>RESOURCES_CARD_LINK_UI5_CLI}"
 											tooltip="{i18n>RESOURCES_CARD_LINK_TOOLTIP}"
 											wrapping="true" />
 									</VBox>
@@ -293,33 +320,6 @@
 								</f:content>
 							</f:Card>
 
-							<!-- Flexible Programming Model Explorer -->
-							<f:Card class="sapUiDemoKitResourcesRegularCard"
-								visible="{
-									path: 'resources>/fpmExplorer',
-									formatter: '.formatter.formatResourceCardVisibility'
-								}">
-								<f:header>
-									<card:Header title="{i18n>RESOURCES_CARD_TITLE_FPM_EXPLORER}" iconSrc="sap-icon://explorer" />
-								</f:header>
-								<f:content>
-									<VBox class="sapUiDemoKitResourcesCardContentSpacing" wrap="Wrap">
-										<Text text="{i18n>RESOURCES_CARD_DESC_FPM_EXPLORER}">
-											<layoutData>
-												<FlexItemData growFactor="1" />
-											</layoutData>
-										</Text>
-										<Link
-											class="sapUiDemoKitResourcesCardLink"
-											href="{resources>/fpmExplorer/href}"
-											target="_blank"
-											text="{i18n>RESOURCES_CARD_LINK_FPM_EXPLORER}"
-											tooltip="{i18n>RESOURCES_CARD_LINK_TOOLTIP}"
-											wrapping="true" />
-									</VBox>
-								</f:content>
-							</f:Card>
-
 							<!-- SAP Business Application Studio -->
 							<f:Card class="sapUiDemoKitResourcesRegularCard">
 								<f:header>

package/src/sap/ui/documentation/sdk/view/StartCodingRowOpenUI5.fragment.xml

@@ -0,0 +1,65 @@
+<core:FragmentDefinition
+    xmlns="sap.m"
+    xmlns:core="sap.ui.core"
+    xmlns:custom="sap.ui.documentation"
+    xmlns:l="sap.ui.layout">
+    <Panel visible="{=!${device>/system/phone} &amp;&amp; ${versionData>/isOpenUI5}}"
+        accessibleRole="Region"
+        backgroundDesign="Transparent"
+        class="sapUiNoContentPadding">
+        <headerToolbar>
+            <Toolbar class="headlineCell">
+                <Title width="100%"
+                    text="{i18n>WELCOME_START_CODING}"
+                    level="H1"
+                    titleStyle="H1"
+                    class="sapUiMediumMarginTopBottom" />
+            </Toolbar>
+        </headerToolbar>
+        <l:BlockLayout>
+            <l:BlockLayoutRow>
+                <l:BlockLayoutCell backgroundColorSet="ColorSet10" backgroundColorShade="ShadeA">
+                    <l:layoutData>
+                        <l:BlockLayoutCellData sSize="1" mSize="2" lSize="3" xlSize="3" />
+                    </l:layoutData>
+
+                    <HBox alignItems="Center" justifyContent="Center" width="100%" height="100%">
+
+                        <Image
+                            src="./resources/sap/ui/documentation/sdk/images/Home_laptop.png"
+                            densityAware="false"
+                            width="100%"
+                            alt="{i18n>WELCOME_BLOCK_7_ALT}">
+                            <layoutData>
+                                <FlexItemData maxWidth="37.5rem" />
+                            </layoutData>
+                        </Image>
+                    </HBox>
+                </l:BlockLayoutCell>
+
+                <l:BlockLayoutCell
+                    class="welcomeBlock"
+                    backgroundColorSet="ColorSet10"
+                    backgroundColorShade="ShadeA">
+
+                    <l:layoutData>
+                        <l:BlockLayoutCellData sSize="1" mSize="2" lSize="3" xlSize="3" />
+                    </l:layoutData>
+
+                    <HBox direction="Column" justifyContent="Center" width="100%" height="100%">
+                        <custom:TitleLink
+                            href="topic/8b49fc198bf04b2d9800fc37fecbb218"
+                            text="{i18n>WELCOME_BLOCK_6_TITLE}"
+                            titleStyle="H2" />
+                        <Text class="sapUiMediumMarginTop" text="{i18n>WELCOME_BLOCK_6_TEXT_1}" />
+                        <HBox width="100%">
+                            <Text class="sapUiSmallMarginTop" text="{i18n>WELCOME_BLOCK_6_TEXT_2}" />
+                            <Link class="liveEditorLink sapUiSmallMarginTop" text="{i18n>LIVE_EDITOR_TITLE}"
+                                href="liveEditor" />
+                        </HBox>
+                    </HBox>
+                </l:BlockLayoutCell>
+            </l:BlockLayoutRow>
+        </l:BlockLayout>
+    </Panel>
+</core:FragmentDefinition>