@sapui5/sap.ui.export 1.123.0 → 1.124.0

package/src/sap/ui/export/library.js

@@ -15,7 +15,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 	 * @namespace
 	 * @alias sap.ui.export
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 * @public
 	 */
 
@@ -33,7 +33,7 @@ sap.ui.define(["sap/ui/core/Lib"], function(Library) {
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.123.0"
+		version: "1.124.0"
 	});
 
 	/**

package/src/sap/ui/export/messagebundle_cnr.properties

@@ -191,7 +191,7 @@ DESTINATION_REMOTE=Oblak
 DESTINATION_DIALOG_TITLE=Izvezi u
 
 #XMSG: Status text on the progress dialog for transfering the file to the cloud destination
-DESTINATION_DIALOG_STATUS=Fajl se prijenosi; budite strpljivi...
+DESTINATION_DIALOG_STATUS=Fajl se prenosi; budite strpljivi...
 
 #XMSG: Error message when exported file could not be transferred
 DESTINATION_TRANSFER_ERROR=Fajl se ne mo\u017Ee prenijeti.

package/src/sap/ui/export/messagebundle_sh.properties

@@ -38,16 +38,16 @@ MSG_WARNING_ROW_LIMIT=Samo {0} redova mo\u017Ee biti izvezeno u pojedina\u010Dno
 MSG_WARNING_COUNT_UNKNOWN=Dokument sadr\u017Ei nepoznati broj redova.
 
 #XMSG: Part of a message text that gives advice on how to proceed
-MSG_WARNING_ADVICE=Nemojte nastaviti dok se ne uvjerite da trenutna pode\u0161avanja filtera ne\u0107e za posljedicu imati veliku koli\u010Dinu podataka jer fajl mo\u017Ee biti prevelik za obradu.
+MSG_WARNING_ADVICE=Nemojte nastaviti dok se ne uverite da trenutna pode\u0161avanja filtera ne\u0107e za posledicu imati veliku koli\u010Dinu podataka jer fajl mo\u017Ee biti prevelik za obradu.
 
 #XMSG: Last sentence of a warning message to ask the user if he/she still wants to export
-MSG_WARNING_EXPORT_ANYWAY=Ipak izvijesti?
+MSG_WARNING_EXPORT_ANYWAY=Ipak izvesti?
 
 #XMSG: Textual representation of the technical error message which indicates that the export ran out of memory.
 MSG_ERROR_OUT_OF_MEMORY=Ponestalo je memorije za proces izvoza i on je prekinut.\nUskladite svoja pode\u0161avanja kolone ili filtera da biste izabrali manji broj \u0107elija.
 
 #XMSG: Screenreader announcement that the export process has been finished.
-MSG_INFO_EXPORT_FINISHED=Izvoz je zavr\u0161en i fajl je prenijet sa servera.
+MSG_INFO_EXPORT_FINISHED=Izvoz je zavr\u0161en i fajl je prenet sa servera.
 
 #XMSG: Message text informing that the original error message is empty or no specific error provided
 PROGRESS_ERROR_DEFAULT=Nepoznata gre\u0161ka
@@ -62,7 +62,7 @@ FILE_NAME=Naziv fajla
 SELECT_FORMAT=Format
 
 #XFLD: Split cells with multiple values
-SPLIT_CELLS=Podijeli \u0107elije s vi\u0161estrukim vrijednostima
+SPLIT_CELLS=Podeli \u0107elije s vi\u0161estrukim vrednostima
 
 #XFLD: Include filter settings
 INCLUDE_FILTER_SETTINGS=Uklju\u010Di pode\u0161avanja filtera
@@ -74,7 +74,7 @@ TECHNICAL_INFORMATION=Tehni\u010Dke informacije
 USER_NAME=Korisnik
 
 #XFLD: Creation time
-CREATED_TIME=Vrijeme kreiranja
+CREATED_TIME=Vreme kreiranja
 
 #XFLD: Archive format
 ARCHIVE_FORMAT=Format arhive
@@ -83,7 +83,7 @@ ARCHIVE_FORMAT=Format arhive
 FILTER_HEADER=Filter
 
 #XFLD: Add current date and time to the file name
-ADD_DATE_TIME=Dodaj teku\u0107i datum i vrijeme u naziv fajla
+ADD_DATE_TIME=Dodaj teku\u0107i datum i vreme u naziv fajla
 
 #XLST: Spreadsheet file type config for Microsoft Excel specific format
 XLSX_FILETYPE=Microsoft Excel (*.xlsx)
@@ -92,7 +92,7 @@ XLSX_FILETYPE=Microsoft Excel (*.xlsx)
 GSHEET_FILETYPE=Google Sheets
 
 #XMSG: File name warning text
-FILENAME_WARNING=Naziv fajla koji ste unijeli prekora\u010Duje 100 znakova. To mo\u017Ee sprije\u010Diti pravilno otvaranje tabelarnog izra\u010Dunavanja.
+FILENAME_WARNING=Naziv fajla koji ste uneli prekora\u010Duje 100 znakova. To mo\u017Ee spre\u010Diti pravilno otvaranje tabelarnog izra\u010Dunavanja.
 
 #XFLD: Paper Size
 PAPER_SIZE=Veli\u010Dina papira
@@ -116,7 +116,7 @@ ORIENTATION_LAND=Polo\u017Eeno
 ORIENTATION_PORT=Uspravno
 
 #XMSG: Font size error text
-NUMBER_ERROR=Vrijednost treba da bude broj.
+NUMBER_ERROR=Vrednost treba da bude broj.
 
 #XFLD: Fit to Page
 ENABLE_ACCESSIBILITY=Aktiviraj dostupnost
@@ -143,7 +143,7 @@ PDF_GENERATION_ERROR=Do\u0161lo je do gre\u0161ke u toku izvoza PDF fajla.
 PDF_GENERIC_ERROR=Gre\u0161ka u toku izvoza PDF fajla
 
 #XMSG: File name error text
-FILENAME_ERROR=Ne mo\u017Eete koristiti nijedan od sljede\u0107ih znakova u nazivu fajla\: \\ / \: * ? " < > |
+FILENAME_ERROR=Ne mo\u017Eete koristiti nijedan od slede\u0107ih znakova u nazivu fajla\: \\ / \: * ? " < > |
 
 #XMSG: Message text informing that exported file is being created
 PROGRESS_BUNDLE_MSG=Generisanje fajla...
@@ -191,19 +191,19 @@ DESTINATION_REMOTE=Oblak
 DESTINATION_DIALOG_TITLE=Izvezi u
 
 #XMSG: Status text on the progress dialog for transfering the file to the cloud destination
-DESTINATION_DIALOG_STATUS=Fajl se prijenosi; budite strpljivi...
+DESTINATION_DIALOG_STATUS=Fajl se prenosi; budite strpljivi...
 
 #XMSG: Error message when exported file could not be transferred
-DESTINATION_TRANSFER_ERROR=Fajl se ne mo\u017Ee prenijeti.
+DESTINATION_TRANSFER_ERROR=Fajl se ne mo\u017Ee preneti.
 
 #XMSG: Succuess message when the file has been saved to the cloud destination
-DESTINATION_TRANSFER_SUCCESS=Va\u0161 fajl je uspje\u0161no sa\u010Duvan.
+DESTINATION_TRANSFER_SUCCESS=Va\u0161 fajl je uspe\u0161no sa\u010Duvan.
 
 #XMSG: Error message when the user did not select a proper FileShare for storing the file
-DESTINATION_SELECTION_INCOMPLETE=Odabrano dijeljenje fajla je neva\u017Ee\u0107e.
+DESTINATION_SELECTION_INCOMPLETE=Odabrano deljenje fajla je neva\u017Ee\u0107e.
 
 #XBUT: Export button in the dialog when the user has selected to save the file on a cloud destination. This will open another file/folder selection. The text is followed by an ellipsis
 DIALOG_BUTTON_CLOUD_DESTINATION=Izvezi u...
 
 #XMSG: Error message that is shown when the user has selected Google Sheets as format but the selected file location is on a FileShare that has a vendor different than Google
-DESTINATION_ERROR_NOT_GOOGLE=Izvoz fajla u Google Sheets zahtjeva Google Workspace za podjelu fajla.\nOdaberite razli\u010Diti format ili razli\u010Ditu podjelu fajla.
+DESTINATION_ERROR_NOT_GOOGLE=Izvoz fajla u Google Sheets zahteva Google Workspace za podelu fajla.\nOdaberite razli\u010Diti format ili razli\u010Ditu podelu fajla.

package/src/sap/ui/export/provider/DataProviderBase.js

@@ -24,7 +24,7 @@
 	 * @param {object} mSettings Data service related part of the export configuration
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 *
 	 * @constructor
 	 * @class DataProviderBase
@@ -38,6 +38,7 @@
 		this.bCanceled = false;
 		this.iAvailableRows = 0;
 		this.mRequest = null;
+		this.iCount = Math.min(mSettings.dataSource.count || DataProviderBase.MAX_ROWS, DataProviderBase.MAX_ROWS);
 
 		if (this.mSettings.dataSource.downloadLimit) {
 			this.iTotalRows = this.mSettings.dataSource.downloadLimit;
@@ -232,9 +233,7 @@
 	DataProviderBase.prototype.fnOnDataReceived = function(oResult) {
 		var aData, sNextUrl, iFetchedRows, iRemainingRows;
 		var mCallbackParams = {};
-
 		this.oPendingXHR = null;
-
 		if (this.bCanceled) {
 			return; // Canceled by the application
 		}
@@ -245,15 +244,17 @@
 		iFetchedRows = aData.length;
 
 		this.iAvailableRows += iFetchedRows;
+
+		// Check if next url is provided
+		sNextUrl = (oResult && oResult['@odata.nextLink'] || (oResult.d && oResult.d.__next)) || null;
+
 		iRemainingRows = this.iTotalRows - this.iAvailableRows;
 
-		mCallbackParams.finished = iFetchedRows === 0 || iRemainingRows <= 0; // Done criteria
+		mCallbackParams.finished = iFetchedRows === 0 || (!sNextUrl && iRemainingRows <= 0) || (!sNextUrl && iFetchedRows < this.iBatchSize); // Done criteria
 		mCallbackParams.progress = this.iTotalRows;
-		mCallbackParams.total = this.iTotalRows;
+		mCallbackParams.total = this.iTotalRows < this.iCount ? this.iTotalRows : this.iCount;
 		mCallbackParams.fetched = this.iAvailableRows;
 
-		// Check if next url is provided
-		sNextUrl = (oResult && oResult['@odata.nextLink'] || (oResult.d && oResult.d.__next)) || null;
 
 		if (!mCallbackParams.finished) {
 			// Trigger next page request before processing received data. Fetch only configured/max limit rows

package/src/sap/ui/export/themes/sap_bluecrystal/library.source.less

@@ -3,6 +3,15 @@
  * (c) Copyright 2009-2024 SAP SE. All rights reserved.
  */
 
