Skip to content

Commit fb70b58

Browse files
authored
Merge pull request DSpace#3132 from tdonohue/update_latest_ang_17
Bump Angular to 17.3.11 and Angular-CLI to 17.3.8
2 parents ca61647 + 55eff73 commit fb70b58

3 files changed

Lines changed: 333 additions & 311 deletions

File tree

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@
6161
"ts-node": "10.2.1"
6262
},
6363
"dependencies": {
64-
"@angular/animations": "^17.3.4",
65-
"@angular/cdk": "^17.3.4",
66-
"@angular/common": "^17.3.4",
67-
"@angular/compiler": "^17.3.4",
68-
"@angular/core": "^17.3.4",
69-
"@angular/forms": "^17.3.4",
70-
"@angular/localize": "17.3.4",
71-
"@angular/platform-browser": "^17.3.4",
72-
"@angular/platform-browser-dynamic": "^17.3.4",
73-
"@angular/platform-server": "^17.3.4",
74-
"@angular/router": "^17.3.4",
75-
"@angular/ssr": "^17.3.0",
64+
"@angular/animations": "^17.3.11",
65+
"@angular/cdk": "^17.3.10",
66+
"@angular/common": "^17.3.11",
67+
"@angular/compiler": "^17.3.11",
68+
"@angular/core": "^17.3.11",
69+
"@angular/forms": "^17.3.11",
70+
"@angular/localize": "17.3.11",
71+
"@angular/platform-browser": "^17.3.11",
72+
"@angular/platform-browser-dynamic": "^17.3.11",
73+
"@angular/platform-server": "^17.3.11",
74+
"@angular/router": "^17.3.11",
75+
"@angular/ssr": "^17.3.8",
7676
"@babel/runtime": "7.21.0",
7777
"@kolkov/ngx-gallery": "^2.0.1",
7878
"@material-ui/core": "^4.11.0",
@@ -139,17 +139,17 @@
139139
"zone.js": "~0.14.4"
140140
},
141141
"devDependencies": {
142-
"@angular-builders/custom-webpack": "~17.0.1",
143-
"@angular-devkit/build-angular": "^17.3.0",
142+
"@angular-builders/custom-webpack": "~17.0.2",
143+
"@angular-devkit/build-angular": "^17.3.8",
144144
"@angular-eslint/builder": "17.2.1",
145145
"@angular-eslint/bundled-angular-compiler": "17.2.1",
146146
"@angular-eslint/eslint-plugin": "17.2.1",
147147
"@angular-eslint/eslint-plugin-template": "17.2.1",
148148
"@angular-eslint/schematics": "17.2.1",
149149
"@angular-eslint/template-parser": "17.2.1",
150-
"@angular/cli": "^17.3.0",
151-
"@angular/compiler-cli": "^17.3.4",
152-
"@angular/language-service": "^17.3.4",
150+
"@angular/cli": "^17.3.8",
151+
"@angular/compiler-cli": "^17.3.11",
152+
"@angular/language-service": "^17.3.11",
153153
"@cypress/schematic": "^1.5.0",
154154
"@fortawesome/fontawesome-free": "^6.4.0",
155155
"@ngrx/store-devtools": "^17.1.1",
@@ -213,9 +213,9 @@
213213
"sass-resources-loader": "^2.2.5",
214214
"ts-node": "^8.10.2",
215215
"typescript": "~5.3.3",
216-
"webpack": "5.76.1",
216+
"webpack": "5.90.3",
217217
"webpack-bundle-analyzer": "^4.8.0",
218-
"webpack-cli": "^4.2.0",
219-
"webpack-dev-server": "^4.13.3"
218+
"webpack-cli": "^5.1.4",
219+
"webpack-dev-server": "^4.15.1"
220220
}
221221
}

src/app/notifications/suggestion-targets/suggestion-targets.effects.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import {
1919
RetrieveAuthenticatedEpersonSuccessAction,
2020
} from '../../core/auth/auth.actions';
2121
import { PaginatedList } from '../../core/data/paginated-list.model';
22-
import { EPerson } from '../../core/eperson/models/eperson.model';
2322
import { SuggestionTarget } from '../../core/notifications/suggestions/models/suggestion-target.model';
2423
import { NotificationsService } from '../../shared/notifications/notifications.service';
2524
import { SuggestionsService } from '../suggestions.service';
@@ -89,10 +88,10 @@ export class SuggestionTargetsEffects {
8988
refreshUserSuggestionsAction$ = createEffect(() => this.actions$.pipe(
9089
ofType(SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS),
9190
switchMap(() => {
92-
return this.store$.select((state: any) => state.core.auth.user)
91+
return this.store$.select((state: any) => state.core.auth.userId)
9392
.pipe(
94-
switchMap((user: EPerson) => {
95-
return this.suggestionsService.retrieveCurrentUserSuggestions(user.uuid)
93+
switchMap((userId: string) => {
94+
return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
9695
.pipe(
9796
map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
9897
catchError((error: unknown) => {

0 commit comments

Comments
 (0)