refactor code

Author: mkovalua

src/app/features/collections/components/add-to-collection/project-metadata-step/project-metadata-step.component.ts

@@ -33,11 +33,7 @@ import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { AddToCollectionSteps, ProjectMetadataFormControls } from '@osf/features/collections/enums';
 import { ProjectMetadataForm } from '@osf/features/collections/models/project-metadata-form.model';
 import { ProjectMetadataFormService } from '@osf/features/collections/services';
-import {
-  AddToCollectionSelectors,
-  GetCollectionLicenses,
-  GetProviderDefaultLicense,
-} from '@osf/features/collections/store/add-to-collection';
+import { AddToCollectionSelectors, GetCollectionLicenses } from '@osf/features/collections/store/add-to-collection';
 import { TagsInputComponent } from '@osf/shared/components/tags-input/tags-input.component';
 import { TextInputComponent } from '@osf/shared/components/text-input/text-input.component';
 import { TruncatedTextComponent } from '@osf/shared/components/truncated-text/truncated-text.component';
@@ -49,6 +45,7 @@ import { InterpolatePipe } from '@osf/shared/pipes/interpolate.pipe';
 import { ToastService } from '@osf/shared/services/toast.service';
 import { GetAllContributors } from '@osf/shared/stores/contributors';
 import { ClearProjects, ProjectsSelectors, UpdateProjectMetadata } from '@osf/shared/stores/projects';
