Fix/uat draft registration (#465)

* fix(draft): registries select component * fix(stepper): update stepper validation * fix(stepper): updated touched for metadata step * fix(withdrawn): hide make decision

Author: nmykhalkevch-exoft

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

@@ -158,6 +158,7 @@ export class RegistriesService {
  const params = {
  page,
  'page[size]': pageSize,
+ 'filter[parent]': null,
  embed: ['bibliographic_contributors', 'registration_schema', 'provider'],
  };
 

src/app/features/registry/mappers/registry-overview.mapper.ts

@@ -75,5 +75,6 @@ export function MapRegistryOverview(data: RegistryOverviewJsonApiData): Registry
  withdrawalJustification: data.attributes.withdrawal_justification,
  dateWithdrawn: data.attributes.date_withdrawn || null,
  embargoEndDate: data.attributes.embargo_end_date || null,
+ rootParentId: data.relationships.root?.data?.id,
  } as RegistryOverview;
 }

src/app/features/registry/models/get-registry-overview-json-api.model.ts

@@ -160,4 +160,10 @@ export interface RegistryOverviewJsonApiRelationships {
  };
  };
  };
+ root: {
+ data: {
+ id: string;
+ type: string;
+ };
+ };
 }

src/app/features/registry/models/registry-overview.models.ts

@@ -69,6 +69,7 @@ export interface RegistryOverview {
  withdrawn: boolean;
  withdrawalJustification?: string;
  dateWithdrawn: string | null;
+ rootParentId: string | null;
 }
 
 export interface RegistryOverviewWithMeta {

src/app/features/registry/pages/registry-overview/registry-overview.component.html

@@ -7,6 +7,7 @@
  [showButton]="canMakeDecision()"
  [buttonSeverity]="'success'"
  [buttonLabel]="'moderation.makeDecision.header' | translate"
+ [isButtonDisabled]="!isRootRegistration()"
  [isSubmitting]="areReviewActionsLoading()"
  (buttonClick)="handleOpenMakeDecisionDialog()"
  />
@@ -69,7 +70,7 @@ <h4 class="mb-1">
  <div class="flex flex-column gap-4 md:flex-row resource">
  <osf-registry-statuses
  [registry]="registry()"
- [readonly]="hasNoPermissions() || hasReadAccess()"
+ [readonly]="hasNoPermissions() || hasViewOnly()"
  [isModeration]="isModeration"
  ></osf-registry-statuses>
 
@@ -81,7 +82,7 @@ <h4 class="mb-1">
  (continueUpdate)="onContinueUpdateRegistration()"
  [isModeration]="isModeration"
  [isSubmitting]="isSchemaResponseLoading()"
- [readonly]="hasNoPermissions() || hasReadAccess()"
+ [readonly]="hasNoPermissions() || hasViewOnly()"
  >
  </osf-registry-revisions>
  </div>

src/app/features/registry/pages/registry-overview/registry-overview.component.ts

@@ -96,7 +96,6 @@ export class RegistryOverviewComponent {
 
  readonly hasWriteAccess = select(RegistryOverviewSelectors.hasWriteAccess);
  readonly hasAdminAccess = select(RegistryOverviewSelectors.hasAdminAccess);
- readonly hasReadAccess = select(RegistryOverviewSelectors.hasReadAccess);
  readonly hasNoPermissions = select(RegistryOverviewSelectors.hasNoPermissions);
 
  revisionInProgress: SchemaResponse | undefined;
@@ -114,6 +113,11 @@ export class RegistryOverviewComponent {
  return !this.registry()?.archiving && !this.registry()?.withdrawn && this.isModeration;
  });
 
+ isRootRegistration = computed(() => {
+ const rootId = this.registry()?.rootParentId;
+ return !rootId || rootId === this.registry()?.id;
+ });
+
  private registryId = toSignal(this.route.parent?.params.pipe(map((params) => params['id'])) ?? of(undefined));
 
  readonly schemaResponse = computed(() => {

src/app/shared/components/registration-card/registration-card.component.html

@@ -77,7 +77,7 @@ <h2 class="align-self-center">
  routerLinkActive="router-link-active"
  [label]="'common.buttons.view' | translate"
  ></p-button>
- @if (isAccepted || isPending || isEmbargo) {
+ @if (showButtons) {
  @if (isApproved) {
  <p-button
  severity="secondary"

src/app/shared/components/registration-card/registration-card.component.ts

@@ -75,6 +75,15 @@ export class RegistrationCardComponent {
  return this.registrationData().reviewsState === RegistrationReviewStates.Embargo;
  }
 
+ get isRootRegistration(): boolean {
+ const registration = this.registrationData();
+ return !registration.rootParentId || registration.id === registration.rootParentId;
+ }
+
+ get showButtons(): boolean {
+ return this.isRootRegistration && (this.isAccepted || this.isPending || this.isEmbargo);
+ }
+
  updateRegistration(id: string): void {
  this.actions
  .createSchemaResponse(id)

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

@@ -97,6 +97,7 @@ export class RegistrationMapper {
  id: contributor.embeds.users.data.id,
  fullName: contributor.embeds.users.data.attributes.full_name,
  })) || [],
+ rootParentId: registration.relationships.root?.data?.id,
  };
  }
 

src/app/shared/models/registration/registration-card.model.ts

@@ -21,4 +21,5 @@ export interface RegistrationCard {
  hasMaterials?: boolean;
  hasPapers?: boolean;
  hasSupplements?: boolean;
+ rootParentId?: string | null;
 }