Merge remote-tracking branch 'upstream/feature/pbs-25-24' into fix/ENG-9768

Author: nsemets

package.json

@@ -1,6 +1,6 @@
 {
   "name": "osf",
-  "version": "25.3.0",
+  "version": "25.4.0",
   "scripts": {
     "ng": "ng",
     "analyze-bundle": "ng build --configuration=analyze-bundle && source-map-explorer dist/**/*.js --no-border-checks",

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

@@ -35,22 +35,24 @@ export class AuthService {
 
   navigateToSignIn(): void {
     this.loaderService.show();
-    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login` })}`;
+    const loginUrl = `${this.casUrl}/login?${urlParam({ service: `${this.webUrl}/login`, next: window.location.href })}`;
     window.location.href = loginUrl;
   }
 
   navigateToOrcidSignIn(): void {
     const loginUrl = `${this.casUrl}/login?${urlParam({
       redirectOrcid: 'true',
-      service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
+      service: `${this.webUrl}/login`,
+      next: window.location.href,
     })}`;
     window.location.href = loginUrl;
   }
 
   navigateToInstitutionSignIn(): void {
     const loginUrl = `${this.casUrl}/login?${urlParam({
       campaign: 'institution',
-      service: `${this.webUrl}/login/?next=${encodeURIComponent(this.webUrl)}`,
+      service: `${this.webUrl}/login`,
+      next: window.location.href,
     })}`;
     window.location.href = loginUrl;
   }

src/app/features/collections/components/collections-discover/collections-discover.component.html

@@ -4,6 +4,10 @@
       class="collections-sub-header flex justify-content-between flex-column gap-4 mb-4 sm:mb-6 sm:gap-0 sm:flex-row"
     >
       <div class="flex gap-3">
+        <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?.name }}</h1>
+      </div>
+
+      <div class="flex m-auto">
         @let provider = collectionProvider();
 
         @if (provider && provider.assets) {
@@ -14,8 +18,6 @@
             [src]="provider.assets.squareColorNoTransparent"
           />
         }
-
-        <h1 class="collections-heading flex align-items-center">{{ collectionProvider()?.name }}</h1>
       </div>
 
       <p-button [routerLink]="['../add']" [label]="'common.buttons.addToCollection' | translate" />

src/app/features/contributors/contributors.component.ts

@@ -28,6 +28,7 @@ import {
   AddContributorDialogComponent,
   AddUnregisteredContributorDialogComponent,
   ContributorsTableComponent,
+  RemoveContributorDialogComponent,
   RequestAccessTableComponent,
 } from '@osf/shared/components/contributors';
 import { SearchInputComponent } from '@osf/shared/components/search-input/search-input.component';
@@ -395,26 +396,37 @@ export class ContributorsComponent implements OnInit, OnDestroy {
   removeContributor(contributor: ContributorModel) {
     const isDeletingSelf = contributor.userId === this.currentUser()?.id;
 
-    this.customConfirmationService.confirmDelete({
-      headerKey: 'project.contributors.removeDialog.title',
-      messageKey: 'project.contributors.removeDialog.message',
-      messageParams: { name: contributor.fullName },
-      acceptLabelKey: 'common.buttons.remove',
-      onConfirm: () => {
-        this.actions
-          .deleteContributor(this.resourceId(), this.resourceType(), contributor.userId, isDeletingSelf)
-          .pipe(takeUntilDestroyed(this.destroyRef))
-          .subscribe(() => {
-            this.toastService.showSuccess('project.contributors.removeDialog.successMessage', {
-              name: contributor.fullName,
-            });
+    this.customDialogService
+      .open(RemoveContributorDialogComponent, {
+        header: 'project.contributors.removeDialog.title',
+        width: '448px',
+        data: {
+          name: contributor.fullName,
+          hasChildren: !!this.resourceChildren()?.length,
+        },
+      })
+      .onClose.pipe(
+        filter((res) => res !== undefined),
+        switchMap((removeFromChildren: boolean) =>
+          this.actions.deleteContributor(
+            this.resourceId(),
+            this.resourceType(),
+            contributor.userId,
+            isDeletingSelf,
+            removeFromChildren
+          )
+        ),
+        takeUntilDestroyed(this.destroyRef)
+      )
+      .subscribe(() => {
+        this.toastService.showSuccess('project.contributors.removeDialog.successMessage', {
+          name: contributor.fullName,
+        });
 
-            if (isDeletingSelf) {
-              this.router.navigate(['/']);
-            }
-          });
-      },
-    });
+        if (isDeletingSelf) {
+          this.router.navigate(['/']);
+        }
+      });
   }
 
   loadMoreContributors(): void {

src/app/features/files/mappers/file-custom-metadata.mapper.ts

@@ -1,13 +1,14 @@
 import { ApiData } from '@osf/shared/models/common/json-api.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { FileCustomMetadata, OsfFileCustomMetadata } from '../models';
 
 export function MapFileCustomMetadata(data: ApiData<FileCustomMetadata, null, null, null>): OsfFileCustomMetadata {
   return {
     id: data.id,
-    description: data.attributes.description,
+    description: replaceBadEncodedChars(data.attributes.description),
     language: data.attributes.language,
     resourceTypeGeneral: data.attributes.resource_type_general,
-    title: data.attributes.title,
+    title: replaceBadEncodedChars(data.attributes.title),
   };
 }

src/app/features/files/mappers/resource-metadata.mapper.ts

@@ -1,5 +1,6 @@
 import { IdentifiersMapper } from '@osf/shared/mappers/identifiers.mapper';
 import { ResourceMetadata } from '@osf/shared/models/resource-metadata.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import { GetResourceCustomMetadataResponse } from '../models/get-resource-custom-metadata-response.model';
 import { GetResourceShortInfoResponse } from '../models/get-resource-short-info-response.model';
@@ -9,8 +10,8 @@ export function MapResourceMetadata(
   customMetadata: GetResourceCustomMetadataResponse
 ): ResourceMetadata {
   return {
-    title: shortInfo.data.attributes.title,
-    description: shortInfo.data.attributes.description,
+    title: replaceBadEncodedChars(shortInfo.data.attributes.title),
+    description: replaceBadEncodedChars(shortInfo.data.attributes.description),
     dateCreated: new Date(shortInfo.data.attributes.date_created),
     dateModified: new Date(shortInfo.data.attributes.date_modified),
     funders:

src/app/features/files/pages/files/files.component.html

@@ -9,21 +9,23 @@
     }
 
     <div class="flex flex-grow-0 w-full sm:w-30rem">
-      <p-select
-        inputId="in_label"
-        [options]="rootFoldersOptions()"
-        [(ngModel)]="currentRootFolder"
-        (onChange)="handleRootFolderChange($event.value)"
-        styleClass="w-full"
-        variant="filled"
-      >
-        <ng-template #selectedItem let-selectedOption>
-          <p class="provider-name">{{ selectedOption.label }}</p>
-        </ng-template>
-        <ng-template #item let-option>
-          <p class="provider-name">{{ option.label }}</p>
-        </ng-template>
-      </p-select>
+      @if (!isRegistration()) {
+        <p-select
+          inputId="in_label"
+          [options]="rootFoldersOptions()"
+          [(ngModel)]="currentRootFolder"
+          (onChange)="handleRootFolderChange($event.value)"
+          styleClass="w-full"
+          variant="filled"
+        >
+          <ng-template #selectedItem let-selectedOption>
+            <p class="provider-name">{{ selectedOption.label }}</p>
+          </ng-template>
+          <ng-template #item let-option>
+            <p class="provider-name">{{ option.label }}</p>
+          </ng-template>
+        </p-select>
+      }
     </div>
     @if (filesSelection.length) {
       @if (!isMoveDialogOpened()) {

src/app/features/files/store/files.state.ts

@@ -64,7 +64,10 @@ export class FilesState {
           isAnonymous: response.meta?.anonymous ?? false,
         });
       }),
-      catchError((error) => handleSectionError(ctx, 'files', error))
+      catchError((error) => {
+        ctx.patchState({ files: FILES_STATE_DEFAULTS.files });
+        return handleSectionError(ctx, 'files', error);
+      })
     );
   }
 

src/app/features/meetings/mappers/meetings.mapper.ts

@@ -1,4 +1,5 @@
 import { ResponseJsonApi } from '@osf/shared/models/common/json-api.model';
+import { replaceBadEncodedChars } from '@shared/helpers/format-bad-encoding.helper';
 
 import {
   MeetingGetResponseJsonApi,
@@ -28,7 +29,7 @@ export class MeetingsMapper {
     return {
       data: response.data.map((item) => ({
         id: item.id,
-        title: item.attributes.title,
+        title: replaceBadEncodedChars(item.attributes.title),
         dateCreated: item.attributes.date_created,
         authorName: item.attributes.author_name,
         downloadCount: item.attributes.download_count || 0,

src/app/features/metadata/components/metadata-description/metadata-description.component.html

@@ -13,6 +13,6 @@ <h2>{{ 'project.overview.metadata.description' | translate }}</h2>
   </div>
 
   <p data-test-display-node-description class="mt-4">
-    {{ (description() | fixSpecialChar) || ('project.overview.metadata.noDescription' | translate) }}
+    {{ description() || ('project.overview.metadata.noDescription' | translate) }}
   </p>
 </p-card>