fix(resources): fixed some code

Author: nsemets

src/app/features/moderation/models/moderator-json-api.model.ts

@@ -27,14 +27,4 @@ export interface ModeratorAddRequestModel {
     full_name?: string;
     email?: string;
   };
-  // relationships: {
-  //   users?: {
-  //     data?: RelationshipUsersData;
-  //   };
-  // };
-}
-
-interface RelationshipUsersData {
-  id?: string;
-  type?: 'users';
 }

src/app/features/registry/components/add-resource-dialog/add-resource-dialog.component.ts

@@ -8,39 +8,23 @@ import { DynamicDialogConfig, DynamicDialogRef } from 'primeng/dynamicdialog';
 import { finalize, take } from 'rxjs';
 
 import { ChangeDetectionStrategy, Component, inject, signal } from '@angular/core';
-import {
-  AbstractControl,
-  FormControl,
-  FormGroup,
-  ReactiveFormsModule,
-  ValidationErrors,
-  ValidatorFn,
-  Validators,
-} from '@angular/forms';
-
-import { ResourceFormComponent } from '@osf/features/registry/components';
-import { resourceTypeOptions } from '@osf/features/registry/constants';
-import { AddResource } from '@osf/features/registry/models/resources/add-resource.model';
-import { ConfirmAddResource } from '@osf/features/registry/models/resources/confirm-add-resource.model';
+import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
+
+import { LoadingSpinnerComponent } from '@osf/shared/components';
+import { InputLimits } from '@osf/shared/constants';
+import { RegistryResourceType } from '@osf/shared/enums';
+import { SelectOption } from '@osf/shared/models';
+import { CustomValidators } from '@osf/shared/utils';
+
+import { resourceTypeOptions } from '../../constants';
+import { AddResource, ConfirmAddResource } from '../../models';
 import {
   ConfirmAddRegistryResource,
   PreviewRegistryResource,
   RegistryResourcesSelectors,
   SilentDelete,
-} from '@osf/features/registry/store/registry-resources';
-import { LoadingSpinnerComponent } from '@shared/components';
-import { InputLimits } from '@shared/constants';
-import { RegistryResourceType } from '@shared/enums';
-import { SelectOption } from '@shared/models';
-
-export const doiValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
-  const value = control.value;
-  if (!value) return null;
-
-  const DOIRegex = /\b(10\.\d{4,}(?:\.\d+)*\/\S+(?:(?!["&'<>])\S))\b/; // value for example: 10.1234/abcd1234 or https://doi.org/10.1234/abcd1234
-  const isValid = DOIRegex.test(value);
-  return isValid ? null : { invalidDoi: true };
-};
+} from '../../store/registry-resources';
+import { ResourceFormComponent } from '../resource-form/resource-form.component';
 
 @Component({
   selector: 'osf-add-resource-dialog',
@@ -62,7 +46,7 @@ export class AddResourceDialogComponent {
   protected isResourceConfirming = signal(false);
 
   protected form = new FormGroup({
-    pid: new FormControl<string | null>('', [Validators.required, doiValidator]),
+    pid: new FormControl<string | null>('', [CustomValidators.requiredTrimmed(), CustomValidators.doiValidator]),
     resourceType: new FormControl<string | null>('', [Validators.required]),
     description: new FormControl<string | null>(''),
   });

src/app/features/registry/components/edit-resource-dialog/edit-resource-dialog.component.ts

@@ -9,12 +9,12 @@ import { finalize, take } from 'rxjs';
 import { ChangeDetectionStrategy, Component, inject } from '@angular/core';
 import { FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
 
-import { doiValidator } from '@osf/features/registry/components';
-import { ResourceFormComponent } from '@osf/features/registry/components/resource-form/resource-form.component';
-import { RegistryResource } from '@osf/features/registry/models';
-import { AddResource } from '@osf/features/registry/models/resources/add-resource.model';
-import { RegistryResourcesSelectors, UpdateResource } from '@osf/features/registry/store/registry-resources';
-import { LoadingSpinnerComponent } from '@shared/components';
+import { LoadingSpinnerComponent } from '@osf/shared/components';
+import { CustomValidators } from '@osf/shared/utils';
+
+import { AddResource, RegistryResource } from '../../models';
+import { RegistryResourcesSelectors, UpdateResource } from '../../store/registry-resources';
+import { ResourceFormComponent } from '../resource-form/resource-form.component';
 
 @Component({
   selector: 'osf-edit-resource-dialog',
@@ -33,7 +33,7 @@ export class EditResourceDialogComponent {
   private resource: RegistryResource = this.dialogConfig.data.resource as RegistryResource;
 
   protected form = new FormGroup({
-    pid: new FormControl<string | null>('', [Validators.required, doiValidator]),
+    pid: new FormControl<string | null>('', [CustomValidators.requiredTrimmed(), CustomValidators.doiValidator]),
     resourceType: new FormControl<string | null>('', [Validators.required]),
     description: new FormControl<string | null>(''),
   });

src/app/features/registry/components/resource-form/resource-form.component.html

@@ -32,6 +32,11 @@
         (click)="handleCancel()"
       />
     }
-    <p-button class="btn-full-width" [label]="primaryButtonLabel() | translate" (onClick)="handleSubmit()" />
+    <p-button
+      class="btn-full-width"
+      [label]="primaryButtonLabel() | translate"
+      (onClick)="handleSubmit()"
+      [disabled]="formGroup().invalid"
+    />
   </div>
 </form>

src/app/features/registry/pages/registry-metadata-add/registry-metadata-add.component.spec.ts

@@ -3,7 +3,7 @@ import { provideStore, Store } from '@ngxs/store';
 import { TranslatePipe } from '@ngx-translate/core';
 import { MockComponent, MockPipe } from 'ng-mocks';
 
-import { of, throwError } from 'rxjs';
+import { of } from 'rxjs';
 
 import { provideHttpClient } from '@angular/common/http';
 import { provideHttpClientTesting } from '@angular/common/http/testing';
@@ -400,8 +400,7 @@ describe('RegistryMetadataAddComponent', () => {
     });
 
     it('should successfully create cedar record', () => {
-      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(of({}));
-      const routerSpy = jest.spyOn(router, 'navigate');
+      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(of());
 
       store.reset({
         registryMetadata: {
@@ -422,7 +421,6 @@ describe('RegistryMetadataAddComponent', () => {
 
     it('should handle submission success', (done) => {
       const routerSpy = jest.spyOn(router, 'navigate');
-      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(of({}));
 
       store.reset({
         registryMetadata: {
@@ -436,7 +434,6 @@ describe('RegistryMetadataAddComponent', () => {
 
       component.onSubmit(mockSubmissionData);
 
-      // Use setTimeout to allow the subscription to complete
       setTimeout(() => {
         expect(component.isSubmitting()).toBe(false);
         expect(toastService.showSuccess).toHaveBeenCalledWith(
@@ -450,11 +447,8 @@ describe('RegistryMetadataAddComponent', () => {
     });
 
     it('should handle submission error', (done) => {
-      const dispatchSpy = jest.spyOn(store, 'dispatch').mockReturnValue(throwError(() => new Error('Test error')));
-
       component.onSubmit(mockSubmissionData);
 
-      // Use setTimeout to allow the subscription to complete
       setTimeout(() => {
         expect(component.isSubmitting()).toBe(false);
         expect(toastService.showError).toHaveBeenCalledWith('project.overview.metadata.failedToCreateCedarRecord');

src/app/shared/utils/custom-form-validators.helper.ts

@@ -62,4 +62,13 @@ export class CustomValidators {
 
     return endDate > startDate ? null : { dateRangeInvalid: true };
   };
+
+  static doiValidator: ValidatorFn = (control: AbstractControl): ValidationErrors | null => {
+    const value = control.value;
+    if (!value) return null;
+
+    const DOIRegex = /\b(10\.\d{4,}(?:\.\d+)*\/\S+(?:(?!["&'<>])\S))\b/;
+    const isValid = DOIRegex.test(value);
+    return isValid ? null : { invalidDoi: true };
+  };
 }