+import { CollectionsSelectors, GetCollectionProvider } from '@shared/stores/collections';
 
 @Component({
   selector: 'osf-project-metadata-step',
@@ -90,8 +87,8 @@ export class ProjectMetadataStepComponent {
   readonly inputLimits = InputLimits;
 
   readonly selectedProject = select(ProjectsSelectors.getSelectedProject);
+  readonly collectionProvider = select(CollectionsSelectors.getCollectionProvider);
   readonly collectionLicenses = select(AddToCollectionSelectors.getCollectionLicenses);
-  readonly providerDefaultLicense = select(AddToCollectionSelectors.getProviderDefaultLicense);
   readonly isSelectedProjectUpdateSubmitting = select(ProjectsSelectors.getSelectedProjectUpdateSubmitting);
 
   stepperActiveValue = input.required<number>();
@@ -107,7 +104,7 @@ export class ProjectMetadataStepComponent {
     getAllContributors: GetAllContributors,
     getCollectionLicenses: GetCollectionLicenses,
     clearProjects: ClearProjects,
-    getProviderDefaultLicense: GetProviderDefaultLicense,
+    getCollectionProvider: GetCollectionProvider,
   });
 
   readonly projectMetadataForm: FormGroup<ProjectMetadataForm> = this.formService.createForm();
@@ -119,9 +116,16 @@ export class ProjectMetadataStepComponent {
 
   readonly projectLicense = computed(() => {
     const project = this.selectedProject();
-    const defaultLicense = this.providerDefaultLicense()?.id;
-    const licenseId = project?.licenseId || defaultLicense;
-    return project ? (this.collectionLicenses().find((license) => license.id === licenseId) ?? null) : null;
+    const defaultProviderLicense = this.collectionProvider()?.defaultLicenseId;
+    console.log('Project License Computed:', defaultProviderLicense);
+    console.log('project?.licenseId:', project?.licenseId);
+    console.log('this.collectionLicenses() ', this.collectionLicenses());
+    // const res =  project ? (this.collectionLicenses().find((license) => license.id === licenseId) ?? null) : null;
+    // console.log('res: ', res)
+    const licenseId = project?.licenseId || defaultProviderLicense;
+    const res = project ? (this.collectionLicenses().find((license) => license.id === licenseId) ?? null) : null;
+    console.log('res: ', res);
+    return res;
   });
 
   private readonly isFormUnchanged = computed(() => {
@@ -243,7 +247,7 @@ export class ProjectMetadataStepComponent {
           this.formService.updateLicenseValidators(this.projectMetadataForm, license);
         });
       } else {
-        this.actions.getProviderDefaultLicense(this.providerId());
+        this.actions.getCollectionProvider(this.providerId());
       }
       this.populateFormFromProject();
     });

src/app/features/collections/services/add-to-collection.service.ts

@@ -9,12 +9,8 @@ import { ReviewActionsMapper } from '@osf/shared/mappers/review-actions.mapper';
 import { ReviewActionPayload } from '@osf/shared/models/review-action/review-action-payload.model';
 import { JsonApiService } from '@osf/shared/services/json-api.service';
 import { CollectionSubmissionPayload } from '@shared/models/collections/collection-submission-payload.model';
-import { ProviderDefaultLicense } from '@shared/models/collections/collections.model';
 import { LicenseModel } from '@shared/models/license/license.model';
-import {
-  LicensesResponseJsonApi,
-  ProviderDefaultLicenseResponseJsonApi,
-} from '@shared/models/license/licenses-json-api.model';
+import { LicensesResponseJsonApi } from '@shared/models/license/licenses-json-api.model';
 
 import { RemoveCollectionSubmissionPayload } from '../models/remove-collection-submission-payload.model';
 
@@ -38,12 +34,6 @@ export class AddToCollectionService {
       .pipe(map((licenses) => LicensesMapper.fromLicensesResponse(licenses)));
   }
 
-  fetchProviderDefaultLicense(providerId: string): Observable<ProviderDefaultLicense> {
-    return this.jsonApiService
-      .get<ProviderDefaultLicenseResponseJsonApi>(`${this.apiUrl}/providers/collections/${providerId}/`)
-      .pipe(map((response) => LicensesMapper.fromProviderDefaultLicenseResponse(response)));
-  }
-
   createCollectionSubmission(payload: CollectionSubmissionPayload): Observable<void> {
     const collectionId = payload.collectionId;
     const metadata = CollectionsMapper.toCollectionSubmissionRequest(payload);

src/app/features/collections/store/add-to-collection/add-to-collection.actions.ts

@@ -8,12 +8,6 @@ export class GetCollectionLicenses {
   constructor(public providerId: string) {}
 }
 
-export class GetProviderDefaultLicense {
-  static readonly type = '[Add To Collection] Get Provider Default License';
-
-  constructor(public providerId: string) {}
-}
-
 export class GetCurrentCollectionSubmission {
   static readonly type = '[Add To Collection] Get Current Collection Submission';
 

src/app/features/collections/store/add-to-collection/add-to-collection.model.ts

@@ -1,12 +1,10 @@
 import { CollectionProjectSubmission } from '@osf/shared/models/collections/collections.model';
-import { ProviderDefaultLicense } from '@shared/models/collections/collections.model';
 import { LicenseModel } from '@shared/models/license/license.model';
 import { AsyncStateModel } from '@shared/models/store/async-state.model';
 
 export interface AddToCollectionStateModel {
   collectionLicenses: AsyncStateModel<LicenseModel[]>;
   currentProjectSubmission: AsyncStateModel<CollectionProjectSubmission | null>;
-  providerDefaultLicense: AsyncStateModel<ProviderDefaultLicense | null>;
 }
 
 export const ADD_TO_COLLECTION_DEFAULTS: AddToCollectionStateModel = {
@@ -20,9 +18,4 @@ export const ADD_TO_COLLECTION_DEFAULTS: AddToCollectionStateModel = {
     isLoading: false,
     error: null,
   },
-  providerDefaultLicense: {
-    data: null,
-    isLoading: false,
-    error: null,
-  },
 };

src/app/features/collections/store/add-to-collection/add-to-collection.selectors.ts

@@ -9,11 +9,6 @@ export class AddToCollectionSelectors {
     return state.collectionLicenses.data;
   }
 
-  @Selector([AddToCollectionState])
-  static getProviderDefaultLicense(state: AddToCollectionStateModel) {
-    return state.providerDefaultLicense.data;
-  }
-
   @Selector([AddToCollectionState])
   static getCollectionLicensesLoading(state: AddToCollectionStateModel) {
     return state.collectionLicenses.isLoading;

src/app/features/collections/store/add-to-collection/add-to-collection.state.ts

@@ -14,7 +14,6 @@ import {
   CreateCollectionSubmission,
   GetCollectionLicenses,
   GetCurrentCollectionSubmission,
-  GetProviderDefaultLicense,
   RemoveCollectionSubmission,
   UpdateCollectionSubmission,
 } from './add-to-collection.actions';
@@ -53,30 +52,6 @@ export class AddToCollectionState {
     );
   }
 
-  @Action(GetProviderDefaultLicense)
-  getProviderDefaultLicense(ctx: StateContext<AddToCollectionStateModel>, action: GetProviderDefaultLicense) {
-    const state = ctx.getState();
-    ctx.patchState({
-      providerDefaultLicense: {
-        ...state.providerDefaultLicense,
-        isLoading: true,
-      },
-    });
-
-    return this.addToCollectionService.fetchProviderDefaultLicense(action.providerId).pipe(
-      tap((defaultLicense) => {
-        ctx.patchState({
-          providerDefaultLicense: {
-            data: defaultLicense,
-            isLoading: false,
-            error: null,
-          },
-        });
-      }),
-      catchError((error) => handleSectionError(ctx, 'collectionLicenses', error))
-    );
-  }
-
   @Action(GetCurrentCollectionSubmission)
   getCurrentCollectionSubmission(ctx: StateContext<AddToCollectionStateModel>, action: GetCurrentCollectionSubmission) {
     const state = ctx.getState();

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

@@ -58,6 +58,7 @@ export class CollectionsMapper {
         id: response.relationships.primary_collection.data.id,
         type: response.relationships.primary_collection.data.type,
       },
+      defaultLicenseId: response.attributes?.default_license_id,
       brand: response.embeds.brand.data
         ? {
             id: response.embeds.brand.data.id,

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

@@ -1,9 +1,5 @@
 import { LicenseModel } from '../models/license/license.model';
-import {
-  LicenseDataJsonApi,
-  LicensesResponseJsonApi,
-  ProviderDefaultLicenseResponseJsonApi,
-} from '../models/license/licenses-json-api.model';
+import { LicenseDataJsonApi, LicensesResponseJsonApi } from '../models/license/licenses-json-api.model';
 
 export class LicensesMapper {
   static fromLicensesResponse(response: LicensesResponseJsonApi): LicenseModel[] {
@@ -27,10 +23,4 @@ export class LicensesMapper {
       text: data?.attributes?.text,
     };
   }
-
-  static fromProviderDefaultLicenseResponse(response: ProviderDefaultLicenseResponseJsonApi) {
-    return {
-      id: response?.data.attributes?.default_license_id,
-    };
-  }
 }

src/app/shared/models/collections/collections.model.ts

@@ -18,6 +18,7 @@ export interface CollectionProvider extends BaseProviderModel {
     type: string;
   };
   brand: BrandModel | null;
+  defaultLicenseId?: string | null;
 }
 
 export interface CollectionFilters {
@@ -101,10 +102,6 @@ export interface CollectionProjectSubmission {
   project: ProjectModel;
 }
 
-export interface ProviderDefaultLicense {
-  id: string;
-}
-
 export type CollectionSubmissionActionType = 'collection_submission_actions';
 
 export type CollectionSubmissionTargetType = 'collection-submissions';

src/app/shared/models/license/licenses-json-api.model.ts

@@ -10,18 +10,8 @@ export interface LicenseResponseJsonApi {
   data: LicenseDataJsonApi;
 }
 
-export interface ProviderDefaultLicenseAttributesJsonApi {
-  default_license_id: string;
-}
-
-export interface ProviderDefaultLicenseResponseJsonApi {
-  data: ProviderDefaultLicenseDataJsonApi;
-}
-
 export type LicenseDataJsonApi = ApiData<LicenseAttributesJsonApi, null, null, null>;
 
-export type ProviderDefaultLicenseDataJsonApi = ApiData<ProviderDefaultLicenseAttributesJsonApi, null, null, null>;
-
 export interface LicenseAttributesJsonApi {
   name: string;
   required_fields: string[];