Fix/env updates

jest.config.js

@@ -58,6 +58,7 @@ module.exports = {
     '<rootDir>/src/@types/',
   ],
   testPathIgnorePatterns: [
+    '<rootDir>/src/environments',
     '<rootDir>/src/app/app.config.ts',
     '<rootDir>/src/app/app.routes.ts',
     '<rootDir>/src/app/features/files/components',

src/app/core/components/forbidden-page/forbidden-page.component.ts

@@ -1,8 +1,8 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
-import { environment } from 'src/environments/environment';
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 @Component({
   selector: 'osf-forbidden-page',
@@ -12,5 +12,6 @@ import { environment } from 'src/environments/environment';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ForbiddenPageComponent {
-  readonly supportEmail = environment.supportEmail;
+  private readonly environment = inject(ENVIRONMENT);
+  readonly supportEmail = this.environment.supportEmail;
 }

src/app/core/components/page-not-found/page-not-found.component.ts

@@ -1,8 +1,8 @@
 import { TranslatePipe } from '@ngx-translate/core';
 
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 
-import { environment } from 'src/environments/environment';
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 
 @Component({
   selector: 'osf-page-not-found',
@@ -12,5 +12,6 @@ import { environment } from 'src/environments/environment';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class PageNotFoundComponent {
-  readonly supportEmail = environment.supportEmail;
+  private readonly environment = inject(ENVIRONMENT);
+  readonly supportEmail = this.environment.supportEmail;
 }

src/app/core/components/request-access/request-access.component.ts

@@ -11,12 +11,11 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { AuthService, RequestAccessService } from '@osf/core/services';
 import { InputLimits } from '@osf/shared/constants';
 import { LoaderService, ToastService } from '@osf/shared/services';
 
-import { environment } from 'src/environments/environment';
-
 @Component({
   selector: 'osf-request-access',
   imports: [TranslatePipe, Button, Textarea, FormsModule],
@@ -27,7 +26,8 @@ import { environment } from 'src/environments/environment';
 export class RequestAccessComponent {
   comment = model('');
 
-  readonly supportEmail = environment.supportEmail;
+  private readonly environment = inject(ENVIRONMENT);
+  readonly supportEmail = this.environment.supportEmail;
   readonly commentLimit = InputLimits.requestAccessComment.maxLength;
 
   private readonly route = inject(ActivatedRoute);

src/app/core/components/sidenav/sidenav.component.html

@@ -1,4 +1,4 @@
 <aside class="custom-scrollbar flex flex-column p-4 h-full">
-  <img ngSrc="assets/images/logo.svg" alt="OSF Logo" height="36" width="106" />
+  <img ngSrc="assets/images/logo.svg" alt="OSF Logo" height="36" width="106" priority />
   <osf-nav-menu class="mt-5" />
 </aside>

src/app/core/services/auth.service.ts

@@ -4,41 +4,42 @@ import { CookieService } from 'ngx-cookie-service';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ClearCurrentUser } from '@osf/core/store/user';
 import { urlParam } from '@osf/shared/helpers';
 import { JsonApiService, LoaderService } from '@osf/shared/services';
 
 import { SignUpModel } from '../models';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class AuthService {
   private readonly jsonApiService = inject(JsonApiService);
   private readonly cookieService = inject(CookieService);
   private readonly loaderService = inject(LoaderService);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2/users/`;
-  private readonly webUrl = environment.webUrl;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2/users/`;
+  private readonly webUrl = this.environment.webUrl;
+  private readonly casUrl = this.environment.casUrl;
   private readonly actions = createDispatchMap({ clearCurrentUser: ClearCurrentUser });
 
   navigateToSignIn(): void {
     this.loaderService.show();
-    const loginUrl = `${environment.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;
+    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;
     window.location.href = loginUrl;
   }
 
   navigateToOrcidSingIn(): void {
-    const loginUrl = `${environment.casUrl}/login?${urlParam({
+    const loginUrl = `${this.casUrl}/login?${urlParam({
       redirectOrcid: 'true',
       service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
     })}`;
     window.location.href = loginUrl;
   }
 
   navigateToInstitutionSignIn(): void {
-    const loginUrl = `${environment.casUrl}/login?${urlParam({
+    const loginUrl = `${this.casUrl}/login?${urlParam({
       campaign: 'institution',
       service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
     })}`;

src/app/core/services/maintenance.service.ts

@@ -4,14 +4,15 @@ import { map } from 'rxjs/operators';
 import { HttpClient } from '@angular/common/http';
 import { inject, Injectable } from '@angular/core';
 
-import { Maintenance, MaintenanceSeverity } from '../models/maintenance.model';
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 
-import { environment } from 'src/environments/environment';
+import { Maintenance, MaintenanceSeverity } from '../models/maintenance.model';
 
 @Injectable({ providedIn: 'root' })
 export class MaintenanceService {
   private readonly http = inject(HttpClient);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
 
   fetchMaintenanceStatus(): Observable<Maintenance | null> {
     return this.http.get<{ maintenance?: Maintenance }>(`${this.apiUrl}/status/`).pipe(

src/app/core/services/request-access.service.ts

@@ -2,16 +2,16 @@ import { Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { JsonApiService } from '@osf/shared/services';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class RequestAccessService {
   private readonly jsonApiService = inject(JsonApiService);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
 
   requestAccessToProject(projectId: string, comment = ''): Observable<void> {
     const payload = {

src/app/core/services/user-emails.service.ts

@@ -2,18 +2,18 @@ import { map, Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { MapEmail, MapEmails } from '@osf/shared/mappers';
 import { AccountEmailModel, EmailResponseJsonApi, EmailsDataJsonApi, EmailsResponseJsonApi } from '@osf/shared/models';
 import { JsonApiService } from '@osf/shared/services';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class UserEmailsService {
   private readonly jsonApiService = inject(JsonApiService);
-  private readonly baseUrl = `${environment.apiDomainUrl}/v2/users`;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly baseUrl = `${this.environment.apiDomainUrl}/v2/users`;
 
   getEmails(): Observable<AccountEmailModel[]> {
     const params: Record<string, string> = {

src/app/core/services/user.service.ts

@@ -2,6 +2,7 @@ import { map, Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ProfileSettingsKey } from '@osf/shared/enums';
 import { UserMapper } from '@osf/shared/mappers';
 import {
@@ -18,14 +19,13 @@ import {
 } from '@osf/shared/models';
 import { JsonApiService } from '@shared/services';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class UserService {
   private readonly jsonApiService = inject(JsonApiService);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
 
   getUserById(userId: string): Observable<User> {
     return this.jsonApiService

src/app/features/admin-institutions/mappers/institution-user-to-table-data.mapper.ts

@@ -1,15 +1,13 @@
 import { InstitutionUser, TableCellData } from '../models';
 
-import { environment } from 'src/environments/environment';
-
-export function mapUserToTableCellData(user: InstitutionUser): TableCellData {
+export function mapUserToTableCellData(user: InstitutionUser, webUrl: string): TableCellData {
   return {
     id: user.id,
     userName: user.userName || '-',
     department: user.department || '-',
     userLink: {
       text: user.userId,
-      url: `${environment.webUrl}/${user.userId}`,
+      url: `${webUrl}/${user.userId}`,
     },
     orcidId: user.orcidId
       ? {

src/app/features/admin-institutions/pages/institutions-users/institutions-users.component.ts

@@ -12,6 +12,7 @@ import { ChangeDetectionStrategy, Component, computed, DestroyRef, effect, injec
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { UserSelectors } from '@osf/core/store/user';
 import { SelectComponent } from '@osf/shared/components';
 import { DEFAULT_TABLE_PARAMS } from '@osf/shared/constants';
@@ -42,6 +43,7 @@ export class InstitutionsUsersComponent {
   private readonly dialogService = inject(DialogService);
   private readonly destroyRef = inject(DestroyRef);
   private readonly toastService = inject(ToastService);
+  private readonly environment = inject(ENVIRONMENT);
 
   private readonly actions = createDispatchMap({
     fetchInstitutionUsers: FetchInstitutionUsers,
@@ -68,7 +70,9 @@ export class InstitutionsUsersComponent {
 
   currentUser = select(UserSelectors.getCurrentUser);
 
-  tableData = computed(() => this.users().map((user: InstitutionUser): TableCellData => mapUserToTableCellData(user)));
+  tableData = computed(() =>
+    this.users().map((user: InstitutionUser): TableCellData => mapUserToTableCellData(user, this.environment.webUrl))
+  );
 
   amountText = computed(() => {
     const count = this.totalCount();

src/app/features/admin-institutions/services/institutions-admin.service.ts

@@ -3,6 +3,7 @@ import { map } from 'rxjs/operators';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { JsonApiService } from '@shared/services';
 
 import {
@@ -27,15 +28,14 @@ import {
   SendMessageResponseJsonApi,
 } from '../models';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class InstitutionsAdminService {
-  private jsonApiService = inject(JsonApiService);
-  private apiUrl = `${environment.apiDomainUrl}/v2`;
-  private shareTroveUrl = environment.shareTroveUrl;
+  private readonly jsonApiService = inject(JsonApiService);
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
+  private readonly shareTroveUrl = this.environment.shareTroveUrl;
 
   fetchDepartments(institutionId: string): Observable<InstitutionDepartment[]> {
     return this.jsonApiService

src/app/features/analytics/services/analytics.service.ts

@@ -2,21 +2,21 @@ import { map, Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { ResourceType } from '@osf/shared/enums';
 import { JsonApiResponse } from '@osf/shared/models';
 import { JsonApiService } from '@osf/shared/services';
 
 import { AnalyticsMetricsMapper, RelatedCountsMapper } from '../mappers';
 import { AnalyticsMetricsGetResponse, AnalyticsMetricsModel, RelatedCountsGetResponse } from '../models';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class AnalyticsService {
   private readonly jsonApiService = inject(JsonApiService);
-  private readonly apiDomainUrl = environment.apiDomainUrl;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiDomainUrl = this.environment.apiDomainUrl;
 
   private readonly urlMap = new Map<ResourceType, string>([
     [ResourceType.Project, 'nodes'],

src/app/features/auth/pages/sign-up/sign-up.component.ts

@@ -12,6 +12,7 @@ import { Component, inject, OnInit, signal } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 import { RouterLink } from '@angular/router';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { SignUpModel } from '@osf/core/models';
 import { AuthService } from '@osf/core/services';
 import { PasswordInputHintComponent, TextInputComponent } from '@osf/shared/components';
@@ -21,8 +22,6 @@ import { ToastService } from '@osf/shared/services';
 
 import { SignUpForm } from '../../models';
 
-import { environment } from 'src/environments/environment';
-
 @Component({
   selector: 'osf-sign-up',
   imports: [
@@ -45,13 +44,14 @@ import { environment } from 'src/environments/environment';
 export class SignUpComponent implements OnInit {
   private readonly authService = inject(AuthService);
   private readonly toastService = inject(ToastService);
+  private readonly environment = inject(ENVIRONMENT);
 
   signUpForm = new FormGroup<SignUpForm>({} as SignUpForm);
   passwordRegex: RegExp = PASSWORD_REGEX;
   inputLimits = InputLimits;
   isFormSubmitted = signal(false);
 
-  readonly siteKey = environment.recaptchaSiteKey;
+  readonly siteKey = this.environment.recaptchaSiteKey;
 
   get isPasswordError() {
     return this.signUpForm.controls['password'].errors && this.signUpForm.get('password')?.touched;

src/app/features/collections/services/add-to-collection.service.ts

@@ -2,18 +2,18 @@ import { map, Observable } from 'rxjs';
 
 import { inject, Injectable } from '@angular/core';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { CollectionsMapper, LicensesMapper } from '@shared/mappers';
 import { CollectionSubmissionPayload, LicenseModel, LicensesResponseJsonApi } from '@shared/models';
 import { JsonApiService } from '@shared/services';
 
-import { environment } from 'src/environments/environment';
-
 @Injectable({
   providedIn: 'root',
 })
 export class AddToCollectionService {
   private readonly jsonApiService = inject(JsonApiService);
-  private readonly apiUrl = `${environment.apiDomainUrl}/v2`;
+  private readonly environment = inject(ENVIRONMENT);
+  private readonly apiUrl = `${this.environment.apiDomainUrl}/v2`;
 
   fetchCollectionLicenses(providerId: string): Observable<LicenseModel[]> {
     return this.jsonApiService

src/app/features/files/components/file-metadata/file-metadata.component.ts

@@ -12,6 +12,7 @@ import { ChangeDetectionStrategy, Component, computed, inject } from '@angular/c
 import { toSignal } from '@angular/core/rxjs-interop';
 import { ActivatedRoute, Router } from '@angular/router';
 
+import { ENVIRONMENT } from '@core/provider/environment.provider';
 import { languageCodes } from '@osf/shared/constants';
 import { hasViewOnlyParam } from '@osf/shared/helpers';
 import { LanguageCodeModel } from '@osf/shared/models';
@@ -21,8 +22,6 @@ import { PatchFileMetadata } from '../../models';
 import { FilesSelectors, SetFileMetadata } from '../../store';
 import { EditFileMetadataDialogComponent } from '../edit-file-metadata-dialog/edit-file-metadata-dialog.component';
 
-import { environment } from 'src/environments/environment';
-
 @Component({
   selector: 'osf-file-metadata',
   imports: [Button, Skeleton, TranslatePipe],
@@ -37,6 +36,7 @@ export class FileMetadataComponent {
   private readonly router = inject(Router);
   private readonly dialogService = inject(DialogService);
   private readonly translateService = inject(TranslateService);
+  private readonly environment = inject(ENVIRONMENT);
 
   fileMetadata = select(FilesSelectors.getFileCustomMetadata);
   isLoading = select(FilesSelectors.isFileMetadataLoading);
@@ -58,7 +58,7 @@ export class FileMetadataComponent {
 
   downloadFileMetadata(): void {
     if (this.fileGuid()) {
-      window.open(`${environment.webUrl}/${this.fileGuid()}/metadata/?format=datacite-json`)?.focus();
+      window.open(`${this.environment.webUrl}/${this.fileGuid()}/metadata/?format=datacite-json`)?.focus();
     }
   }