From 9cce55327e83ed18d3fe2152138feb311dfc6243 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Mon, 15 Jan 2024 10:49:50 +0100 Subject: [PATCH] [DURACOM-191] remove unused decorator --- .../sections/accesses/section-accesses.component.ts | 4 ---- .../submission-section-cc-licenses.component.ts | 8 ++++---- .../submission/sections/form/section-form.component.ts | 3 --- .../identifiers/section-identifiers.component.ts | 9 ++++----- .../sections/license/section-license.component.ts | 3 --- src/app/submission/sections/sections-decorator.ts | 9 --------- .../section-sherpa-policies.component.ts | 3 --- .../sections/upload/section-upload.component.ts | 10 +--------- 8 files changed, 9 insertions(+), 40 deletions(-) diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts index 6f407a90fe..8826fbb5ae 100644 --- a/src/app/submission/sections/accesses/section-accesses.component.ts +++ b/src/app/submission/sections/accesses/section-accesses.component.ts @@ -5,9 +5,6 @@ import { UntypedFormControl } from '@angular/forms'; import { filter, map, mergeMap, take } from 'rxjs/operators'; import { combineLatest, Observable, of, Subscription } from 'rxjs'; import { TranslateService } from '@ngx-translate/core'; - -import { renderSectionFor } from '../sections-decorator'; -import { SectionsType } from '../sections-type'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsService } from '../sections.service'; import { SectionModelComponent } from '../models/section.model'; @@ -73,7 +70,6 @@ import { NgIf } from '@angular/common'; ], standalone: true }) -@renderSectionFor(SectionsType.AccessesCondition) export class SubmissionSectionAccessesComponent extends SectionModelComponent { /** diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts index ff75e00747..2f0faca931 100644 --- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts +++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.ts @@ -9,17 +9,18 @@ import { import { distinctUntilChanged, filter, map, take } from 'rxjs/operators'; import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service'; import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; -import { renderSectionFor } from '../sections-decorator'; import { SectionsType } from '../sections-type'; import { SectionModelComponent } from '../models/section.model'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsService } from '../sections.service'; -import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model'; +import { + WorkspaceitemSectionCcLicenseObject +} from '../../../core/submission/models/workspaceitem-section-cc-license.model'; import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner'; import { isNotEmpty } from '../../../shared/empty.util'; import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder'; import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service'; -import {ConfigurationDataService} from '../../../core/data/configuration-data.service'; +import { ConfigurationDataService } from '../../../core/data/configuration-data.service'; import { TranslateModule } from '@ngx-translate/core'; import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; import { ThemedLoadingComponent } from '../../../shared/loading/themed-loading.component'; @@ -44,7 +45,6 @@ import { DsSelectComponent } from '../../../shared/ds-select/ds-select.component ], standalone: true }) -@renderSectionFor(SectionsType.CcLicense) export class SubmissionSectionCcLicensesComponent extends SectionModelComponent { /** diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts index 35c4a3eb21..24115c94b4 100644 --- a/src/app/submission/sections/form/section-form.component.ts +++ b/src/app/submission/sections/form/section-form.component.ts @@ -17,8 +17,6 @@ import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object'; import { SectionDataObject } from '../models/section-data.model'; -import { renderSectionFor } from '../sections-decorator'; -import { SectionsType } from '../sections-type'; import { SubmissionService } from '../../submission.service'; import { SectionFormOperationsService } from './section-form-operations.service'; import { NotificationsService } from '../../../shared/notifications/notifications.service'; @@ -57,7 +55,6 @@ import { NgIf } from '@angular/common'; ], standalone: true }) -@renderSectionFor(SectionsType.SubmissionForm) export class SubmissionSectionFormComponent extends SectionModelComponent { /** diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts index f7a1f67a2c..989ff9964f 100644 --- a/src/app/submission/sections/identifiers/section-identifiers.component.ts +++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts @@ -1,15 +1,15 @@ -import {ChangeDetectionStrategy, Component, Inject } from '@angular/core'; +import { ChangeDetectionStrategy, Component, Inject } from '@angular/core'; import { Observable, of as observableOf, Subscription } from 'rxjs'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; -import { SectionsType } from '../sections-type'; import { SectionModelComponent } from '../models/section.model'; -import { renderSectionFor } from '../sections-decorator'; import { SectionDataObject } from '../models/section-data.model'; import { SubmissionService } from '../../submission.service'; import { AlertType } from '../../../shared/alert/alert-type'; import { SectionsService } from '../sections.service'; -import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model'; +import { + WorkspaceitemSectionIdentifiersObject +} from '../../../core/submission/models/workspaceitem-section-identifiers.model'; import { AsyncPipe, NgForOf, NgIf } from '@angular/common'; import { VarDirective } from '../../../shared/utils/var.directive'; @@ -34,7 +34,6 @@ import { VarDirective } from '../../../shared/utils/var.directive'; standalone: true }) -@renderSectionFor(SectionsType.Identifiers) export class SubmissionSectionIdentifiersComponent extends SectionModelComponent { /** * The Alert categories. diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts index 591f9c5b0b..c8cb030cf1 100644 --- a/src/app/submission/sections/license/section-license.component.ts +++ b/src/app/submission/sections/license/section-license.component.ts @@ -25,8 +25,6 @@ import { SectionFormOperationsService } from '../form/section-form-operations.se import { SectionDataObject } from '../models/section-data.model'; import { SectionModelComponent } from '../models/section.model'; -import { renderSectionFor } from '../sections-decorator'; -import { SectionsType } from '../sections-type'; import { SectionsService } from '../sections.service'; import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model'; import { TranslateService } from '@ngx-translate/core'; @@ -47,7 +45,6 @@ import { AsyncPipe, NgIf } from '@angular/common'; ], standalone: true }) -@renderSectionFor(SectionsType.License) export class SubmissionSectionLicenseComponent extends SectionModelComponent implements AfterViewChecked { /** diff --git a/src/app/submission/sections/sections-decorator.ts b/src/app/submission/sections/sections-decorator.ts index 09ec36cb0b..757bed055e 100644 --- a/src/app/submission/sections/sections-decorator.ts +++ b/src/app/submission/sections/sections-decorator.ts @@ -1,4 +1,3 @@ - import { SectionsType } from './sections-type'; import { defer } from 'rxjs'; @@ -11,14 +10,6 @@ const submissionSectionsMap = { [SectionsType.SubmissionForm]: defer(() => import('./form/section-form.component').then(m => m.SubmissionSectionFormComponent)), [SectionsType.Identifiers]: defer(() => import('./identifiers/section-identifiers.component').then(m => m.SubmissionSectionIdentifiersComponent)) }; -export function renderSectionFor(sectionType: SectionsType) { - return function decorator(objectElement: any) { - if (!objectElement) { - return; - } - // submissionSectionsMap.set(sectionType, objectElement); - }; -} export function rendersSectionType(sectionType: SectionsType) { return submissionSectionsMap[sectionType]; diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts index f24953404c..d94ca6c6d8 100644 --- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts +++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.ts @@ -8,8 +8,6 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso import { WorkspaceitemSectionSherpaPoliciesObject } from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model'; -import { renderSectionFor } from '../sections-decorator'; -import { SectionsType } from '../sections-type'; import { SectionDataObject } from '../models/section-data.model'; import { SectionsService } from '../sections.service'; import { SectionModelComponent } from '../models/section.model'; @@ -45,7 +43,6 @@ import { VarDirective } from '../../../shared/utils/var.directive'; ], standalone: true }) -@renderSectionFor(SectionsType.SherpaPolicies) export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent { /** diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts index 33a653c115..2220515263 100644 --- a/src/app/submission/sections/upload/section-upload.component.ts +++ b/src/app/submission/sections/upload/section-upload.component.ts @@ -1,11 +1,6 @@ import { ChangeDetectorRef, Component, Inject } from '@angular/core'; -import { - BehaviorSubject, - combineLatest as observableCombineLatest, - Observable, - Subscription -} from 'rxjs'; +import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs'; import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators'; import { SectionModelComponent } from '../models/section.model'; @@ -17,8 +12,6 @@ import { ResourcePolicyDataService } from '../../../core/resource-policy/resourc import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service'; import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model'; import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model'; -import { SectionsType } from '../sections-type'; -import { renderSectionFor } from '../sections-decorator'; import { SectionDataObject } from '../models/section-data.model'; import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer'; import { AlertType } from '../../../shared/alert/alert-type'; @@ -65,7 +58,6 @@ export interface AccessConditionGroupsMapEntry { ], standalone: true }) -@renderSectionFor(SectionsType.Upload) export class SubmissionSectionUploadComponent extends SectionModelComponent { /**