Skip to content

Commit df9155d

Browse files
authored
Cleanup httpResource usage and apply security update (#254)
1 parent 96533f1 commit df9155d

File tree

16 files changed

+143
-221
lines changed

16 files changed

+143
-221
lines changed

.devcontainer/dev_install

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
cd /workspace
55

66
echo "Install pnpm..."
7-
corepack prepare pnpm@10.25.0 --activate
7+
corepack prepare pnpm@10.26.0 --activate
88

99
echo "Add Markdown TOC generator for updating the Readme"
1010
npm install -g markdown-toc-gen

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apk upgrade --no-cache --available
66
FROM base AS builder
77
# install pnpm
88
RUN npm install --global corepack@0.32.0
9-
RUN corepack prepare pnpm@10.25.0 --activate
9+
RUN corepack prepare pnpm@10.26.0 --activate
1010
# install static web server
1111
RUN apk add curl jq sudo which
1212
RUN curl --proto '=https' --tlsv1.2 -sSfL https://get.static-web-server.net | sed "s/cp -ax/cp -a/g" | sh

package.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "data-portal",
3-
"version": "2.3.0",
3+
"version": "2.3.1",
44
"scripts": {
55
"ng": "ng",
66
"start": "ng serve",
@@ -23,9 +23,14 @@
2323
"compodoc:serve": "compodoc -s",
2424
"toc": "markdown-toc-gen update README.md"
2525
},
26-
"packageManager": "pnpm@10.25.0",
26+
"packageManager": "pnpm@10.26.0",
2727
"type": "module",
2828
"private": true,
29+
"pnpm": {
30+
"overrides": {
31+
"glob": "^13.0.0"
32+
}
33+
},
2934
"dependencies": {
3035
"@angular/animations": "^21.0.5",
3136
"@angular/cdk": "^21.0.3",
@@ -82,7 +87,7 @@
8287
"tailwindcss": "^4.1.18",
8388
"ts-node": "^10.9.2",
8489
"typescript": "~5.9.3",
85-
"typescript-eslint": "^8.49.0",
90+
"typescript-eslint": "^8.50.0",
8691
"vitest": "^4.0.15"
8792
},
8893
"msw": {

pnpm-lock.yaml

Lines changed: 99 additions & 175 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/access-requests/features/access-request-manager-detail/access-request-manager-detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ <h1>Access Request Details</h1>
292292
</div>
293293
}
294294
</div>
295-
} @else if (loading()) {
295+
} @else if (isLoading()) {
296296
<p>Loading request details...</p>
297297
} @else {
298298
<div class="container mx-auto p-6">

src/app/access-requests/features/access-request-manager-detail/access-request-manager-detail.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export class AccessRequestManagerDetailComponent implements OnInit, HasPendingEd
101101
(this.#request.error() ? undefined : this.#request.value()),
102102
);
103103

104-
loading = computed<boolean>(
104+
isLoading = computed<boolean>(
105105
() => !this.#cachedRequest() && this.#request.isLoading(),
106106
);
107107

src/app/auth/features/user-manager-detail/user-manager-detail.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ <h2 class="mb-4 font-semibold">Account Details</h2>
250250
}
251251
</mat-card-content>
252252
</mat-card>
253-
} @else if (loading()) {
253+
} @else if (isLoading()) {
254254
<p>Loading user details...</p>
255255
} @else {
256256
<div class="container mx-auto p-6">

src/app/auth/features/user-manager-detail/user-manager-detail.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ export class UserManagerDetailComponent implements OnInit {
8686
() => this.#cachedUser() || (this.#user.error() ? undefined : this.#user.value()),
8787
);
8888

89-
loading = computed<boolean>(() => !this.#cachedUser() && this.#user.isLoading());
89+
isLoading = computed<boolean>(() => !this.#cachedUser() && this.#user.isLoading());
9090

9191
error = computed<undefined | 'not found' | 'other'>(() => {
9292
if (this.#cachedUser()) return undefined;

src/app/metadata/features/metadata-browser-filter/metadata-browser-filter.spec.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,9 @@ import { MetadataBrowserFilterComponent } from './metadata-browser-filter';
1919
* Mock the metadata service as needed for the metadata browser filter
2020
*/
2121
class MockMetadataSearchService {
22-
searchResultsResource = {
23-
value: () => searchResults,
24-
isLoading: () => false,
25-
error: () => undefined,
26-
};
2722
searchResults = () => searchResults;
2823
isLoading = () => false;
24+
error = () => undefined;
2925
searchResultsLimit = () => 10;
3026
searchResultsSkip = () => 0;
3127
paginated = () => false;

src/app/metadata/features/metadata-browser-filter/metadata-browser-filter.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@ export class MetadataBrowserFilterComponent implements OnInit {
5959
#route = inject(ActivatedRoute);
6060
#router = inject(Router);
6161
#metadataSearch = inject(MetadataSearchService);
62-
#searchResults = this.#metadataSearch.searchResultsResource;
63-
#facetResults = computed(() =>
64-
this.#searchResults.error() ? [] : this.#searchResults.value().facets,
65-
);
62+
63+
protected searchResults = this.#metadataSearch.searchResults;
64+
protected isLoading = this.#metadataSearch.isLoading;
65+
#error = this.#metadataSearch.error;
66+
#facetResults = computed(() => this.searchResults()?.facets || []);
6667
protected facets = signal<Facet[]>([]);
67-
readonly isLoading = computed(() => this.#metadataSearch.isLoading);
6868
pageSize = computed(() => this.#metadataSearch.searchResultsLimit());
6969
#skip = computed(() => this.#metadataSearch.searchResultsSkip());
7070
#currentFacet: string | null | undefined;
@@ -111,7 +111,7 @@ export class MetadataBrowserFilterComponent implements OnInit {
111111
});
112112

113113
#deferredFacetUpdateEffect = effect(() => {
114-
if (!this.#searchResults.error() && !this.#searchResults.isLoading()) {
114+
if (!this.#error() && !this.isLoading()) {
115115
this.#updateFacetDeferred();
116116
}
117117
});

0 commit comments

Comments
 (0)