Skip to content

Commit 70e6e51

Browse files
authored
Merge pull request #4037 from amgciadev/port-10053-b
[Port dspace-8_x] #10053: Add support for PCI Endorsement workflow
2 parents 682fd99 + 1b0e992 commit 70e6e51

File tree

5 files changed

+20
-3
lines changed

5 files changed

+20
-3
lines changed

src/app/core/data/signposting-links.model.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
export interface SignpostingLink {
55
href?: string,
66
rel?: string,
7-
type?: string
7+
type?: string,
8+
profile?: string
89
}

src/app/item-page/simple/item-page.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,8 @@ export class ItemPageComponent implements OnInit, OnDestroy {
168168
this.signpostingLinks = signpostingLinks;
169169

170170
signpostingLinks.forEach((link: SignpostingLink) => {
171-
links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
171+
links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ')
172+
+ (isNotEmpty(link.profile) ? ` ; profile="${link.profile}" ` : '');
172173
let tag: LinkDefinition = {
173174
href: link.href,
174175
rel: link.rel,
@@ -178,6 +179,11 @@ export class ItemPageComponent implements OnInit, OnDestroy {
178179
type: link.type,
179180
});
180181
}
182+
if (isNotEmpty(link.profile)) {
183+
tag = Object.assign(tag, {
184+
profile: link.profile,
185+
});
186+
}
181187
this.linkHeadService.addTag(tag);
182188
});
183189

src/app/item-page/simple/notify-requests-status/notify-status.enum.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ export enum RequestStatusEnum {
22
ACCEPTED = 'ACCEPTED',
33
REJECTED = 'REJECTED',
44
REQUESTED = 'REQUESTED',
5+
TENTATIVE_REJECT = 'TENTATIVE_REJECT',
56
}

src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,13 @@ export class RequestStatusAlertBoxComponent implements OnInit {
7474
};
7575
break;
7676

77+
case RequestStatusEnum.TENTATIVE_REJECT:
78+
this.displayOptions = {
79+
alertType: 'alert-warning',
80+
text: 'request-status-alert-box.tentative_rejected',
81+
};
82+
break;
83+
7784
case RequestStatusEnum.REQUESTED:
7885
this.displayOptions = {
7986
alertType: 'alert-warning',

src/assets/i18n/en.json5

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6318,7 +6318,7 @@
63186318

63196319
"quality-assurance.events.description-with-topic-and-target": "Below the list of all the suggestions for the selected topic <b>{{topic}}</b>, related to <b>{{source}}</b> and ",
63206320

6321-
"quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
6321+
"quality-assurance.event.table.event.message.serviceUrl": "Actor:",
63226322

63236323
"quality-assurance.event.table.event.message.link": "Link:",
63246324

@@ -6382,6 +6382,8 @@
63826382

63836383
"request-status-alert-box.rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }} </a> has been rejected.",
63846384

6385+
"request-status-alert-box.tentative_rejected": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }} </a> has been tentatively rejected. Revisions are required.",
6386+
63856387
"request-status-alert-box.requested": "The requested {{ offerType }} for <a href='{{serviceUrl}}' target='_blank'> {{ serviceName }} </a> is pending.",
63866388

63876389
"ldn-service-button-mark-inbound-deletion": "Mark supported pattern for deletion",

0 commit comments

Comments
 (0)