Skip to content

Commit 04b2f80

Browse files
Trend micro Leading app changes
1 parent d1c047d commit 04b2f80

3 files changed

Lines changed: 86 additions & 39 deletions

File tree

cap-notebook/demoapp/app/_i18n/i18n.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ attachment = Attachment
2323
attachments = Attachments
2424
reference = Reference
2525
references = References
26-
UploadStatus = Upload Status
26+
uploadStatus = Upload Status
2727
type=Type
2828

2929
#XFLD,50: Label for a section

cap-notebook/demoapp/app/common.cds

Lines changed: 83 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,7 @@ annotate my.Books.attachments with @UI: {
7474
Value : uploadStatus,
7575
Criticality: uploadStatusNav.criticality,
7676
@Common.FieldControl: #ReadOnly,
77-
@HTML5.CssDefaults: {width: '20%'},
78-
@UI.Hidden: IsActiveEntity },
77+
@HTML5.CssDefaults: {width: '20%'} },
7978
{
8079
$Type : 'UI.DataFieldForAction',
8180
Label : 'Copy Attachments',
@@ -121,7 +120,7 @@ annotate my.Books.attachments with @UI: {
121120
{
122121
note @(title: '{i18n>Note}');
123122
fileName @(title: '{i18n>Filename}');
124-
uploadStatus @(title: '{i18n>UploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
123+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
125124
type @(title: '{i18n>type}');
126125
modifiedAt @(odata.etag: null);
127126
content
@@ -156,8 +155,7 @@ annotate my.Books.references with @UI: {
156155
Value : uploadStatus,
157156
Criticality: uploadStatusNav.criticality,
158157
@Common.FieldControl: #ReadOnly,
159-
@HTML5.CssDefaults: {width: '20%'},
160-
@UI.Hidden: IsActiveEntity },
158+
@HTML5.CssDefaults: {width: '20%'} },
161159
{
162160
$Type : 'UI.DataFieldForAction',
163161
Label : 'Copy Attachments',
@@ -203,9 +201,9 @@ annotate my.Books.references with @UI: {
203201
{
204202
note @(title: '{i18n>Note}');
205203
fileName @(title: '{i18n>Filename}');
206-
type @(title: '{i18n>type}');
207204
modifiedAt @(odata.etag: null);
208-
uploadStatus @(title: '{i18n>UploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
205+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
206+
type @(title: '{i18n>type}');
209207
content
210208
@Core.ContentDisposition: { Filename: fileName }
211209
@(title: '{i18n>Attachment}');
@@ -224,11 +222,16 @@ annotate my.Books.footnotes with @UI: {
224222
},
225223
LineItem : [
226224
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
227-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
225+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
228226
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
229-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
230-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
231-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
227+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
228+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
229+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
230+
{
231+
Value : uploadStatus,
232+
Criticality: uploadStatusNav.criticality,
233+
@Common.FieldControl: #ReadOnly,
234+
@HTML5.CssDefaults: {width: '20%'} },
232235
{
233236
$Type : 'UI.DataFieldForAction',
234237
Label : 'Copy Attachments',
@@ -278,6 +281,8 @@ annotate my.Books.footnotes with @UI: {
278281
content
279282
@Core.ContentDisposition: { Filename: fileName }
280283
@(title: '{i18n>Attachment}');
284+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
285+
type @(title: '{i18n>type}');
281286
folderId @UI.Hidden;
282287
repositoryId @UI.Hidden ;
283288
objectId @UI.Hidden ;
@@ -293,11 +298,16 @@ annotate my.Chapters.attachments with @UI: {
293298
},
294299
LineItem : [
295300
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
296-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
301+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
297302
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
298-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
299-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
300-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
303+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
304+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
305+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
306+
{
307+
Value : uploadStatus,
308+
Criticality: uploadStatusNav.criticality,
309+
@Common.FieldControl: #ReadOnly,
310+
@HTML5.CssDefaults: {width: '20%'} },
301311
{
302312
$Type : 'UI.DataFieldForAction',
303313
Label : 'Copy Attachments',
@@ -347,6 +357,8 @@ annotate my.Chapters.attachments with @UI: {
347357
content
348358
@Core.ContentDisposition: { Filename: fileName }
349359
@(title: '{i18n>Attachment}');
360+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
361+
type @(title: '{i18n>type}');
350362
folderId @UI.Hidden;
351363
repositoryId @UI.Hidden ;
352364
objectId @UI.Hidden ;
@@ -361,12 +373,17 @@ annotate my.Chapters.references with @UI: {
361373
TypeNamePlural: '{i18n>References}',
362374
},
363375
LineItem : [
364-
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
365-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
376+
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
377+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
366378
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
367-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
368-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
369-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
379+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
380+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
381+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
382+
{
383+
Value : uploadStatus,
384+
Criticality: uploadStatusNav.criticality,
385+
@Common.FieldControl: #ReadOnly,
386+
@HTML5.CssDefaults: {width: '20%'} },
370387
{
371388
$Type : 'UI.DataFieldForAction',
372389
Label : 'Copy References',
@@ -416,6 +433,8 @@ annotate my.Chapters.references with @UI: {
416433
content
417434
@Core.ContentDisposition: { Filename: fileName }
418435
@(title: '{i18n>Attachment}');
436+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
437+
type @(title: '{i18n>type}');
419438
folderId @UI.Hidden;
420439
repositoryId @UI.Hidden ;
421440
objectId @UI.Hidden ;
@@ -431,11 +450,16 @@ annotate my.Chapters.footnotes with @UI: {
431450
},
432451
LineItem : [
433452
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
434-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
453+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
435454
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
436-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
437-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
438-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
455+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
456+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
457+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
458+
{
459+
Value : uploadStatus,
460+
Criticality: uploadStatusNav.criticality,
461+
@Common.FieldControl: #ReadOnly,
462+
@HTML5.CssDefaults: {width: '20%'} },
439463
{
440464
$Type : 'UI.DataFieldForAction',
441465
Label : 'Copy Footnotes',
@@ -485,6 +509,8 @@ annotate my.Chapters.footnotes with @UI: {
485509
content
486510
@Core.ContentDisposition: { Filename: fileName }
487511
@(title: '{i18n>Attachment}');
512+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
513+
type @(title: '{i18n>type}');
488514
folderId @UI.Hidden;
489515
repositoryId @UI.Hidden ;
490516
objectId @UI.Hidden ;
@@ -500,11 +526,16 @@ annotate my.Pages.attachments with @UI: {
500526
},
501527
LineItem : [
502528
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
503-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
529+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
504530
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
505-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
506-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
507-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
531+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
532+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
533+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
534+
{
535+
Value : uploadStatus,
536+
Criticality: uploadStatusNav.criticality,
537+
@Common.FieldControl: #ReadOnly,
538+
@HTML5.CssDefaults: {width: '20%'} },
508539
{
509540
$Type : 'UI.DataFieldForAction',
510541
Label : 'Copy Attachments',
@@ -554,6 +585,8 @@ annotate my.Pages.attachments with @UI: {
554585
content
555586
@Core.ContentDisposition: { Filename: fileName }
556587
@(title: '{i18n>Attachment}');
588+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
589+
type @(title: '{i18n>type}');
557590
folderId @UI.Hidden;
558591
repositoryId @UI.Hidden ;
559592
objectId @UI.Hidden ;
@@ -569,11 +602,16 @@ annotate my.Pages.references with @UI: {
569602
},
570603
LineItem : [
571604
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
572-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
605+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
573606
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
574-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
575-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
576-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
607+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
608+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
609+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
610+
{
611+
Value : uploadStatus,
612+
Criticality: uploadStatusNav.criticality,
613+
@Common.FieldControl: #ReadOnly,
614+
@HTML5.CssDefaults: {width: '20%'} },
577615
{
578616
$Type : 'UI.DataFieldForAction',
579617
Label : 'Copy References',
@@ -623,6 +661,8 @@ annotate my.Pages.references with @UI: {
623661
content
624662
@Core.ContentDisposition: { Filename: fileName }
625663
@(title: '{i18n>Attachment}');
664+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
665+
type @(title: '{i18n>type}');
626666
folderId @UI.Hidden;
627667
repositoryId @UI.Hidden ;
628668
objectId @UI.Hidden ;
@@ -638,11 +678,16 @@ annotate my.Pages.footnotes with @UI: {
638678
},
639679
LineItem : [
640680
{Value: type, @HTML5.CssDefaults: {width: '10%'}},
641-
{Value: fileName, @HTML5.CssDefaults: {width: '25%'}},
681+
{Value: fileName, @HTML5.CssDefaults: {width: '20%'}},
642682
{Value: content, @HTML5.CssDefaults: {width: '0%'}},
643-
{Value: createdAt, @HTML5.CssDefaults: {width: '20%'}},
644-
{Value: createdBy, @HTML5.CssDefaults: {width: '20%'}},
645-
{Value: note, @HTML5.CssDefaults: {width: '25%'}},
683+
{Value: createdAt, @HTML5.CssDefaults: {width: '15%'}},
684+
{Value: createdBy, @HTML5.CssDefaults: {width: '15%'}},
685+
{Value: note, @HTML5.CssDefaults: {width: '20%'}},
686+
{
687+
Value : uploadStatus,
688+
Criticality: uploadStatusNav.criticality,
689+
@Common.FieldControl: #ReadOnly,
690+
@HTML5.CssDefaults: {width: '20%'} },
646691
{
647692
$Type : 'UI.DataFieldForAction',
648693
Label : 'Copy Footnotes',
@@ -692,6 +737,8 @@ annotate my.Pages.footnotes with @UI: {
692737
content
693738
@Core.ContentDisposition: { Filename: fileName }
694739
@(title: '{i18n>Attachment}');
740+
uploadStatus @(title: '{i18n>uploadStatus}', Common.Text : uploadStatusNav.name, Common.TextArrangement : #TextOnly);
741+
type @(title: '{i18n>type}');
695742
folderId @UI.Hidden;
696743
repositoryId @UI.Hidden ;
697744
objectId @UI.Hidden ;

cap-notebook/demoapp/mta.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ modules:
1818
SPRING_PROFILES_ACTIVE: cloud,sandbox
1919
JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
2020
JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 17.+ }'
21-
REPOSITORY_ID: 74cdda9e-5a69-49ad-8595-e329ea351018 # Placeholder for REPOSITORY_ID
21+
REPOSITORY_ID: __REPOSITORY_ID__ # Placeholder for REPOSITORY_ID
2222
INCOMING_REQUEST_TIMEOUT: 3600000
2323
INCOMING_SESSION_TIMEOUT: 3600000
2424
INCOMING_CONNECTION_TIMEOUT: 3600000
@@ -106,5 +106,5 @@ resources:
106106
- name: sdm
107107
type: org.cloudfoundry.managed-service
108108
parameters:
109-
service: sdm-test
109+
service: sdm
110110
service-plan: standard

0 commit comments

Comments
 (0)