Skip to content

Commit 4c973d8

Browse files
committed
lmendoza/jun-2025-multiple-changes
1 parent 2fa0dff commit 4c973d8

9 files changed

Lines changed: 26 additions & 25 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"scripts": {
55
"start-local": "npm run build-runtime-env && ng serve --disable-host-check --host 0.0.0.0",
6-
"start": "npm run build-runtime-env && ng serve --configuration=local-qa --host 0.0.0.0 --verbose",
6+
"start": "npm run build-runtime-env && ng serve --configuration=local-qa --host 0.0.0.0",
77
"start-sandbox": "ng serve --configuration=local-sandbox --host 0.0.0.0",
88
"start:en": "ng serve --configuration=local-qa-en --disable-host-check",
99
"start:ar": "ng serve --configuration=local-qa-ar --disable-host-check",

src/app/core/observability-events/observability-events.service.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,10 @@ export class CustomEventService {
9999

100100
// Send the final custom event to New Relic
101101
if (typeof (this.window as any).newrelic?.addPageAction === 'function') {
102-
;(this.window as any).newrelic?.addPageAction(journeyType, finalAttributes)
102+
;(this.window as any).newrelic?.addPageAction(
103+
journeyType,
104+
finalAttributes
105+
)
103106
}
104107

105108
// Clean up the journey data

src/app/layout/header/header.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,5 +197,5 @@ app-search {
197197
}
198198

199199
app-user-menu {
200-
display: flex ;
201-
}
200+
display: flex;
201+
}

src/app/layout/search/search.component.scss

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,4 @@ button {
131131

132132
app-user-menu {
133133
overflow: hidden;
134-
// display: flex;
135134
}
136-

src/app/layout/user-menu/user-menu.component.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
mat-stroked-button
3434
class="user-menu-button"
3535
(click)="goto('inbox', 'fromHeaderButton')"
36-
[attr.aria-label]="labelInbox"
3736
id="cy-inbox-button"
3837
*ngIf="userInfo"
3938
[matTooltip]="

src/app/layout/user-menu/user-menu.component.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ section {
1414
flex-wrap: nowrap;
1515
max-width: 248px;
1616
overflow: hidden;
17-
text-overflow: ellipsis;app-user-men
17+
text-overflow: ellipsis;
1818

1919
img {
2020
height: 36px;
@@ -83,4 +83,4 @@ span.name-text-container {
8383
min-width: 40px;
8484
padding: 0;
8585
margin: 0 16px;
86-
}
86+
}

src/app/layout/user-menu/user-menu.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export class UserMenuComponent implements OnInit {
2626
platform: PlatformInfo
2727
labelSigninRegister = $localize`:@@layout.ariaLabelSigninRegister:Sign in to ORCID or register for your ORCID iD`
2828
labelUserMenu = $localize`:@@layout.ariaLabelUserMenu:User menu`
29-
labelInbox = $localize`:@@layout.ariaLabelInbox:Inbox`
3029
notificationTooltipActive = $localize`:@@layout.notificationTooltip:You have unread notifications`
3130
notificationTooltip = $localize`:@@layout.notificationTooltipInactive:Notifications inbox`
3231
isAccountDelegate: boolean

src/locale/properties/layout/layout.en.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,3 +114,5 @@ footer.cookieSettings=Cookie Settings
114114
footer.ariaLabelLicense=license
115115
layout.ariaLabelConnectingResearchers=Connecting research and researchers
116116
layout.ariaLabelSearchRegistry=Search the ORCID registry...
117+
layout.notificationTooltip=You have unread notifications
118+
layout.notificationTooltipInactive=Notifications inbox

src/proxy.conf.qa.mjs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
*/
99
function bypassHtmlOrJson(req, res) {
1010
if (req.headers.accept?.includes('html')) {
11-
return '/index.html';
11+
return '/index.html'
1212
}
13-
req.headers['X-Dev-Header'] = 'local-host-proxy-call';
13+
req.headers['X-Dev-Header'] = 'local-host-proxy-call'
1414
}
1515

1616
/**
@@ -20,8 +20,8 @@ function bypassHtmlOrJson(req, res) {
2020
* ──────────────────────────────────────────────────────────────────────────────
2121
*/
2222
function proxyReqOverrideHeaders(proxyReq /* http.ClientRequest */, req, res) {
23-
proxyReq.setHeader('Origin', 'https://qa.orcid.org');
24-
proxyReq.setHeader('Referer', 'https://qa.orcid.org');
23+
proxyReq.setHeader('Origin', 'https://qa.orcid.org')
24+
proxyReq.setHeader('Referer', 'https://qa.orcid.org')
2525
}
2626

2727
/**
@@ -33,22 +33,22 @@ function proxyReqOverrideHeaders(proxyReq /* http.ClientRequest */, req, res) {
3333
*/
3434
function responseOverridesAuth() {
3535
return (proxyRes, req, res) => {
36-
const cookies = proxyRes.headers['set-cookie'];
36+
const cookies = proxyRes.headers['set-cookie']
3737
if (Array.isArray(cookies)) {
3838
proxyRes.headers['set-cookie'] = cookies.map((cookie) =>
3939
cookie.replace(/Domain=\.?(qa\.)?orcid\.org/i, 'Domain=localhost')
40-
);
40+
)
4141
}
4242
if (proxyRes.statusCode >= 300 && proxyRes.statusCode < 400) {
43-
let location = proxyRes.headers['location'];
43+
let location = proxyRes.headers['location']
4444
if (typeof location === 'string') {
4545
proxyRes.headers['location'] = location.replace(
4646
'http://auth.qa.orcid.org/login',
4747
'http://localhost:4200/auth/login'
48-
);
48+
)
4949
}
5050
}
51-
};
51+
}
5252
}
5353

5454
/**
@@ -60,22 +60,22 @@ function responseOverridesAuth() {
6060
*/
6161
function responseOverridesGeneric() {
6262
return (proxyRes, req, res) => {
63-
const cookies = proxyRes.headers['set-cookie'];
63+
const cookies = proxyRes.headers['set-cookie']
6464
if (Array.isArray(cookies)) {
6565
proxyRes.headers['set-cookie'] = cookies.map((cookie) =>
6666
cookie.replace(/Domain=\.?(qa\.)?orcid\.org/i, 'Domain=localhost')
67-
);
67+
)
6868
}
6969
if (proxyRes.statusCode >= 300 && proxyRes.statusCode < 400) {
70-
let location = proxyRes.headers['location'];
70+
let location = proxyRes.headers['location']
7171
if (typeof location === 'string') {
7272
proxyRes.headers['location'] = location.replace(
7373
'https://qa.orcid.org/signin',
7474
'http://localhost:4200/signin'
75-
);
75+
)
7676
}
7777
}
78-
};
78+
}
7979
}
8080

8181
/**
@@ -112,4 +112,4 @@ export default {
112112
bypass: bypassHtmlOrJson,
113113
onProxyRes: responseOverridesGeneric(),
114114
},
115-
};
115+
}

0 commit comments

Comments
 (0)