fix(my-registrations): fixed my registrations

Author: nsemets

src/app/features/registries/pages/my-registrations/my-registrations.component.html

@@ -1,4 +1,4 @@
-<section class="flex flex-column flex-1 xl:mt-6">
+<section class="flex flex-column flex-1 h-full xl:mt-6">
   <div class="flex flex-column align-items-start">
     <osf-sub-header
       [title]="'navigation.registriesSubRoutes.myRegistrations' | translate"
@@ -32,7 +32,7 @@
         <p-tabpanel [value]="RegistrationTab.Drafts" class="flex flex-column gap-4 flex-1">
           @if (isDraftRegistrationsLoading()) {
             @for (item of skeletons; track $index) {
-              <p-skeleton width="100%" height="1.5rem" borderRadius="0" />
+              <p-skeleton width="100%" height="21.5rem" borderRadius="0.5rem" />
             }
           } @else {
             @if (draftRegistrationsTotalCount() === 0) {
@@ -58,7 +58,7 @@
         <p-tabpanel [value]="RegistrationTab.Submitted" class="flex flex-column gap-4 flex-1">
           @if (isSubmittedRegistrationsLoading()) {
             @for (item of skeletons; track $index) {
-              <p-skeleton width="100%" height="2rem" />
+              <p-skeleton width="100%" height="21.5rem" borderRadius="0.5rem" />
             }
           } @else {
             @if (submittedRegistrationsTotalCount() === 0) {
@@ -91,8 +91,7 @@
     <p-button
       class="mt-3"
       [label]="'registries.addRegistration' | translate"
-      [routerLink]="[`../${provider}/new`]"
-      routerLinkActive="router-link-active"
+      [routerLink]="['/registries', provider, 'new']"
     >
     </p-button>
   </div>

src/app/features/registries/pages/my-registrations/my-registrations.component.ts

@@ -15,13 +15,17 @@ import { toSignal } from '@angular/core/rxjs-interop';
 import { FormsModule } from '@angular/forms';
 import { ActivatedRoute, Router, RouterLink } from '@angular/router';
 
-import { UserSelectors } from '@osf/core/store/user';
-import { CustomPaginatorComponent, SelectComponent, SubHeaderComponent } from '@osf/shared/components';
-import { RegistrationCardComponent } from '@osf/shared/components/registration-card/registration-card.component';
+import { UserSelectors } from '@core/store/user';
+import {
+  CustomPaginatorComponent,
+  RegistrationCardComponent,
+  SelectComponent,
+  SubHeaderComponent,
+} from '@osf/shared/components';
 import { IS_XSMALL } from '@osf/shared/helpers';
 import { CustomConfirmationService, ToastService } from '@osf/shared/services';
 
-import { REGISTRATIONS_TABS } from '../../constants/registrations-tabs';
+import { REGISTRATIONS_TABS } from '../../constants';
 import { RegistrationTab } from '../../enums';
 import {
   CreateSchemaResponse,
@@ -60,27 +64,27 @@ export class MyRegistrationsComponent {
   private readonly customConfirmationService = inject(CustomConfirmationService);
   private readonly toastService = inject(ToastService);
 
-  protected readonly isMobile = toSignal(inject(IS_XSMALL));
-  protected readonly tabOptions = REGISTRATIONS_TABS;
+  readonly isMobile = toSignal(inject(IS_XSMALL));
+  readonly tabOptions = REGISTRATIONS_TABS;
 
   private currentUser = select(UserSelectors.getCurrentUser);
-  protected draftRegistrations = select(RegistriesSelectors.getDraftRegistrations);
-  protected draftRegistrationsTotalCount = select(RegistriesSelectors.getDraftRegistrationsTotalCount);
-  protected isDraftRegistrationsLoading = select(RegistriesSelectors.isDraftRegistrationsLoading);
-  protected submittedRegistrations = select(RegistriesSelectors.getSubmittedRegistrations);
-  protected submittedRegistrationsTotalCount = select(RegistriesSelectors.getSubmittedRegistrationsTotalCount);
-  protected isSubmittedRegistrationsLoading = select(RegistriesSelectors.isSubmittedRegistrationsLoading);
-  protected schemaResponse = select(RegistriesSelectors.getSchemaResponse);
-
-  protected actions = createDispatchMap({
+  draftRegistrations = select(RegistriesSelectors.getDraftRegistrations);
+  draftRegistrationsTotalCount = select(RegistriesSelectors.getDraftRegistrationsTotalCount);
+  isDraftRegistrationsLoading = select(RegistriesSelectors.isDraftRegistrationsLoading);
+  submittedRegistrations = select(RegistriesSelectors.getSubmittedRegistrations);
+  submittedRegistrationsTotalCount = select(RegistriesSelectors.getSubmittedRegistrationsTotalCount);
+  isSubmittedRegistrationsLoading = select(RegistriesSelectors.isSubmittedRegistrationsLoading);
+  schemaResponse = select(RegistriesSelectors.getSchemaResponse);
+
+  actions = createDispatchMap({
     getDraftRegistrations: FetchDraftRegistrations,
     getSubmittedRegistrations: FetchSubmittedRegistrations,
     deleteDraft: DeleteDraft,
     getSchemaResponse: FetchAllSchemaResponses,
     createSchemaResponse: CreateSchemaResponse,
   });
 
-  protected readonly RegistrationTab = RegistrationTab;
+  readonly RegistrationTab = RegistrationTab;
 
   readonly provider = environment.defaultProvider;
 
@@ -108,6 +112,7 @@ export class MyRegistrationsComponent {
         this.submittedFirst = 0;
         this.actions.getSubmittedRegistrations(this.currentUser()?.id);
       }
+
       this.router.navigate([], {
         relativeTo: this.route,
         queryParams: { tab: tab === RegistrationTab.Drafts ? 'drafts' : 'submitted' },
@@ -148,11 +153,7 @@ export class MyRegistrationsComponent {
   onUpdateRegistration(id: string): void {
     this.actions
       .createSchemaResponse(id)
-      .pipe(
-        tap(() => {
-          this.navigateToJustificationPage();
-        })
-      )
+      .pipe(tap(() => this.navigateToJustificationPage()))
       .subscribe();
   }
 

src/app/shared/mappers/registration/registration.mapper.ts

@@ -80,7 +80,7 @@ export class RegistrationMapper {
       title: registration.attributes.title,
       description: registration.attributes.description || '',
       status: MapRegistryStatus(registration.attributes),
-      dateCreated: registration.attributes.datetime_initiated,
+      dateCreated: registration.attributes.date_created,
       dateModified: registration.attributes.date_modified,
       registrationTemplate: registration.embeds?.registration_schema?.data?.attributes?.name || '',
       registry: registration.embeds?.provider?.data?.attributes?.name || '',

src/app/shared/models/registration/registration-json-api.model.ts

@@ -44,7 +44,7 @@ export interface DraftRegistrationAttributesJsonApi {
 
 export interface RegistrationAttributesJsonApi {
   access_requests_enabled: boolean;
-  datetime_initiated: string;
+  date_created: string;
   date_modified: string;
   description: string;
   embargoed: boolean;