-@import "../base/library.source.less";
+/***********************************************************************************
+/* Due to deprecation of sap_bluecrystal with SAPUI5 version 1.44 the
+/* inheritance of the base theme is now updated to an inheritance of a static
+/* copy of the base theme named sap_bluecrystal_base. The respective
+/* control css files of base are copied to the sap_bluecrystal_base theme folder.
+/* This decoupling of the base theme is introduced with SAPUI5 version 1.124.
+***********************************************************************************/
+
+
+@import "../sap_bluecrystal_base/library.source.less";
 @import "../../../../../sap/ui/core/themes/sap_bluecrystal/base.less";
 @import "../../../../../sap/ui/core/themes/sap_bluecrystal/global.less";

package/src/sap/ui/export/themes/sap_bluecrystal_base/ExportUtils.less

@@ -0,0 +1,8 @@
+/*!
+ * SAPUI5
+ * (c) Copyright 2009-2024 SAP SE. All rights reserved.
+ */
+
+ .sapUiExportSettings .sapUiExportSettingsLabel > .sapMLabel::after {
+	content: ":";
+}

package/src/sap/ui/export/themes/sap_bluecrystal_base/library.source.less

@@ -0,0 +1,9 @@
+/*!
+ * SAPUI5
+ * (c) Copyright 2009-2024 SAP SE. All rights reserved.
+ */
+
+@import "../../../../../sap/ui/core/themes/base/base.less";
+@import "../../../../../sap/ui/core/themes/base/global.less";
+
+@import "ExportUtils.less";

package/src/sap/ui/export/util/Filter.js

@@ -20,7 +20,7 @@ sap.ui.define(['sap/ui/base/Object'], function(BaseObject) {
 	 * convenience functions like <code>sap.ui.export.util.Filter#setType</code> to improve the result.
 	 *
 	 * @author SAP SE
-	 * @version 1.123.0
+	 * @version 1.124.0
 	 *
 	 * @since 1.110
 	 * @alias sap.ui.export.util.Filter