Skip to content

Commit

Permalink
Merge branch 'main' into leo/batch-fixes-aug-30
Browse files Browse the repository at this point in the history
  • Loading branch information
leomendoza123 authored Aug 30, 2023
2 parents 5e5639d + 42581d5 commit 71a1102
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 7 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
## v2.38.10 - 2023-08-23

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.9...v2.38.10)

- [#2052](https://github.com/ORCID/orcid-angular/pull/2052): Init deactivate endpoint is a POST

## v2.38.9 - 2023-08-23

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.8...v2.38.9)

- [#2051](https://github.com/ORCID/orcid-angular/pull/2051): PR 2050 follow up
- [#2050](https://github.com/ORCID/orcid-angular/pull/2050): Leo/aug 22 batch fixes

## v2.38.8 - 2023-08-18

[Full Changelog](https://github.com/ORCID/orcid-angular/compare/v2.38.7...v2.38.8)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ export class SettingsActionsDeactivateComponent implements OnInit, OnDestroy {
deactivateOrcidAccount() {
this.alreadySendedDeactivatedAccountRequest = true
this.loading.next(true)
this._deactivate.deactivateAccount().subscribe((email) => {
this.deactivatedEmail = email
this._deactivate.deactivateAccount().subscribe((response) => {
this.deactivatedEmail = response.email
this.loading.next(false)
})
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ import { environment } from 'src/environments/environment'

import { ErrorHandlerService } from '../error-handler/error-handler.service'

export interface DeactivateResponse {
email: string
}

@Injectable({
providedIn: 'root',
})
Expand All @@ -22,9 +26,9 @@ export class AccountActionsDeactivateService {
this.options = { headers: this.headers, responseType: 'text' as 'text' }
}

deactivateAccount(): Observable<string> {
deactivateAccount(): Observable<DeactivateResponse> {
return this._http
.get(
.post<DeactivateResponse>(
environment.API_WEB + `account/send-deactivate-account.json`,
this.options
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export class HttpContentTypeHeaderInterceptor implements HttpInterceptor {
if (['POST', 'PUT'].includes(method)) {
var clonedRequest
if (this.formUrlEcondedUrls.find((x) => urlWithParams.includes(x))) {
console.log('Si es un form')
clonedRequest = req.clone({
headers: req.headers.set(
'Content-Type',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@
margin-inline-start: 27px;
}


mat-icon {
min-width: 25px;
margin-inline-end: 3px;
Expand Down
1 change: 0 additions & 1 deletion src/locale/properties/shared/shared.en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ share.sortEnd=End
share.sortDate=Date
share.sortType=Type
share.sortOrder=Order
share.sortOrder=Order
share.sortOrderv2=Publication/Grant title
shared.activities=Activities
shared.addToList=Add to list
Expand Down
2 changes: 2 additions & 0 deletions src/locale/properties/shared/shared.lr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -648,3 +648,5 @@ shared.researchSortTitle=LR
shared.researchSortDate=LR
shared.today=LR
share.more=LR
share.sortOrderv2=LR
shared.peerReviewsSortOrderv2=LR
2 changes: 2 additions & 0 deletions src/locale/properties/shared/shared.rl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -644,3 +644,5 @@ shared.researchSortTitle=RL
shared.researchSortDate=RL
shared.today=RL
share.more=RL
share.sortOrderv2=RL
shared.peerReviewsSortOrderv2=RL
2 changes: 2 additions & 0 deletions src/locale/properties/shared/shared.xx.properties
Original file line number Diff line number Diff line change
Expand Up @@ -644,3 +644,5 @@ shared.researchSortTitle=X
shared.researchSortDate=X
shared.today=X
share.more=X
share.sortOrderv2=X
shared.peerReviewsSortOrderv2=X

0 comments on commit 71a1102

Please sign in to comment.