Skip to content

Commit f8add6a

Browse files
Changes
1 parent 887505e commit f8add6a

23 files changed

Lines changed: 1831 additions & 1276 deletions

.idea/.gitignore

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/compiler.xml

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/encodings.xml

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,7 @@ To display color-coded status indicators in the UI, create a `sap.attachments-Up
12891289
code;name;criticality
12901290
uploading;Uploading;5
12911291
Success;Success;3
1292-
Failed;Scan Failed;1
1292+
Failed;Scan Failed;2
12931293
VirusDetected;Virus detected;1
12941294
VirusScanInprogress;Virus scanning inprogress(refresh page);5
12951295
```

sdm/src/main/java/com/sap/cds/sdm/constants/SDMConstants.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ private SDMConstants() {
1111
public static final String REPOSITORY_ID = System.getenv("REPOSITORY_ID");
1212
public static final String MIMETYPE_INTERNET_SHORTCUT = "application/internet-shortcut";
1313
public static final String SYSTEM_USER = "system-internal";
14+
public static final String SDM_READONLY_CONTEXT = "SDM_READONLY_CONTEXT";
15+
1416
public static final String SDM_ANNOTATION_ADDITIONALPROPERTY_NAME =
1517
"SDM.Attachments.AdditionalProperty.name";
1618
public static final String SDM_ANNOTATION_ADDITIONALPROPERTY =

sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorKeys.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,8 @@ private SDMErrorKeys() {
8484
public static final String VIRUS_DETECTED_FILE_ERROR_KEY = "SDM.virusDetectedFileError";
8585
public static final String VIRUS_SCAN_IN_PROGRESS_FILE_ERROR_KEY =
8686
"SDM.virusScanInProgressFileError";
87+
88+
public static final String UPLOAD_IN_PROGRESS_FILE_ERROR_KEY = "SDM.uploadInProgressFileError";
8789
public static final String VIRUS_DETECTED_FILES_PREFIX_KEY = "SDM.virusDetectedFilesPrefix";
8890
public static final String VIRUS_DETECTED_FILES_SUFFIX_KEY = "SDM.virusDetectedFilesSuffix";
8991
public static final String VIRUS_SCAN_IN_PROGRESS_FILES_PREFIX_KEY =

sdm/src/main/java/com/sap/cds/sdm/constants/SDMErrorMessages.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,10 @@ private SDMErrorMessages() {
112112
"The virus scan failed, for the following files: \n\n";
113113
public static final String SCAN_FAILED_FILES_SUFFIX =
114114
"You can't save your changes because some files not scanned. Delete the unscanned files manually before continuing.";
115+
public static final String UPLOAD_IN_PROGRESS_FILES_PREFIX =
116+
"The upload is in progress for the following files: \n\n";
117+
public static final String UPLOAD_IN_PROGRESS_FILES_SUFFIX =
118+
"You can't save your changes until the upload completes. Refresh the page to check if the upload is complete.";
115119
public static final String RESTRICTED_CHARACTERS_IN_MULTIPLE_FILES =
116120
"The following names contain unsupported characters (‘/’ or ‘\\’). Rename and try again:\n\n";
117121
public static final String MULTIPLE_DUPLICATE_FILENAMES_PREFIX =
@@ -288,6 +292,13 @@ public static String virusScanInProgressFilesMessage(List<String> files) {
288292
return buildErrorMessage(files, prefix, closingRemark);
289293
}
290294

295+
public static String uploadInProgressFilesMessage(List<String> files) {
296+
StringBuilder prefix = new StringBuilder();
297+
prefix.append(SDMUtils.getErrorMessage("UPLOAD_IN_PROGRESS_FILES_PREFIX"));
298+
String closingRemark = SDMUtils.getErrorMessage("UPLOAD_IN_PROGRESS_FILES_SUFFIX");
299+
return buildErrorMessage(files, prefix, closingRemark);
300+
}
301+
291302
public static Map<String, Object> getAllErrorMessages() {
292303
Map<String, Object> out = new LinkedHashMap<>();
293304
for (Field f : SDMErrorMessages.class.getDeclaredFields()) {

0 commit comments

Comments
 (0)